Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'haroon-new-design' into 'development_new_design_2.0'

Browse Source 
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!445
merge-requests/446/merge
haroon amjad 3 years ago
parent e4c8575a7f babb48b1db
commit 68642c3ba4
18 changed files with 99 additions and 78 deletions
Show Stats Download Patch File Download Diff File

27
lib/config/localized_values.dart
Unescape Escape View File

@ -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": "قيد التنفيذ"},
@ -1071,8 +1071,8 @@ const Map localizedValues = {
"added-child": {"en": "The request was successful. You have added a child to the vaccination schedule subscription service.", "ar": "تمت الاضافة بنجاح."},
"appUpdate": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"},
"ereferralSaveSuccess": {
"en": "The referral request has been submitted successfully, you will be contacted ASAP to complete the process. Referral request no is ",
"ar": " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية. رقم طلب الإحالة"
"en": "The referral request has been submitted successfully, you will be contacted ASAP to complete the process.",
"ar": " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية."
},
"help": {"en": "Help", "ar": "مساعدة"},
"habibRobotText": {
@ -1237,7 +1237,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": "مل"},
@ -1299,7 +1299,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": {
@ -1512,6 +1512,11 @@ 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": "سنة"},
"searchCriteria": { "en": "Select Search Criteria", "ar": "حدد معايير البحث" },
"RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
"PatientInfo": {"en": "Patient Info", "ar": "معلومات المريض"},
"OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},

5
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -119,9 +119,12 @@ class BaseAppClient {
//
// if(body.containsKey("patientOutSa"))
// body.remove("PatientOutSA");
//
// body['PatientID'] = 1018977;
// body['TokenID'] = "@dm!n";
// body['IdentificationNo'] = "1009199553";
// body['MobileNo'] = "966545156035";
// body['PatientMobileNumber'] = "966545156035";
print("URL : $url");
final jsonBody = json.encode(body);

27
lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
Unescape Escape View File

@ -8,10 +8,8 @@ import 'package:diplomaticquarterapp/core/viewModels/all_habib_medical_services/
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/dialogs/select_country_ingo_Dialog.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/dialogs/select_relation_type_dialog.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/new_text_Field.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -19,7 +17,6 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.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:diplomaticquarterapp/widgets/otp/sms-popup.dart';
@ -107,7 +104,7 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
SizedBox(
height: 12,
),
Directionality(textDirection: TextDirection.ltr, child: inputWidget(TranslationBase.of(context).enterReferralRequesterName, "", _nameTextController, isInputTypeNum: true)),
inputWidget(TranslationBase.of(context).enterReferralRequesterName, "", _nameTextController, isInputTypeNum: false),
SizedBox(
height: 12,
),
@ -187,17 +184,17 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
(_nameTextController.text.isEmpty || _selectedRelation == null || mobileNo.isEmpty)
? null
: () async {
Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(context);
SendActivationCodeForEReferralRequestModel sendActivationCodeForEReferralRequestModel = SendActivationCodeForEReferralRequestModel(
zipCode: _selectedCountry['code'],
patientMobileNumber: int.parse(mobileNo),
);
await model.sendActivationCodeForEReferral(sendActivationCodeForEReferralRequestModel);
GifLoaderDialogUtils.hideDialog(context);
showSMSDialog(model);
});
},
Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(context);
SendActivationCodeForEReferralRequestModel sendActivationCodeForEReferralRequestModel = SendActivationCodeForEReferralRequestModel(
zipCode: _selectedCountry['code'],
patientMobileNumber: int.parse(mobileNo),
);
await model.sendActivationCodeForEReferral(sendActivationCodeForEReferralRequestModel);
GifLoaderDialogUtils.hideDialog(context);
showSMSDialog(model);
});
},
disabledColor: Colors.grey,
),
),

17
lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart
Unescape Escape View File

@ -238,7 +238,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
height: 12,
),
Container(
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
// decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Column(
children: [
Row(
@ -248,17 +248,19 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
children: [
Checkbox(
value: isPatientInsured,
activeColor: Colors.black38,
activeColor: CustomColors.accentColor,
onChanged: (bool newValue) {
setState(() {
isPatientInsured = newValue;
});
}),
Padding(
padding: const EdgeInsets.all(20.0),
child: Texts(
TranslationBase.of(context).insuredPatientReferral,
fontSize: 17,
padding: const EdgeInsets.all(5.0),
child: Text(
TranslationBase.of(context).insuredPatientReferral, style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600
),
),
),
],
@ -385,7 +387,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
Utils.showErrorToast(model.error);
} else {
GifLoaderDialogUtils.hideDialog(context);
AppToast.showSuccessToast(message: "Referral sent successfully");
AppToast.showSuccessToast(message: TranslationBase.of(context).ereferralSaveSuccess);
}
});
},
@ -467,6 +469,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
);
}
String getRelationName() {
if (_selectedCity != null)
return _selectedCity.description;

4
lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
// todo create a model for Country
// todo use country from the json
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};
AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser;
@ -85,7 +85,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
SizedBox(
height: 12,
),
inputWidget(TranslationBase.of(context).patientName, "", _patientNameTextController, isInputTypeNum: true),
inputWidget(TranslationBase.of(context).patientName, "", _patientNameTextController, isInputTypeNum: false),
SizedBox(
height: 12,
),

12
lib/pages/AlHabibMedicalService/E-Referral/dialogs/select_search_criteria_dialog.dart
Unescape Escape View File

