Updates & fixes

merge-update-with-lab-changes
haroon amjad 4 years ago
parent 6511ca8dc7
commit e564cdc7e5

@ -92,7 +92,7 @@ const Map localizedValues = {
'changePayment': {'en': 'Change Payment Method', 'ar': 'تغيير آلية الدفع'}, 'changePayment': {'en': 'Change Payment Method', 'ar': 'تغيير آلية الدفع'},
'upcoming-noAction': {'en': 'No Action Required', 'ar': 'لا يلزم اتخاذ أي إجراء'}, 'upcoming-noAction': {'en': 'No Action Required', 'ar': 'لا يلزم اتخاذ أي إجراء'},
'upcoming-confirm': {'en': 'Please confirm the appointment to avoid cancellation', '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-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-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': 'استخدم الرمز لتسجيل الحضور بشكل آلي في المستشفى'}, '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": "نوع الاستفسار"}, "requestType": {"en": "Request Type", "ar": "نوع الاستفسار"},
"register-info-family": {"en": "How would like to add the new member?", "ar": "كيف ترغب باضافة العضو الجديد؟"}, "register-info-family": {"en": "How would like to add the new member?", "ar": "كيف ترغب باضافة العضو الجديد؟"},
"remove-family-member": {"en": "Remove this 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': 'جميع سجلاتك الطبية'}, "myMedicalFileSubTitle": {"en": "All your medical records", 'ar': 'جميع سجلاتك الطبية'},
"viewMore": {"en": "View More", 'ar': 'عرض المزيد'}, "viewMore": {"en": "View More", 'ar': 'عرض المزيد'},
"homeHealthCareService": {"en": "Home Health Care Service", 'ar': 'الرعاية الصحية المنزلية'}, "homeHealthCareService": {"en": "Home Health Care Service", 'ar': 'الرعاية الصحية المنزلية'},
@ -331,7 +331,7 @@ const Map localizedValues = {
"MyDoctorSubtitle": {"en": "List", "ar": "قمت بزيارتهم"}, "MyDoctorSubtitle": {"en": "List", "ar": "قمت بزيارتهم"},
"Eye": {"en": "Eye", "ar": "قياسات"}, "Eye": {"en": "Eye", "ar": "قياسات"},
"EyeSubtitle": {"en": "Measurement", "ar": "النظر"}, "EyeSubtitle": {"en": "Measurement", "ar": "النظر"},
"Insurance": {"en": "Insurance", "ar": "بطاقة"}, "Insurance": {"en": "Insurance", "ar": "بطاقات"},
"InsuranceSubtitle": {"en": "Card", "ar": "التأمين"}, "InsuranceSubtitle": {"en": "Card", "ar": "التأمين"},
"UpdateInsurance": {"en": "Update Insurance", "ar": "تحديث التأمين"}, "UpdateInsurance": {"en": "Update Insurance", "ar": "تحديث التأمين"},
"UpdateInsuranceSubtitle": {"en": "Card", "ar": "التأمين"}, "UpdateInsuranceSubtitle": {"en": "Card", "ar": "التأمين"},
@ -399,7 +399,7 @@ const Map localizedValues = {
"AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"}, "AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"},
"AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"}, "AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"},
"FileNumber": {"en": "File Number", "ar": "رقم الملف"}, "FileNumber": {"en": "File Number", "ar": "رقم الملف"},
"Amount": {"en": "Amount *", "ar": "المبلغ *"}, "Amount": {"en": "Amount *", "ar": "الكمية *"},
"DepositorEmail": {"en": "Depositor Email *", "ar": "البريد الإلكتروني للمودع *"}, "DepositorEmail": {"en": "Depositor Email *", "ar": "البريد الإلكتروني للمودع *"},
"Notes": {"en": "Notes", "ar": "ملاحظات"}, "Notes": {"en": "Notes", "ar": "ملاحظات"},
"SelectPatientName": {"en": "Select Patient Name", "ar": "اختر اسم المريض"}, "SelectPatientName": {"en": "Select Patient Name", "ar": "اختر اسم المريض"},
@ -511,9 +511,9 @@ const Map localizedValues = {
"medicalFile": {"en": "Medical File", "ar": "ملف طبي"}, "medicalFile": {"en": "Medical File", "ar": "ملف طبي"},
"verified": {"en": "Verified", "ar": "تم التحقق"}, "verified": {"en": "Verified", "ar": "تم التحقق"},
"checkup": {"en": "Checkup", "ar": "فحص"}, "checkup": {"en": "Checkup", "ar": "فحص"},
"hhcHome": {"en": "HHC Home", "ar": "الصفحة الرئيسية HHC"}, "hhcHome": {"en": "Home", "ar": "الرعاية"},
"refferal": {"en": "E-Refferal", "ar": "الإحالة الإلكترونية"}, "refferal": {"en": "E-Refferal", "ar": "الإحالة الإلكترونية"},
"healthCare": {"en": "Health Care", "ar": "الرعاية الصحية"}, "healthCare": {"en": "Health Care", "ar": "الصحية المزلية"},
"emergency": {"en": "Emergency", "ar": "طارئ"}, "emergency": {"en": "Emergency", "ar": "طارئ"},
"cantSeeProfile": {"en": "Cant see your medical File?", "ar": "لا تستطيع رؤية ملفك الطبي؟"}, "cantSeeProfile": {"en": "Cant see your medical File?", "ar": "لا تستطيع رؤية ملفك الطبي؟"},
"loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"}, "loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"},
@ -521,7 +521,7 @@ const Map localizedValues = {
"ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"}, "ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"},
"services2": {"en": "Services", "ar": "خدمات"}, "services2": {"en": "Services", "ar": "خدمات"},
"comprehensive": {"en": "Comprehensive", "ar": "شامل"}, "comprehensive": {"en": "Comprehensive", "ar": "شامل"},
"onlineConsulting": {"en": "Online Consulting", "ar": "استشارات عبر الإنترنت"}, "onlineConsulting": {"en": "Online Consulting", "ar": "استشارات فورية"},
"pendingOrder": {"en": " PENDING", "ar": " معلقة"}, "pendingOrder": {"en": " PENDING", "ar": " معلقة"},
"deliveredOrder": {"en": " DELIVERED", "ar": "تم التوصيل"}, "deliveredOrder": {"en": " DELIVERED", "ar": "تم التوصيل"},
"processingOrder": {"en": " PROCESSING", "ar": "قيد التنفيذ"}, "processingOrder": {"en": " PROCESSING", "ar": "قيد التنفيذ"},
@ -1238,7 +1238,7 @@ const Map localizedValues = {
"undo": {"en": "Undo", "ar": "تراجع"}, "undo": {"en": "Undo", "ar": "تراجع"},
"drinking": {"en": "Drinkning", "ar": "الشرب"}, "drinking": {"en": "Drinkning", "ar": "الشرب"},
"remaining": {"en": "Remaining", "ar": "المتبقي"}, "remaining": {"en": "Remaining", "ar": "المتبقي"},
"addCustomAmount": {"en": "Add Custom Amount", "ar": "إضافة مبلغ مخصص"}, "addCustomAmount": {"en": "Add Custom Amount", "ar": "إضافة كمية محددة"},
"left": {"en": "Left", "ar": "المتبقي"}, "left": {"en": "Left", "ar": "المتبقي"},
"taken": {"en": "Taken", "ar": " مأخوذ"}, "taken": {"en": "Taken", "ar": " مأخوذ"},
"ml": {"en": "ML", "ar": "مل"}, "ml": {"en": "ML", "ar": "مل"},
@ -1300,7 +1300,7 @@ const Map localizedValues = {
"try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'}, "try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'},
"app-update": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"}, "app-update": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"},
"covid-alert": {"en": "Alert", "ar": "تنبيه"}, "covid-alert": {"en": "Alert", "ar": "تنبيه"},
"enterIdentificationNumber": {"en": "Enter Identification Number", "ar": "أدخل رقم التعريف"}, "enterIdentificationNumber": {"en": "Enter Identification Number", "ar": "أدخل رقم الهوية"},
"identificationNumber": {"en": "Identification Number", "ar": "رقم الهوية"}, "identificationNumber": {"en": "Identification Number", "ar": "رقم الهوية"},
"complaintNumber": {"en": "Complaint Number", "ar": "رقم الشكوى"}, "complaintNumber": {"en": "Complaint Number", "ar": "رقم الشكوى"},
"accountActivationDesc": { "accountActivationDesc": {
@ -1513,4 +1513,8 @@ const Map localizedValues = {
"modesBelow": { "en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه" }, "modesBelow": { "en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه" },
"prefferedMode": { "en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه" }, "prefferedMode": { "en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه" },
"permissionsBellow": { "en": "Please allow the permissions 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": "سنة"},
}; };

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

@ -485,6 +485,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
); );
} }
String getRelationName() { String getRelationName() {
if (_selectedCity != null) if (_selectedCity != null)
return _selectedCity.description; return _selectedCity.description;

@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.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/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -98,33 +99,34 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
InkWell( // InkWell(
onTap: () => confirmSelectCountryTypeDialog(), // onTap: () => confirmSelectCountryTypeDialog(),
child: Container( // child: Container(
padding: EdgeInsets.all(12), // padding: EdgeInsets.all(12),
width: double.infinity, // width: double.infinity,
height: 65, // height: 65,
decoration: BoxDecoration( // decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
color: Colors.white), // color: Colors.white),
child: Row( // child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
Texts(getCountryName()), // Texts(getCountryName()),
Icon(Icons.arrow_drop_down) // Icon(Icons.arrow_drop_down)
], // ],
), // ),
), // ),
), // ),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
MobileNumberTextFiled( // MobileNumberTextFiled(
controller: _mobileTextController, // controller: _mobileTextController,
code: _selectedCountry == null // code: _selectedCountry == null
? "11" // ? "11"
: _selectedCountry["code"], // : _selectedCountry["code"],
), // ),
PhoneNumberSelectorWidget(onNumberChange: (value) => {_mobileTextController.text = value, validateForm()}, onCountryChange: (value) => _selectedCountry = value),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
@ -208,6 +210,18 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
); );
} }
void validateForm() {
// if (util.validateIDBox(nationalIDorFile.text, loginType) == true && util.isSAUDIIDValid(nationalIDorFile.text, loginType) == true) {
// setState(() {
// isButtonDisabled = false;
// });
// } else {
// setState(() {
// isButtonDisabled = true;
// });
// }
}
void confirmSelectCountryTypeDialog() { void confirmSelectCountryTypeDialog() {
showDialog( showDialog(
context: context, context: context,
@ -238,7 +252,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
} }
class MobileNumberTextFiled extends StatelessWidget { class MobileNumberTextFiled extends StatelessWidget {
const MobileNumberTextFiled({ MobileNumberTextFiled({
Key key, Key key,
this.controller, this.controller,
this.code this.code
@ -246,7 +260,7 @@ class MobileNumberTextFiled extends StatelessWidget {
final TextEditingController controller; final TextEditingController controller;
final String code; String code;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -267,19 +281,21 @@ class MobileNumberTextFiled extends StatelessWidget {
code.toString(), code.toString(),
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
)), )),
Expanded( // Expanded(
flex: 4, // flex: 4,
child: Container( // child: Container(
margin: EdgeInsets.all(5), // margin: EdgeInsets.all(5),
child: TextField( // child: TextField(
controller: controller, // controller: controller,
keyboardType: TextInputType.phone, // keyboardType: TextInputType.phone,
decoration: InputDecoration( // decoration: InputDecoration(
border: InputBorder.none, hintText: TranslationBase.of(context).mobileNumber), // border: InputBorder.none, hintText: TranslationBase.of(context).mobileNumber),
), // ),
), // ),
) // )
// PhoneNumberSelectorWidget(onNumberChange: (value) => {controller.text = value, validateForm()}, onCountryChange: (value) => code = value),
]), ]),
); );
} }
} }

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart'; 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/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -7,14 +8,15 @@ import 'package:flutter/material.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class SelectSearchCriteriaDialog extends StatefulWidget { class SelectSearchCriteriaDialog extends StatefulWidget {
List<SearchCriteriaModel> searchCriteria = [ List<SearchCriteriaModel> searchCriteria = [
SearchCriteriaModel(name: "Identification Number",nameAr:"رقم المحول",value: 1), SearchCriteriaModel(name: "Identification Number",nameAr:"رقم الهوية",value: 1),
SearchCriteriaModel(name: "Referral Number",nameAr:"رقم المحول",value: 2), SearchCriteriaModel(name: "Referral Number",nameAr:"رقم الإحالة",value: 2),
]; ];
final Function(SearchCriteriaModel) onValueSelected; final Function(SearchCriteriaModel) onValueSelected;
SearchCriteriaModel selectedCriteria; SearchCriteriaModel selectedCriteria;
ProjectViewModel projectViewModel;
SelectSearchCriteriaDialog( SelectSearchCriteriaDialog(
{Key key, this.onValueSelected, this.selectedCriteria}); {Key key, this.onValueSelected, this.selectedCriteria, this.projectViewModel});
@override @override
_SelectSearchCriteriaDialogState createState() => _SelectSearchCriteriaDialogState(); _SelectSearchCriteriaDialogState createState() => _SelectSearchCriteriaDialogState();
@ -54,7 +56,7 @@ class _SelectSearchCriteriaDialogState extends State<SelectSearchCriteriaDialog>
}); });
}, },
child: ListTile( child: ListTile(
title: Text(widget.searchCriteria[index].name), title: Text(widget.projectViewModel.isArabic ? widget.searchCriteria[index].nameAr : widget.searchCriteria[index].name),
leading: Radio( leading: Radio(
value: widget.searchCriteria[index], value: widget.searchCriteria[index],
groupValue: widget.selectedCriteria, groupValue: widget.selectedCriteria,

@ -39,9 +39,9 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
TextEditingController _mobileTextController = TextEditingController(); TextEditingController _mobileTextController = TextEditingController();
bool _isSubmitted = false; 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -81,7 +81,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
height: 10, height: 10,
), ),
InkWell( InkWell(
onTap: () => selectSearchCriteriaDialog(), onTap: () => selectSearchCriteriaDialog(projectViewModel),
child: Container( child: Container(
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
width: double.infinity, width: double.infinity,
@ -89,7 +89,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white), decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, 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<SearchForReferralsPage> {
height: 12, height: 12,
), ),
NewTextFields( 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, controller: _searchTextController,
onChanged: (_) { onChanged: (_) {
setState(() {}); setState(() {});
@ -244,11 +244,12 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
return "Country"; return "Country";
} }
void selectSearchCriteriaDialog() { void selectSearchCriteriaDialog(ProjectViewModel projectViewModel) {
showDialog( showDialog(
context: context, context: context,
child: SelectSearchCriteriaDialog( child: SelectSearchCriteriaDialog(
selectedCriteria: selectedCriteria, selectedCriteria: selectedCriteria,
projectViewModel: projectViewModel,
onValueSelected: (value) { onValueSelected: (value) {
setState(() { setState(() {
selectedCriteria = value; selectedCriteria = value;
@ -258,7 +259,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
); );
} }
String getSearchCriteriaName() { String getSearchCriteriaName(ProjectViewModel projectViewModel) {
return selectedCriteria.name; return projectViewModel.isArabic ? selectedCriteria.nameAr : selectedCriteria.name;
} }
} }

@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/components/DocAvailab
import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.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_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
@ -187,7 +188,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
list.add( list.add(
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).cancel, TranslationBase.of(context).cancelAppointment,
() { () {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
@ -198,8 +199,8 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
cancelFunction: () => {}); cancelFunction: () => {});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
}, },
color: Color(0xffEAEAEA), color: CustomColors.accentColor,
textColor: Color(0xff000000), textColor: CustomColors.white,
), ),
), ),
); );
@ -219,7 +220,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
list.add( list.add(
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).cancel, TranslationBase.of(context).cancelAppointment,
() { () {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
@ -230,7 +231,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
cancelFunction: () => {}); cancelFunction: () => {});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
}, },
// color: Color(0xffEAEAEA), color: CustomColors.accentColor,
// textColor: Color(0xff000000), // textColor: Color(0xff000000),
), ),
), ),

@ -381,12 +381,12 @@ class _AppointmentActionsState extends State<AppointmentActions> {
print(finalRadiology.reportData); print(finalRadiology.reportData);
navigateToRadiologyDetails(finalRadiology); navigateToRadiologyDetails(finalRadiology);
} else { } else {
AppToast.showErrorToast(message: res['ErrorEndUserMessage']); AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound);
} }
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); print(err);
AppToast.showErrorToast(message: err); AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound);
}); });
} }

@ -43,7 +43,7 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
showNewAppBar: true, showNewAppBar: true,
baseViewModel: model, baseViewModel: model,
showNewAppBarTitle: true, showNewAppBarTitle: true,
appBarTitle: TranslationBase.of(context).insuranceApproval, appBarTitle: TranslationBase.of(context).insuranceApprovalSubtitle,
description: TranslationBase.of(context).infoApprovals, description: TranslationBase.of(context).infoApprovals,
infoList: TranslationBase.of(context).infoApprovalPoints, infoList: TranslationBase.of(context).infoApprovalPoints,
imagesInfo: imagesInfo, imagesInfo: imagesInfo,

@ -36,7 +36,7 @@ class _InsuranceUpdateState extends State<InsuranceUpdate> with SingleTickerProv
return BaseView<InsuranceViewModel>( return BaseView<InsuranceViewModel>(
onModelReady: (model) => model.getInsuranceUpdated(), onModelReady: (model) => model.getInsuranceUpdated(),
builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold(
appBarTitle: TranslationBase.of(context).insurCards, appBarTitle: TranslationBase.of(context).updateInsurCards,
description: TranslationBase.of(context).infoInsurCards, description: TranslationBase.of(context).infoInsurCards,
infoList: TranslationBase.of(context).infoPrescriptionsPoints, infoList: TranslationBase.of(context).infoPrescriptionsPoints,
imagesInfo: imagesInfo, imagesInfo: imagesInfo,

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

@ -123,7 +123,7 @@ class LoggedSliderView extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 20, right: 20), padding: const EdgeInsets.only(left: 20, right: 20),
child: Text( 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( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 12, fontSize: 12,

@ -14,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.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/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -190,15 +191,12 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
bottomSheet: Container( bottomSheet: Container(
color: Colors.white, color: Colors.white,
child: Container( child: Container(
height: MediaQuery.of(context).size.width * 0.18, // height: MediaQuery.of(context).size.width * 0.18,
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(12), padding: EdgeInsets.all(20),
child: SecondaryButton( child: DefaultButton(
textColor: Colors.white, TranslationBase.of(context).confirm.toUpperCase(),
color: CustomColors.accentColor, () {
label: TranslationBase.of(context).confirm.toUpperCase(),
disabled: model.state == ViewState.Busy,
onTap: () {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
model.sendActivationCodeForAdvancePayment(patientID: int.parse(widget.advanceModel.fileNumber), projectID: widget.advanceModel.hospitalsModel.iD).then((value) { model.sendActivationCodeForAdvancePayment(patientID: int.parse(widget.advanceModel.fileNumber), projectID: widget.advanceModel.hospitalsModel.iD).then((value) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

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

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

@ -2385,6 +2385,16 @@ class TranslationBase {
String get selectSearchCriteria => localizedValues["selectSearchCriteria"][locale.languageCode]; String get selectSearchCriteria => localizedValues["selectSearchCriteria"][locale.languageCode];
String get enterComplainNumber => localizedValues["enterComplainNumber"][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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save