From 2a47564c37dfb441cca1a7cd5fa0dd6dfb7be72f Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Wed, 21 Apr 2021 12:12:03 +0300 Subject: [PATCH] PAP-607: fix issue --- lib/config/localized_values.dart | 24 +++++++++++++ .../new_e_referral_step_one_page.dart | 35 +++++++++++++------ .../E-Referral/e_referral_page.dart | 4 +-- lib/uitl/translations_delegate_base.dart | 7 ++++ 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index a703d5db..2bde14ba 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1992,5 +1992,29 @@ const Map localizedValues = { "enter-file": { "en": "Please enter the mobile number and the medical file number", "ar": "الرجاء إدخال رقم الجوال ورقم الملف الطبي" + }, + "referralRequesterInformation": { + "en": "Referral requester information", + "ar": "معلومات طالب الإحالة" + }, + "enterReferralRequesterName": { + "en": "Enter Referral Requester Name*", + "ar": "أدخل اسم مقدم طلب الإحالة *" + }, + "selectRelationship": { + "en": "Select Relationship", + "ar": "حدد العلاقة" + }, + "requesterRelationship": { + "en": "Requester Relationship", + "ar": "علاقة الطالب" + }, + "newReferral": { + "en": "New Referral", + "ar": "إحالة جديدة" + }, + "searchForReferrals": { + "en": "Search For Referrals", + "ar": "ابحث عن الإحالات" } }; diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart index 62799c6d..b6cddf18 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart @@ -4,11 +4,12 @@ import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/EReferral/ import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/EReferral/send_activation_code_for_e_referral_request_model.dart'; import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_confirm_sms_dialog.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/dialogs/select_country_ingo_Dialog.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/dialogs/select_relation_type_dialog.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_confirm_sms_dialog.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/medical/balance/new_text_Field.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; @@ -18,6 +19,7 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class NewEReferralStepOnePage extends StatefulWidget { @@ -38,6 +40,7 @@ class _NewEReferralStepOnePageState extends State { AuthenticatedUser authenticatedUser; GetAllSharedRecordsByStatusList selectedPatientFamily; AdvanceModel advanceModel = AdvanceModel(); + ProjectViewModel projectViewModel; // todo create a model for Country // todo use country from the json @@ -59,6 +62,7 @@ class _NewEReferralStepOnePageState extends State { @override Widget build(BuildContext context) { + projectViewModel = Provider.of(context); void showSMSDialog() { showDialog( context: context, @@ -104,8 +108,8 @@ class _NewEReferralStepOnePageState extends State { ), Center( child: Texts( -// TranslationBase.of(context).advancePaymentLabel, - "Referral requester information", + TranslationBase.of(context) + .referralRequesterInformation, textAlign: TextAlign.center, ), ), @@ -113,7 +117,9 @@ class _NewEReferralStepOnePageState extends State { height: 12, ), NewTextFields( - hintText: "Enter Referral Requester Name*", + hintText: TranslationBase + .of(context) + .enterReferralRequesterName, controller: _nameTextController, ), SizedBox( @@ -151,8 +157,7 @@ class _NewEReferralStepOnePageState extends State { ), Center( child: Texts( -// TranslationBase.of(context).advancePaymentLabel, - "Requester Relationship", + TranslationBase.of(context).requesterRelationship, textAlign: TextAlign.center, ), ), @@ -246,15 +251,25 @@ class _NewEReferralStepOnePageState extends State { } String getRelationName() { - if (_selectedRelation != null) - return _selectedRelation.text; + if (_selectedRelation != null) { + if(projectViewModel.isArabic) { + return _selectedRelation.textAr; + } + return _selectedRelation.textEn; + } + else - return "Select Relationship" /*TranslationBase.of(context).selectHospital*/; + return TranslationBase.of(context).selectRelationship; } String getCountryName() { - if (_selectedCountry != null) + if (_selectedCountry != null) { + if(projectViewModel.isArabic) { + return _selectedCountry["name_ar"]; + } return _selectedCountry["name"]; + } + else return "Country"; } diff --git a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart index aca27b4b..9f4240fc 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart @@ -97,13 +97,13 @@ class _EReferralPageState extends State Container( width: MediaQuery.of(context).size.width * 0.37, child: Center( - child: Texts("New Referral", textAlign: TextAlign.center,), + child: Texts(TranslationBase.of(context).newReferral, textAlign: TextAlign.center,), ), ), Container( width: MediaQuery.of(context).size.width * 0.37, child: Center( - child: Texts("Search for Referrals", textAlign: TextAlign.center,), + child: Texts(TranslationBase.of(context).searchForReferrals , textAlign: TextAlign.center,), ), ), ], diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 0e0058f9..8e31b1a1 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -635,6 +635,8 @@ class TranslationBase { localizedValues['AdvancePayment'][locale.languageCode]; String get advancePaymentLabel => localizedValues['AdvancePaymentLabel'][locale.languageCode]; + String get referralRequesterInformation => + localizedValues['referralRequesterInformation'][locale.languageCode]; String get fileNumber => localizedValues['FileNumber'][locale.languageCode]; String get amount => localizedValues['Amount'][locale.languageCode]; String get depositorEmail => @@ -1605,6 +1607,11 @@ class TranslationBase { String get insuranceID => localizedValues["insurance-id"][locale.languageCode]; String get enterFile => localizedValues["enter-file"][locale.languageCode]; + String get enterReferralRequesterName => localizedValues["enterReferralRequesterName"][locale.languageCode]; + String get selectRelationship => localizedValues["selectRelationship"][locale.languageCode]; + String get requesterRelationship => localizedValues["requesterRelationship"][locale.languageCode]; + String get newReferral => localizedValues["newReferral"][locale.languageCode]; + String get searchForReferrals => localizedValues["searchForReferrals"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {