From e564cdc7e503fbbb5af9c83eab68bba64d35d0b9 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 17 Oct 2021 14:28:27 +0300 Subject: [PATCH] Updates & fixes --- lib/config/localized_values.dart | 22 +++-- lib/core/service/client/base_app_client.dart | 4 +- .../new_e_referral_step_three_page.dart | 1 + .../new_e_referral_step_two_page.dart | 92 +++++++++++-------- .../select_search_criteria_dialog.dart | 10 +- .../E-Referral/search_for_referrals_page.dart | 17 ++-- .../MyAppointments/AppointmentDetails.dart | 11 ++- .../widgets/AppointmentActions.dart | 4 +- .../insurance/insurance_approval_screen.dart | 2 +- .../insurance/insurance_update_screen.dart | 2 +- lib/pages/landing/landing_page.dart | 2 +- .../landing/widgets/logged_slider_view.dart | 2 +- .../medical/balance/confirm_payment_page.dart | 14 ++- .../medical/labs/passport_update_page.dart | 2 +- .../blood_suger/AddBloodSugarPage.dart | 2 +- lib/uitl/translations_delegate_base.dart | 10 ++ 16 files changed, 116 insertions(+), 81 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index f67c1850..cb531689 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -92,7 +92,7 @@ const Map localizedValues = { 'changePayment': {'en': 'Change Payment Method', 'ar': 'تغيير آلية الدفع'}, 'upcoming-noAction': {'en': 'No Action Required', 'ar': 'لا يلزم اتخاذ أي إجراء'}, 'upcoming-confirm': {'en': 'Please confirm the appointment to avoid cancellation', 'ar': 'يرجى تأكيد الموعد لتفادي الإلغاء'}, - "book-success-confirm-more-24-1-2": {"en": "The online payment process will be available 24 hours before the appointment.", "ar": "- عملية الدفع الالكتروني ستكون متاحة قبل الموعد ب 24 ساعة."}, + "book-success-confirm-more-24-1-2": {"en": "The online payment process will be available 24 hours before the appointment.", "ar": "عملية الدفع الالكتروني ستكون متاحة قبل الموعد ب 24 ساعة."}, 'upcoming-payment-pending': {'en': 'Online Payment will be Activated before 24 Hours of Appointment Time', 'ar': 'سيتم تفعيل خدمة الدفع الالكتروني قبل 24 ساعة من موعد الحجز'}, 'upcoming-payment-now': {'en': 'Pay Online now to avoid long waiting queue', 'ar': 'ادفع الآن لتفادي طابور الانتظار'}, 'upcoming-QR': {'en': 'Use the QR Code to Check-In in hospital', 'ar': 'استخدم الرمز لتسجيل الحضور بشكل آلي في المستشفى'}, @@ -258,7 +258,7 @@ const Map localizedValues = { "requestType": {"en": "Request Type", "ar": "نوع الاستفسار"}, "register-info-family": {"en": "How would like to add the new member?", "ar": "كيف ترغب باضافة العضو الجديد؟"}, "remove-family-member": {"en": "Remove this member?", "ar": "إزالة ملف العضو؟"}, - "MyMedicalFile": {"en": "My Medical File", 'ar': 'ملف الطبي الالكتروني'}, + "MyMedicalFile": {"en": "My Medical File", 'ar': 'الملف الطبي الالكتروني'}, "myMedicalFileSubTitle": {"en": "All your medical records", 'ar': 'جميع سجلاتك الطبية'}, "viewMore": {"en": "View More", 'ar': 'عرض المزيد'}, "homeHealthCareService": {"en": "Home Health Care Service", 'ar': 'الرعاية الصحية المنزلية'}, @@ -331,7 +331,7 @@ const Map localizedValues = { "MyDoctorSubtitle": {"en": "List", "ar": "قمت بزيارتهم"}, "Eye": {"en": "Eye", "ar": "قياسات"}, "EyeSubtitle": {"en": "Measurement", "ar": "النظر"}, - "Insurance": {"en": "Insurance", "ar": "بطاقة"}, + "Insurance": {"en": "Insurance", "ar": "بطاقات"}, "InsuranceSubtitle": {"en": "Card", "ar": "التأمين"}, "UpdateInsurance": {"en": "Update Insurance", "ar": "تحديث التأمين"}, "UpdateInsuranceSubtitle": {"en": "Card", "ar": "التأمين"}, @@ -399,7 +399,7 @@ const Map localizedValues = { "AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"}, "AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"}, "FileNumber": {"en": "File Number", "ar": "رقم الملف"}, - "Amount": {"en": "Amount *", "ar": "المبلغ *"}, + "Amount": {"en": "Amount *", "ar": "الكمية *"}, "DepositorEmail": {"en": "Depositor Email *", "ar": "البريد الإلكتروني للمودع *"}, "Notes": {"en": "Notes", "ar": "ملاحظات"}, "SelectPatientName": {"en": "Select Patient Name", "ar": "اختر اسم المريض"}, @@ -511,9 +511,9 @@ const Map localizedValues = { "medicalFile": {"en": "Medical File", "ar": "ملف طبي"}, "verified": {"en": "Verified", "ar": "تم التحقق"}, "checkup": {"en": "Checkup", "ar": "فحص"}, - "hhcHome": {"en": "HHC Home", "ar": "الصفحة الرئيسية HHC"}, + "hhcHome": {"en": "Home", "ar": "الرعاية"}, "refferal": {"en": "E-Refferal", "ar": "الإحالة الإلكترونية"}, - "healthCare": {"en": "Health Care", "ar": "الرعاية الصحية"}, + "healthCare": {"en": "Health Care", "ar": "الصحية المزلية"}, "emergency": {"en": "Emergency", "ar": "طارئ"}, "cantSeeProfile": {"en": "Can’t see your medical File?", "ar": "لا تستطيع رؤية ملفك الطبي؟"}, "loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"}, @@ -521,7 +521,7 @@ const Map localizedValues = { "ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"}, "services2": {"en": "Services", "ar": "خدمات"}, "comprehensive": {"en": "Comprehensive", "ar": "شامل"}, - "onlineConsulting": {"en": "Online Consulting", "ar": "استشارات عبر الإنترنت"}, + "onlineConsulting": {"en": "Online Consulting", "ar": "استشارات فورية"}, "pendingOrder": {"en": " PENDING", "ar": " معلقة"}, "deliveredOrder": {"en": " DELIVERED", "ar": "تم التوصيل"}, "processingOrder": {"en": " PROCESSING", "ar": "قيد التنفيذ"}, @@ -1238,7 +1238,7 @@ const Map localizedValues = { "undo": {"en": "Undo", "ar": "تراجع"}, "drinking": {"en": "Drinkning", "ar": "الشرب"}, "remaining": {"en": "Remaining", "ar": "المتبقي"}, - "addCustomAmount": {"en": "Add Custom Amount", "ar": "إضافة مبلغ مخصص"}, + "addCustomAmount": {"en": "Add Custom Amount", "ar": "إضافة كمية محددة"}, "left": {"en": "Left", "ar": "المتبقي"}, "taken": {"en": "Taken", "ar": " مأخوذ"}, "ml": {"en": "ML", "ar": "مل"}, @@ -1300,7 +1300,7 @@ const Map localizedValues = { "try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'}, "app-update": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"}, "covid-alert": {"en": "Alert", "ar": "تنبيه"}, - "enterIdentificationNumber": {"en": "Enter Identification Number", "ar": "أدخل رقم التعريف"}, + "enterIdentificationNumber": {"en": "Enter Identification Number", "ar": "أدخل رقم الهوية"}, "identificationNumber": {"en": "Identification Number", "ar": "رقم الهوية"}, "complaintNumber": {"en": "Complaint Number", "ar": "رقم الشكوى"}, "accountActivationDesc": { @@ -1513,4 +1513,8 @@ const Map localizedValues = { "modesBelow": { "en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه" }, "prefferedMode": { "en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه" }, "permissionsBellow": { "en": "Please allow the permissions below:", "ar": ":الرجاء السماح الأذونات أدناه" }, + "appointmentReminder": { "en": "Would you like to set a reminder for this appointment in your calendar?", "ar": "هل ترغب في اضافة تذكير لهذا الموعد في التقويم؟" }, + "cancelAppointment": { "en": "Cancel Appt.", "ar": "الغاء الموعد" }, + "updateInsurCards": {"en": "Update Insurance Cards", "ar": "تحديث بطاقات التأمين"}, + "patientAge": {"en": "y", "ar": "سنة"}, }; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 2365d2d1..50fbcdc7 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -119,9 +119,11 @@ class BaseAppClient { // // if(body.containsKey("patientOutSa")) // body.remove("PatientOutSA"); - + // // body['PatientID'] = 1018977; // body['TokenID'] = "@dm!n"; + // body['IdentificationNo'] = "1009199553"; + // body['MobileNo'] = "966545156035"; print("URL : $url"); final jsonBody = json.encode(body); diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart index 7a1a954b..b7fa4532 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart @@ -485,6 +485,7 @@ class _NewEReferralStepThreePageState extends State { ); } + String getRelationName() { if (_selectedCity != null) return _selectedCity.description; diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart index 734c5f28..06a6b4fb 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart @@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -98,33 +99,34 @@ class _NewEReferralStepTowPageState extends State { SizedBox( height: 12, ), - InkWell( - onTap: () => confirmSelectCountryTypeDialog(), - child: Container( - padding: EdgeInsets.all(12), - width: double.infinity, - height: 65, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: Colors.white), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts(getCountryName()), - Icon(Icons.arrow_drop_down) - ], - ), - ), - ), + // InkWell( + // onTap: () => confirmSelectCountryTypeDialog(), + // child: Container( + // padding: EdgeInsets.all(12), + // width: double.infinity, + // height: 65, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Texts(getCountryName()), + // Icon(Icons.arrow_drop_down) + // ], + // ), + // ), + // ), SizedBox( height: 12, ), - MobileNumberTextFiled( - controller: _mobileTextController, - code: _selectedCountry == null - ? "11" - : _selectedCountry["code"], - ), + // MobileNumberTextFiled( + // controller: _mobileTextController, + // code: _selectedCountry == null + // ? "11" + // : _selectedCountry["code"], + // ), + PhoneNumberSelectorWidget(onNumberChange: (value) => {_mobileTextController.text = value, validateForm()}, onCountryChange: (value) => _selectedCountry = value), SizedBox( height: 12, ), @@ -208,6 +210,18 @@ class _NewEReferralStepTowPageState extends State { ); } + void validateForm() { + // if (util.validateIDBox(nationalIDorFile.text, loginType) == true && util.isSAUDIIDValid(nationalIDorFile.text, loginType) == true) { + // setState(() { + // isButtonDisabled = false; + // }); + // } else { + // setState(() { + // isButtonDisabled = true; + // }); + // } + } + void confirmSelectCountryTypeDialog() { showDialog( context: context, @@ -238,7 +252,7 @@ class _NewEReferralStepTowPageState extends State { } class MobileNumberTextFiled extends StatelessWidget { - const MobileNumberTextFiled({ + MobileNumberTextFiled({ Key key, this.controller, this.code @@ -246,7 +260,7 @@ class MobileNumberTextFiled extends StatelessWidget { final TextEditingController controller; - final String code; + String code; @override Widget build(BuildContext context) { @@ -267,19 +281,21 @@ class MobileNumberTextFiled extends StatelessWidget { code.toString(), overflow: TextOverflow.clip, )), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.all(5), - child: TextField( - controller: controller, - keyboardType: TextInputType.phone, - decoration: InputDecoration( - border: InputBorder.none, hintText: TranslationBase.of(context).mobileNumber), - ), - ), - ) + // Expanded( + // flex: 4, + // child: Container( + // margin: EdgeInsets.all(5), + // child: TextField( + // controller: controller, + // keyboardType: TextInputType.phone, + // decoration: InputDecoration( + // border: InputBorder.none, hintText: TranslationBase.of(context).mobileNumber), + // ), + // ), + // ) + // PhoneNumberSelectorWidget(onNumberChange: (value) => {controller.text = value, validateForm()}, onCountryChange: (value) => code = value), ]), ); } + } diff --git a/lib/pages/AlHabibMedicalService/E-Referral/dialogs/select_search_criteria_dialog.dart b/lib/pages/AlHabibMedicalService/E-Referral/dialogs/select_search_criteria_dialog.dart index f4c8d989..e4beed9e 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/dialogs/select_search_criteria_dialog.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/dialogs/select_search_criteria_dialog.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -7,14 +8,15 @@ import 'package:flutter/material.dart'; // ignore: must_be_immutable class SelectSearchCriteriaDialog extends StatefulWidget { List searchCriteria = [ - SearchCriteriaModel(name: "Identification Number",nameAr:"رقم المحول",value: 1), - SearchCriteriaModel(name: "Referral Number",nameAr:"رقم المحول",value: 2), + SearchCriteriaModel(name: "Identification Number",nameAr:"رقم الهوية",value: 1), + SearchCriteriaModel(name: "Referral Number",nameAr:"رقم الإحالة",value: 2), ]; final Function(SearchCriteriaModel) onValueSelected; SearchCriteriaModel selectedCriteria; + ProjectViewModel projectViewModel; SelectSearchCriteriaDialog( - {Key key, this.onValueSelected, this.selectedCriteria}); + {Key key, this.onValueSelected, this.selectedCriteria, this.projectViewModel}); @override _SelectSearchCriteriaDialogState createState() => _SelectSearchCriteriaDialogState(); @@ -54,7 +56,7 @@ class _SelectSearchCriteriaDialogState extends State }); }, child: ListTile( - title: Text(widget.searchCriteria[index].name), + title: Text(widget.projectViewModel.isArabic ? widget.searchCriteria[index].nameAr : widget.searchCriteria[index].name), leading: Radio( value: widget.searchCriteria[index], groupValue: widget.selectedCriteria, diff --git a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart index 356e8eb1..2839699b 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart @@ -39,9 +39,9 @@ class _SearchForReferralsPageState extends State { TextEditingController _mobileTextController = TextEditingController(); bool _isSubmitted = false; - dynamic _selectedCountry = {"name": "Saudi Arabia", "name_ar": "المملكة العربية السعودية", "code": "+966", "countryCode": "SA", "pattern": "5xxxxxxxx", "maxLength": 9}; + dynamic _selectedCountry = {"name": "Saudi Arabia", "name_ar": "المملكة العربية السعودية", "code": "966", "countryCode": "SA", "pattern": "5xxxxxxxx", "maxLength": 9}; - SearchCriteriaModel selectedCriteria = SearchCriteriaModel(name: "Identification Number", nameAr: "رقم المحول", value: 1); + SearchCriteriaModel selectedCriteria = SearchCriteriaModel(name: "Identification Number", nameAr: "رقم الهوية", value: 1); @override Widget build(BuildContext context) { @@ -81,7 +81,7 @@ class _SearchForReferralsPageState extends State { height: 10, ), InkWell( - onTap: () => selectSearchCriteriaDialog(), + onTap: () => selectSearchCriteriaDialog(projectViewModel), child: Container( padding: EdgeInsets.all(12), width: double.infinity, @@ -89,7 +89,7 @@ class _SearchForReferralsPageState extends State { decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [Texts(getSearchCriteriaName()), Icon(Icons.arrow_drop_down)], + children: [Texts(getSearchCriteriaName(projectViewModel)), Icon(Icons.arrow_drop_down)], ), ), ), @@ -97,7 +97,7 @@ class _SearchForReferralsPageState extends State { height: 12, ), NewTextFields( - hintText: selectedCriteria.value == 1 ? "Enter Patient Identification No" : "Enter Referral Number", + hintText: selectedCriteria.value == 1 ? TranslationBase.of(context).enterIdentificationNumber : TranslationBase.of(context).referralNumber, controller: _searchTextController, onChanged: (_) { setState(() {}); @@ -244,11 +244,12 @@ class _SearchForReferralsPageState extends State { return "Country"; } - void selectSearchCriteriaDialog() { + void selectSearchCriteriaDialog(ProjectViewModel projectViewModel) { showDialog( context: context, child: SelectSearchCriteriaDialog( selectedCriteria: selectedCriteria, + projectViewModel: projectViewModel, onValueSelected: (value) { setState(() { selectedCriteria = value; @@ -258,7 +259,7 @@ class _SearchForReferralsPageState extends State { ); } - String getSearchCriteriaName() { - return selectedCriteria.name; + String getSearchCriteriaName(ProjectViewModel projectViewModel) { + return projectViewModel.isArabic ? selectedCriteria.nameAr : selectedCriteria.name; } } diff --git a/lib/pages/MyAppointments/AppointmentDetails.dart b/lib/pages/MyAppointments/AppointmentDetails.dart index 57e2ea3b..06710183 100644 --- a/lib/pages/MyAppointments/AppointmentDetails.dart +++ b/lib/pages/MyAppointments/AppointmentDetails.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/components/DocAvailab import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; +import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; @@ -187,7 +188,7 @@ class _AppointmentDetailsState extends State with SingleTick list.add( Expanded( child: DefaultButton( - TranslationBase.of(context).cancel, + TranslationBase.of(context).cancelAppointment, () { ConfirmDialog dialog = new ConfirmDialog( context: context, @@ -198,8 +199,8 @@ class _AppointmentDetailsState extends State with SingleTick cancelFunction: () => {}); dialog.showAlertDialog(context); }, - color: Color(0xffEAEAEA), - textColor: Color(0xff000000), + color: CustomColors.accentColor, + textColor: CustomColors.white, ), ), ); @@ -219,7 +220,7 @@ class _AppointmentDetailsState extends State with SingleTick list.add( Expanded( child: DefaultButton( - TranslationBase.of(context).cancel, + TranslationBase.of(context).cancelAppointment, () { ConfirmDialog dialog = new ConfirmDialog( context: context, @@ -230,7 +231,7 @@ class _AppointmentDetailsState extends State with SingleTick cancelFunction: () => {}); dialog.showAlertDialog(context); }, - // color: Color(0xffEAEAEA), + color: CustomColors.accentColor, // textColor: Color(0xff000000), ), ), diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index ee94a616..224f3db8 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -381,12 +381,12 @@ class _AppointmentActionsState extends State { print(finalRadiology.reportData); navigateToRadiologyDetails(finalRadiology); } else { - AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound); } }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); - AppToast.showErrorToast(message: err); + AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound); }); } diff --git a/lib/pages/insurance/insurance_approval_screen.dart b/lib/pages/insurance/insurance_approval_screen.dart index a88d89ab..51422bcd 100644 --- a/lib/pages/insurance/insurance_approval_screen.dart +++ b/lib/pages/insurance/insurance_approval_screen.dart @@ -43,7 +43,7 @@ class _InsuranceApprovalState extends State { showNewAppBar: true, baseViewModel: model, showNewAppBarTitle: true, - appBarTitle: TranslationBase.of(context).insuranceApproval, + appBarTitle: TranslationBase.of(context).insuranceApprovalSubtitle, description: TranslationBase.of(context).infoApprovals, infoList: TranslationBase.of(context).infoApprovalPoints, imagesInfo: imagesInfo, diff --git a/lib/pages/insurance/insurance_update_screen.dart b/lib/pages/insurance/insurance_update_screen.dart index 24b5465f..5b68687f 100644 --- a/lib/pages/insurance/insurance_update_screen.dart +++ b/lib/pages/insurance/insurance_update_screen.dart @@ -36,7 +36,7 @@ class _InsuranceUpdateState extends State with SingleTickerProv return BaseView( onModelReady: (model) => model.getInsuranceUpdated(), builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( - appBarTitle: TranslationBase.of(context).insurCards, + appBarTitle: TranslationBase.of(context).updateInsurCards, description: TranslationBase.of(context).infoInsurCards, infoList: TranslationBase.of(context).infoPrescriptionsPoints, imagesInfo: imagesInfo, diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index cebcacdc..02561e1d 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -404,7 +404,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { // Permission.notification, // Permission.accessMediaLocation, // Permission.calendar, - Permission.activityRecognition + // Permission.activityRecognition ].request(); // var permissionsGranted = await deviceCalendarPlugin.hasPermissions(); diff --git a/lib/pages/landing/widgets/logged_slider_view.dart b/lib/pages/landing/widgets/logged_slider_view.dart index a239e789..a0665e85 100644 --- a/lib/pages/landing/widgets/logged_slider_view.dart +++ b/lib/pages/landing/widgets/logged_slider_view.dart @@ -123,7 +123,7 @@ class LoggedSliderView extends StatelessWidget { Padding( padding: const EdgeInsets.only(left: 20, right: 20), child: Text( - '${DateUtil.getMonthDayYearDateFormatted(projectViewModel.user.dateofBirthDataTime)} ,${projectViewModel.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${projectViewModel.user.age.toString() + "y"}', + '${DateUtil.getMonthDayYearDateFormatted(projectViewModel.user.dateofBirthDataTime)} ,${projectViewModel.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${projectViewModel.user.age.toString() + " " + TranslationBase.of(context).patientAge.toString()}', style: TextStyle( color: Colors.white, fontSize: 12, diff --git a/lib/pages/medical/balance/confirm_payment_page.dart b/lib/pages/medical/balance/confirm_payment_page.dart index bc92bc08..e1a0b843 100644 --- a/lib/pages/medical/balance/confirm_payment_page.dart +++ b/lib/pages/medical/balance/confirm_payment_page.dart @@ -14,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -190,15 +191,12 @@ class _ConfirmPaymentPageState extends State { bottomSheet: Container( color: Colors.white, child: Container( - height: MediaQuery.of(context).size.width * 0.18, + // height: MediaQuery.of(context).size.width * 0.18, width: double.infinity, - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: CustomColors.accentColor, - label: TranslationBase.of(context).confirm.toUpperCase(), - disabled: model.state == ViewState.Busy, - onTap: () { + padding: EdgeInsets.all(20), + child: DefaultButton( + TranslationBase.of(context).confirm.toUpperCase(), + () { GifLoaderDialogUtils.showMyDialog(context); model.sendActivationCodeForAdvancePayment(patientID: int.parse(widget.advanceModel.fileNumber), projectID: widget.advanceModel.hospitalsModel.iD).then((value) { GifLoaderDialogUtils.hideDialog(context); diff --git a/lib/pages/medical/labs/passport_update_page.dart b/lib/pages/medical/labs/passport_update_page.dart index 51efda3a..f9a665d1 100644 --- a/lib/pages/medical/labs/passport_update_page.dart +++ b/lib/pages/medical/labs/passport_update_page.dart @@ -90,7 +90,7 @@ class _PassportUpdatePageState extends State { Row( children: [ Text( - TranslationBase.of(context).fileNo + ":", + TranslationBase.of(context).identificationNumber + ":", style: TextStyle( fontWeight: FontWeight.w600, fontSize: 10, diff --git a/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart b/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart index 0095fb94..4efc7ba5 100644 --- a/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart +++ b/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart @@ -56,7 +56,7 @@ class _AddBloodSugarPageState extends State { final List measureTimeArList = [ "قبل الإفطار", "بعد الإفطار", - "بعد الغداء", + "قبل الغداء", "بعد الغداء", "قبل العشاء", "بعد العشاء", diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index edc2e2e0..ba8dba86 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2385,6 +2385,16 @@ class TranslationBase { String get selectSearchCriteria => localizedValues["selectSearchCriteria"][locale.languageCode]; String get enterComplainNumber => localizedValues["enterComplainNumber"][locale.languageCode]; + + String get cancelAppointment => localizedValues["cancelAppointment"][locale.languageCode]; + + String get updateInsurCards => localizedValues["updateInsurCards"][locale.languageCode]; + + String get patientAge => localizedValues["patientAge"][locale.languageCode]; + + + + } class TranslationBaseDelegate extends LocalizationsDelegate {