@ -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<SearchCriteriaModel> 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();
@ -33,7 +35,7 @@ class _SelectSearchCriteriaDialogState extends State<SelectSearchCriteriaDialog>
children: [
Column(
children: [
Texts(" Select Search Criteria", fontSize: 20,),
Text(TranslationBase.of(context).searchCriteria),
Divider(),
...List.generate(
widget.searchCriteria.length,
@ -54,7 +56,7 @@ class _SelectSearchCriteriaDialogState extends State<SelectSearchCriteriaDialog>
});
},
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,

2
lib/pages/AlHabibMedicalService/E-Referral/referral_details.dart
Unescape Escape View File

@ -30,7 +30,7 @@ class _ReferralDetailsState extends State<ReferralDetails> {
Container(
width: double.infinity,
child: Card(
elevation: 3.0,
elevation: 0.0,
shape: cardRadius(12),
margin:
EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),

25
lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
Unescape Escape View File

@ -5,15 +5,12 @@ import 'package:diplomaticquarterapp/core/viewModels/all_habib_medical_services/
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/referral_details.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/new_text_Field.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart';
import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -23,7 +20,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'New_E_Referral/new_e_referral_step_one_page.dart';
import 'dialogs/select_country_ingo_Dialog.dart';
import 'dialogs/select_search_criteria_dialog.dart';
@ -37,12 +33,12 @@ class SearchForReferralsPage extends StatefulWidget {
class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
TextEditingController _searchTextController = TextEditingController();
String mobileNo = "";
String mobileNo = "";
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) {
@ -106,7 +102,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
),
),
child: InkWell(
onTap: () => selectSearchCriteriaDialog(),
onTap: () => selectSearchCriteriaDialog(projectViewModel),
child: Row(
children: [
Expanded(
@ -123,7 +119,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
),
),
Text(
getSearchCriteriaName(),
getSearchCriteriaName(projectViewModel),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
@ -144,7 +140,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
height: 12,
),
inputWidget(selectedCriteria.value == 1 ? "Enter Patient Identification No" : "Enter Referral Number", "", _searchTextController, isInputTypeNum: true),
inputWidget(selectedCriteria.value == 1 ? TranslationBase.of(context).enterIdentificationNumber : TranslationBase.of(context).referralNumber, "", _searchTextController, isInputTypeNum: true),
SizedBox(
height: 12,
@ -207,8 +203,8 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
);
},
child: Card(
elevation: 0.0,
shape: cardRadius(12),
margin: EdgeInsets.all(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
@ -296,11 +292,12 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
return "Country";
}
void selectSearchCriteriaDialog() {
void selectSearchCriteriaDialog(ProjectViewModel projectViewModel) {
showDialog(
context: context,
child: SelectSearchCriteriaDialog(
selectedCriteria: selectedCriteria,
projectViewModel: projectViewModel,
onValueSelected: (value) {
setState(() {
selectedCriteria = value;
@ -383,7 +380,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
);
}
String getSearchCriteriaName() {
return selectedCriteria.name;
String getSearchCriteriaName(ProjectViewModel projectViewModel) {
return projectViewModel.isArabic ? selectedCriteria.nameAr : selectedCriteria.name;
}
}

11
lib/pages/MyAppointments/AppointmentDetails.dart
Unescape Escape View File

@ -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<AppointmentDetails> 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<AppointmentDetails> 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<AppointmentDetails> 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<AppointmentDetails> with SingleTick
cancelFunction: () => {});
dialog.showAlertDialog(context);
},
// color: Color(0xffEAEAEA),
color: CustomColors.accentColor,
// textColor: Color(0xff000000),
),
),

4
lib/pages/MyAppointments/widgets/AppointmentActions.dart
Unescape Escape View File

@ -381,12 +381,12 @@ class _AppointmentActionsState extends State<AppointmentActions> {
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);
});
}

2
lib/pages/insurance/insurance_approval_screen.dart
Unescape Escape View File

@ -43,7 +43,7 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
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,

2
lib/pages/insurance/insurance_update_screen.dart
Unescape Escape View File

@ -36,7 +36,7 @@ class _InsuranceUpdateState extends State<InsuranceUpdate> with SingleTickerProv
return BaseView<InsuranceViewModel>(
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,

2
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -405,7 +405,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
// Permission.notification,
// Permission.accessMediaLocation,
// Permission.calendar,
Permission.activityRecognition
// Permission.activityRecognition
].request();
// var permissionsGranted = await deviceCalendarPlugin.hasPermissions();

2
lib/pages/landing/widgets/logged_slider_view.dart
Unescape Escape View File

@ -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,

14
lib/pages/medical/balance/confirm_payment_page.dart
Unescape Escape View File

@ -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<ConfirmPaymentPage> {
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);

2
lib/pages/medical/labs/passport_update_page.dart
Unescape Escape View File

@ -90,7 +90,7 @@ class _PassportUpdatePageState extends State<PassportUpdatePage> {
Row(
children: [
Text(
TranslationBase.of(context).fileNo + ":",
TranslationBase.of(context).identificationNumber + ":",
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 10,

2
lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart
Unescape Escape View File

@ -57,7 +57,7 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
final List<String> measureTimeArList = [
"قبل الإفطار",
"بعد الإفطار",
"بعد الغداء",
"قبل الغداء",
"بعد الغداء",
"قبل العشاء",
"بعد العشاء",

17
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'dart:async';
import 'package:diplomaticquarterapp/config/localized_values.dart';
import 'package:diplomaticquarterapp/pages/symptom-checker/select-gender.dart';
import 'package:flutter/foundation.dart' show SynchronousFuture;
import 'package:flutter/material.dart';
@ -111,6 +110,7 @@ class TranslationBase {
String get appointmentCalendar => localizedValues['appointmentCalendar'][locale.languageCode];
String get appointmentReminder => localizedValues['appointmentReminder'][locale.languageCode];
String get prescriptionReminder => localizedValues['prescriptionReminder'][locale.languageCode];
String get pleaseSelectFromBelowOptions => localizedValues['please_select_from_below_options'][locale.languageCode];
@ -2374,8 +2374,11 @@ class TranslationBase {
String get recAlert => localizedValues["recAlert"][locale.languageCode];
String get modesBelow => localizedValues["modesBelow"][locale.languageCode];
String get prefferedMode => localizedValues["prefferedMode"][locale.languageCode];
String get permissionsBellow => localizedValues["permissionsBellow"][locale.languageCode];
String get invoiceDetails => localizedValues["invoiceDetails"][locale.languageCode];
String get appoDetails => localizedValues["appoDetails"][locale.languageCode];
@ -2386,10 +2389,22 @@ class TranslationBase {
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];
String get searchCriteria => localizedValues["searchCriteria"][locale.languageCode];
String get RequesterInfo => localizedValues["RequesterInfo"][locale.languageCode];
String get PatientInfo => localizedValues["PatientInfo"][locale.languageCode];
String get OtherInfo => localizedValues["OtherInfo"][locale.languageCode];
String get inPrgress => localizedValues["inPrgress"][locale.languageCode];
String get locked => localizedValues["locked"][locale.languageCode];
}

Write Preview
Loading…
Cancel
Save