Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs

android/app/build.gradle

@@ -40,7 +40,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
 //        applicationId "com.cloud.diplomaticquarterapp"
-        applicationId "com.ejada.hmg"
+        applicationId "com.ejada.hmg.uat"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()

android/app/google-services.json

@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
         "android_client_info": {
-          "package_name": "com.ejada.hmg"
+          "package_name": "com.ejada.hmg.uat"
         }
       },
       "oauth_client": [

ios/Podfile

@@ -3,6 +3,7 @@
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+$FirebaseAnalyticsWithoutAdIdSupport = true
 
 project 'Runner', {
   'Debug' => :debug,

lib/analytics/analytic-events.dart

@@ -0,0 +1,69 @@
+import 'package:diplomaticquarterapp/uitl/utils.dart';
+
+class _Event{
+  String name;
+  String description;
+  bool active;
+  _Event(dynamic map){
+    name = map['name'];
+    description = map['description'];
+    active = map['active'];
+  }
+
+  flutterName() => 'f: $name';
+}
+
+class AnalyticEvents{
+  static _Event get(String key) {
+    var e = _Event(mapping[key]);
+    if(e == null){
+      var label = labelFrom(className: key); //  Convert Class Name in to Label (HomeCare -> Home Care)
+      e = _Event({"name": label, "active":true, "description":key});
+    }
+    return e;
+  }
+
+  static var mapping = const {
+    "HomeHealthCarePage" : {
+      "active" : true,
+      "name" : "Home Health Care Page",
+      "description" : "",
+    },
+    "SplashScreen" : {
+      "active" : true,
+      "name" : "Splash Screen",
+      "description" : "",
+    },
+    "LandingPage" : {
+      "active" : true,
+      "name" : "Landing Page",
+      "description" : "",
+    },
+    "WelcomeLogin" : {
+      "active" : true,
+      "name" : "Welcome Login",
+      "description" : "",
+    },
+    "LoginType" : {
+      "active" : true,
+      "name" : "Login Type",
+      "description" : "",
+    },
+    "Login" : {
+      "active" : true,
+      "name" : "Login",
+      "description" : "",
+    },
+    "ForgotPassword" : {
+      "active" : true,
+      "name" : "Forgot Password",
+      "description" : "",
+    },
+    "" : {
+      "active" : true,
+      "name" : "",
+      "description" : "",
+    },
+  };
+}
+

lib/analytics/google-analytics.dart

@@ -0,0 +1,85 @@
+import 'package:diplomaticquarterapp/analytics/analytic-events.dart';
+import 'package:diplomaticquarterapp/routes.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:firebase_analytics/observer.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class Singleton {
+  const Singleton(); //Constant constructor
+
+  void hello() { print('Hello world'); }
+}
+
+var analytics = FirebaseAnalytics();
+
+class GAnalytics{
+  const GAnalytics();
+  static GAnalytics shared = const GAnalytics();
+  NavObserver navObserver() => NavObserver();
+}
+// adb shell setprop debug.firebase.analytics.app com.ejada.hmg -> Android
+class NavObserver extends RouteObserver<PageRoute<dynamic>>{
+
+  _sendScreenView(PageRoute route) async{
+
+
+    log(String className){
+      var event = AnalyticEvents.get(className);
+      if(event.active){
+         analytics.setCurrentScreen(screenName: event.flutterName(), screenClassOverride: className).catchError( (Object error) {
+          debugPrint('$FirebaseAnalyticsObserver: $error');
+        },
+          test: (Object error) {
+            return error is PlatformException;
+          },
+        );
+      }
+    }
+
+    if(route.settings.name != null && route.settings.name.isNotEmpty && route.settings.name != "null"){
+      var class_ = routes[route.settings.name](0);
+      if(class_ != null)
+        log(class_.toStringShort());
+
+    }else if(route is FadePage){
+      var class_ = route.page;
+      if(class_ != null)
+        log(class_.toStringShort());
+
+    }else if(route is MaterialPageRoute){
+      var class_ = route.builder(null);
+      if (class_ != null)
+        log(class_.toStringShort());
+
+    }else{
+      print("");
+    }
+
+  }
+
+  @override
+  void didPush(Route<dynamic> route, Route<dynamic> previousRoute) {
+    super.didPush(route, previousRoute);
+    if (route is PageRoute) {
+      _sendScreenView(route);
+    }
+  }
+
+  @override
+  void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {
+    super.didReplace(newRoute: newRoute, oldRoute: oldRoute);
+    if (newRoute is PageRoute) {
+      _sendScreenView(newRoute);
+    }
+  }
+
+  @override
+  void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {
+    super.didPop(route, previousRoute);
+    // if (previousRoute is PageRoute && route is PageRoute) {
+    //   _sendScreenView(previousRoute);
+    // }
+  }
+}

lib/config/config.dart

@@ -33,8 +33,7 @@ const GET_GEO_ZONES = 'Services/Patients.svc/REST/GeoF_GetAllPoints';
 const LOG_GEO_ZONES = 'Services/Patients.svc/REST/GeoF_InsertPatientFileInfo';
 
 // Delivery Driver
-const DRIVER_LOCATION =
+const DRIVER_LOCATION = 'Services/Patients.svc/REST/PatientER_GetDriverLocation';
-    'Services/Patients.svc/REST/PatientER_GetDriverLocation';
 
 //weather
 const WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
@@ -42,51 +41,36 @@ const WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
 const GET_PRIVILEGE = 'Services/Patients.svc/REST/Service_Privilege';
 
 // Wifi Credentials
-const WIFI_CREDENTIALS =
+const WIFI_CREDENTIALS = "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
-    "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
 
 ///Doctor
-const GET_MY_DOCTOR =
+const GET_MY_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
-    'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
 const GET_DOCTOR_PROFILE = 'Services/Doctors.svc/REST/GetDocProfiles';
-const GET_DOCTOR_RATING_NOTES =
+const GET_DOCTOR_RATING_NOTES = 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
-    'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
+const GET_DOCTOR_RATING_DETAILS = 'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
-const GET_DOCTOR_RATING_DETAILS =
-    'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
 const GET_DOCTOR_RATING = 'Services/Doctors.svc/REST/dr_GetAvgDoctorRating';
 
 ///Prescriptions
 const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
-const GET_PRESCRIPTIONS_ALL_ORDERS =
+const GET_PRESCRIPTIONS_ALL_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-    'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PRESCRIPTION_REPORT = 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
-const GET_PRESCRIPTION_REPORT =
+const SEND_PRESCRIPTION_EMAIL = 'Services/Notifications.svc/REST/SendPrescriptionEmail';
-    'Services/Patients.svc/REST/INP_GetPrescriptionReport';
+const GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
-const SEND_PRESCRIPTION_EMAIL =
-    'Services/Notifications.svc/REST/SendPrescriptionEmail';
-const GET_PRESCRIPTION_REPORT_ENH =
-    'Services/Patients.svc/REST/GetPrescriptionReport_enh';
 
 ///Lab Order
 const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
-const GET_Patient_LAB_SPECIAL_RESULT =
+const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
-    'Services/Patients.svc/REST/GetPatientLabSpecialResults';
+const SEND_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail';
-const SEND_LAB_RESULT_EMAIL =
+const GET_Patient_LAB_RESULT = 'Services/Patients.svc/REST/GetPatientLabResults';
-    'Services/Notifications.svc/REST/SendLabReportEmail';
+const GET_Patient_LAB_ORDERS_RESULT = 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
-const GET_Patient_LAB_RESULT =
-    'Services/Patients.svc/REST/GetPatientLabResults';
-const GET_Patient_LAB_ORDERS_RESULT =
-    'Services/Patients.svc/REST/GetPatientLabOrdersResults';
 
 ///
 const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
-const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT =
+const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT = 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
-    'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
 
-const GET_PATIENT_ORDERS_DETAILS =
+const GET_PATIENT_ORDERS_DETAILS = 'Services/Patients.svc/REST/Rad_UpdatePatientRadOrdersToRead';
-    'Services/Patients.svc/REST/Rad_UpdatePatientRadOrdersToRead';
 const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
-const SEND_RAD_REPORT_EMAIL =
+const SEND_RAD_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendRadReportEmail';
-    'Services/Notifications.svc/REST/SendRadReportEmail';
 
 ///Feedback
 const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList';
@@ -95,32 +79,23 @@ const GET_PATIENT_AppointmentHistory = 'Services'
     '/Doctors.svc/REST/PateintHasAppoimentHistory';
 
 ///VITAL SIGN
-const GET_PATIENT_VITAL_SIGN =
+const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
-    'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
 
 ///Er Nearest
-const GET_NEAREST_HOSPITAL =
+const GET_NEAREST_HOSPITAL = 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
-    'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
 
 ///ED Online
-const ER_GET_VISUAL_TRIAGE_QUESTIONS =
+const ER_GET_VISUAL_TRIAGE_QUESTIONS = "services/Doctors.svc/REST/ER_GetVisualTriageQuestions";
-    "services/Doctors.svc/REST/ER_GetVisualTriageQuestions";
+const ER_SAVE_TRIAGE_INFORMATION = "services/Doctors.svc/REST/ER_SaveTriageInformation";
-const ER_SAVE_TRIAGE_INFORMATION =
-    "services/Doctors.svc/REST/ER_SaveTriageInformation";
 const ER_GetPatientPaymentInformationForERClinic =
     "services/Doctors.svc/REST/ER_GetPatientPaymentInformationForERClinic";
 
 ///Er Nearest
-const GET_AMBULANCE_REQUEST =
+const GET_AMBULANCE_REQUEST = 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
-    'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
+const GET_PATIENT_ALL_PRES_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PATIENT_ALL_PRES_ORDERS =
+const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID = 'Services/Patients.svc/REST/PatientER_RRT_GetPickUpRequestByPresOrderID';
-    'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const UPDATE_PRESS_ORDER = 'Services/Patients.svc/REST/PatientER_UpdatePresOrder';
-const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID =
+const INSERT_ER_INERT_PRES_ORDER = 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
-    'Services/Patients.svc/REST/PatientER_RRT_GetPickUpRequestByPresOrderID';
-const UPDATE_PRESS_ORDER =
-    'Services/Patients.svc/REST/PatientER_UpdatePresOrder';
-const INSERT_ER_INERT_PRES_ORDER =
-    'Services/Patients.svc/REST/PatientER_InsertPresOrder';
 
 ///FindUs
 const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';
@@ -129,15 +104,13 @@ const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';
 const GET_LIVECHAT_REQUEST = 'Services/Patients.svc/REST/GetPatientICProjects';
 
 ///babyInformation
-const GET_BABYINFORMATION_REQUEST =
+const GET_BABYINFORMATION_REQUEST = 'Services/Community.svc/REST/GetBabyByUserID';
-    'Services/Community.svc/REST/GetBabyByUserID';
 
 ///Get Baby By User ID
 const GET_BABY_BY_USER_ID = 'Services/Community.svc/REST/GetBabyByUserID';
 
 ///userInformation
-const GET_USERINFORMATION_REQUEST =
+const GET_USERINFORMATION_REQUEST = 'Services/Community.svc/REST/GetUserInformation_New';
-    'Services/Community.svc/REST/GetUserInformation_New';
 
 ///Update email
 const UPDATE_PATENT_EMAIL = 'Services/Patients.svc/REST/UpdatePateintEmail';
@@ -159,29 +132,21 @@ const GET_TABLE_REQUEST = 'Services/Community.svc/REST/CreateVaccinationTable';
 const GET_CITIES_REQUEST = 'Services/Lists.svc/REST/GetAllCities';
 
 ///BloodDetails
-const GET_BLOOD_REQUEST =
+const GET_BLOOD_REQUEST = 'services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails';
-    'services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails';
 
-const SAVE_BLOOD_REQUEST =
+const SAVE_BLOOD_REQUEST = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
-    'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
 
-const GET_BLOOD_AGREEMENT =
+const GET_BLOOD_AGREEMENT = 'Services/PatientVarification.svc/REST/CheckUserAgreementForBloodDonation';
-    'Services/PatientVarification.svc/REST/CheckUserAgreementForBloodDonation';
+const SAVE_BLOOD_AGREEMENT = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
-const SAVE_BLOOD_AGREEMENT =
-    'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
 
 ///Reports
 const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo';
-const INSERT_REQUEST_FOR_MEDICAL_REPORT =
+const INSERT_REQUEST_FOR_MEDICAL_REPORT = 'Services/Doctors.svc/REST/InsertRequestForMedicalReport';
-    'Services/Doctors.svc/REST/InsertRequestForMedicalReport';
+const SEND_MEDICAL_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendMedicalReportEmail';
-const SEND_MEDICAL_REPORT_EMAIL =
-    'Services/Notifications.svc/REST/SendMedicalReportEmail';
 
 ///Rate
-const IS_LAST_APPOITMENT_RATED =
+const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated';
-    'Services/Doctors.svc/REST/IsLastAppoitmentRated';
+const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
-const GET_APPOINTMENT_DETAILS_BY_NO =
-    'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
 
 const GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID';
 
@@ -193,8 +158,7 @@ const GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID';
 const GET_CLINICS_LIST_URL = "Services/lists.svc/REST/GetClinicCentralized";
 
 //URL to get active appointment list
-const GET_ACTIVE_APPOINTMENTS_LIST_URL =
+const GET_ACTIVE_APPOINTMENTS_LIST_URL = "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
-    "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
 
 //URL to get projects list
 const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject';
@@ -203,118 +167,87 @@ const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject';
 const GET_DOCTORS_LIST_URL = "Services/Doctors.svc/REST/SearchDoctorsByTime";
 
 //URL to dental doctors list
-const GET_DENTAL_DOCTORS_LIST_URL =
+const GET_DENTAL_DOCTORS_LIST_URL = "Services/Doctors.svc/REST/Dental_DoctorChiefComplaintMapping";
-    "Services/Doctors.svc/REST/Dental_DoctorChiefComplaintMapping";
 
 //URL to get doctor free slots
 const GET_DOCTOR_FREE_SLOTS = "Services/Doctors.svc/REST/GetDoctorFreeSlots";
 
 //URL to insert appointment
-const INSERT_SPECIFIC_APPOINTMENT =
+const INSERT_SPECIFIC_APPOINTMENT = "Services/Doctors.svc/REST/InsertSpecificAppointment";
-    "Services/Doctors.svc/REST/InsertSpecificAppointment";
 
 //URL to get patient share
-const GET_PATIENT_SHARE =
+const GET_PATIENT_SHARE = "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNO";
-    "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNO";
 
 //URL to get patient appointment history
-const GET_PATIENT_APPOINTMENT_HISTORY =
+const GET_PATIENT_APPOINTMENT_HISTORY = "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
-    "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
 
-const SEND_REPORT_EYE_EMAIL =
+const SEND_REPORT_EYE_EMAIL = "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
-    "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
 
-const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL =
+const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL = "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
-    "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
 
 //URL to get patient appointment curfew history
-const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY =
+const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = "Services/Doctors.svc/REST/AppoimentHistoryForCurfew";
-    "Services/Doctors.svc/REST/AppoimentHistoryForCurfew";
 
 //URL to confirm appointment
-const CONFIRM_APPOINTMENT =
+const CONFIRM_APPOINTMENT = "Services/MobileNotifications.svc/REST/ConfirmAppointment";
-    "Services/MobileNotifications.svc/REST/ConfirmAppointment";
 
-const INSERT_VIDA_REQUEST =
+const INSERT_VIDA_REQUEST = "Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart";
-    "Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart";
 
 //URL to cancel appointment
 const CANCEL_APPOINTMENT = "Services/Doctors.svc/REST/CancelAppointment";
 
 //URL get appointment QR
-const GENERATE_QR_APPOINTMENT =
+const GENERATE_QR_APPOINTMENT = "Services/Doctors.svc/REST/GenerateQRAppointmentNo";
-    "Services/Doctors.svc/REST/GenerateQRAppointmentNo";
 
 //URL send email appointment QR
-const EMAIL_QR_APPOINTMENT =
+const EMAIL_QR_APPOINTMENT = "Services/Notifications.svc/REST/sendEmailForOnLineCheckin";
-    "Services/Notifications.svc/REST/sendEmailForOnLineCheckin";
 
 //URL check payment status
-const CHECK_PAYMENT_STATUS =
+const CHECK_PAYMENT_STATUS = "Services/PayFort_Serv.svc/REST/GetRequestStatusByRequestID";
-    "Services/PayFort_Serv.svc/REST/GetRequestStatusByRequestID";
 
 //URL create advance payment
 const CREATE_ADVANCE_PAYMENT = "Services/Doctors.svc/REST/CreateAdvancePayment";
 
-const HIS_CREATE_ADVANCE_PAYMENT =
+const HIS_CREATE_ADVANCE_PAYMENT = "Services/Patients.svc/REST/HIS_CreateAdvancePayment";
-    "Services/Patients.svc/REST/HIS_CreateAdvancePayment";
 
-const ADD_ADVANCE_NUMBER_REQUEST =
+const ADD_ADVANCE_NUMBER_REQUEST = 'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
-    'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
 
-const IS_ALLOW_ASK_DOCTOR =
+const IS_ALLOW_ASK_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
-    'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
+const GET_CALL_REQUEST_TYPE = 'Services/Doctors.svc/REST/GetCallRequestType_LOV';
-const GET_CALL_REQUEST_TYPE =
+const ADD_VIDA_REQUEST = 'Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart';
-    'Services/Doctors.svc/REST/GetCallRequestType_LOV';
-const ADD_VIDA_REQUEST =
-    'Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart';
 
 const SEND_CALL_REQUEST = 'Services/Doctors.svc/REST/InsertCallInfo';
 
-const GET_LIVECARE_CLINICS =
+const GET_LIVECARE_CLINICS = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinics';
-    'Services/ER_VirtualCall.svc/REST/PatientER_GetClinics';
 
-const GET_LIVECARE_SCHEDULE_CLINICS =
+const GET_LIVECARE_SCHEDULE_CLINICS = 'Services/Doctors.svc/REST/PatientER_GetClinicsHaveSchedule';
-    'Services/Doctors.svc/REST/PatientER_GetClinicsHaveSchedule';
 
-const GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST =
+const GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST = 'Services/Doctors.svc/REST/PatientER_GetDoctorByClinicID';
-    'Services/Doctors.svc/REST/PatientER_GetDoctorByClinicID';
 
-const GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS =
+const GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS = 'Services/Doctors.svc/REST/PatientER_GetDoctorFreeSlots';
-    'Services/Doctors.svc/REST/PatientER_GetDoctorFreeSlots';
 
-const INSERT_LIVECARE_SCHEDULE_APPOINTMENT =
+const INSERT_LIVECARE_SCHEDULE_APPOINTMENT = 'Services/Doctors.svc/REST/InsertSpecificAppoitmentForSchedule';
-    'Services/Doctors.svc/REST/InsertSpecificAppoitmentForSchedule';
 
 const GET_PATIENT_SHARE_LIVECARE =
     "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNOForLiveCare";
 
-const GET_LIVECARE_CLINIC_TIMING =
+const GET_LIVECARE_CLINIC_TIMING = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinicsServiceTimingsSchedule';
-    'Services/ER_VirtualCall.svc/REST/PatientER_GetClinicsServiceTimingsSchedule';
 
-const GET_ER_APPOINTMENT_FEES =
+const GET_ER_APPOINTMENT_FEES = 'Services/DoctorApplication.svc/REST/GetERAppointmentFees';
-    'Services/DoctorApplication.svc/REST/GetERAppointmentFees';
 const GET_ER_APPOINTMENT_TIME = 'Services/ER_VirtualCall.svc/REST/GetRestTime';
 
-const ADD_NEW_CALL_FOR_PATIENT_ER =
+const ADD_NEW_CALL_FOR_PATIENT_ER = 'Services/DoctorApplication.svc/REST/NewCallForPatientER';
-    'Services/DoctorApplication.svc/REST/NewCallForPatientER';
 
-const GET_LIVECARE_HISTORY =
+const GET_LIVECARE_HISTORY = 'Services/ER_VirtualCall.svc/REST/GetPatientErVirtualHistory';
-    'Services/ER_VirtualCall.svc/REST/GetPatientErVirtualHistory';
+const CANCEL_LIVECARE_REQUEST = 'Services/ER_VirtualCall.svc/REST/DeleteErRequest';
-const CANCEL_LIVECARE_REQUEST =
+const SEND_LIVECARE_INVOICE_EMAIL = 'Services/Notifications.svc/REST/SendInvoiceForLiveCare';
-    'Services/ER_VirtualCall.svc/REST/DeleteErRequest';
-const SEND_LIVECARE_INVOICE_EMAIL =
-    'Services/Notifications.svc/REST/SendInvoiceForLiveCare';
 
 const GET_USER_TERMS = 'Services/Patients.svc/REST/GetUserTermsAndConditions';
-const UPDATE_HEALTH_TERMS =
+const UPDATE_HEALTH_TERMS = 'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
-    'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
 
-const GET_PATIENT_HEALTH_STATS =
+const GET_PATIENT_HEALTH_STATS = 'Services/Patients.svc/REST/Med_GetTransactionsSts';
-    'Services/Patients.svc/REST/Med_GetTransactionsSts';
 
-const SEND_CHECK_IN_NFC_REQUEST =
+const SEND_CHECK_IN_NFC_REQUEST = 'Services/Patients.svc/REST/Patient_CheckAppointmentValidation_ForNFC';
-    'Services/Patients.svc/REST/Patient_CheckAppointmentValidation_ForNFC';
 
 //URL to get medicine and pharmacies list
 const CHANNEL = 3;
@@ -335,21 +268,16 @@ var DeviceTypeID = Platform.isIOS ? 1 : 2;
 const LANGUAGE_ID = 2;
 const GET_PHARMCY_ITEMS = "Services/Lists.svc/REST/GetPharmcyItems_Region";
 const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList";
-const GET_PAtIENTS_INSURANCE =
+const GET_PAtIENTS_INSURANCE = "Services/Patients.svc/REST/Get_PatientInsuranceDetails";
-    "Services/Patients.svc/REST/Get_PatientInsuranceDetails";
+const GET_PAtIENTS_INSURANCE_UPDATED = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
-const GET_PAtIENTS_INSURANCE_UPDATED =
-    "Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
 
 const INSURANCE_DETAILS = "Services/Patients.svc/REST/Get_InsuranceCheckList";
-const GET_PATIENT_INSURANCE_DETAILS =
+const GET_PATIENT_INSURANCE_DETAILS = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
-    "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
+const UPLOAD_INSURANCE_CARD = 'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
-const UPLOAD_INSURANCE_CARD =
-    'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
 
 const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID";
 const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail";
-const GET_PAtIENTS_INSURANCE_APPROVALS =
+const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus";
-    "Services/Patients.svc/REST/GetApprovalStatus";
 const SEARCH_BOT = 'HabibiChatBotApi/BotInterface/GetVoiceCommandResponse';
 
 const GET_VACCINATIONS_ITEMS = "/Services/ERP.svc/REST/GET_VACCINATIONS_ITEMS";
@@ -359,81 +287,54 @@ const GET_PATIENT_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
 
 const SendSickLeaveEmail = 'Services/Notifications.svc/REST/SendSickLeaveEmail';
 
-const GET_PATIENT_AdVANCE_BALANCE_AMOUNT =
+const GET_PATIENT_AdVANCE_BALANCE_AMOUNT = 'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount';
-    'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount';
+const GET_PATIENT_INFO_BY_ID = 'Services/Doctors.svc/REST/GetPatientInfoByPatientID';
-const GET_PATIENT_INFO_BY_ID =
-    'Services/Doctors.svc/REST/GetPatientInfoByPatientID';
 const GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER =
     'Services/Patients.svc/REST/AP_GetPatientInfoByPatientIDandMobileNumber';
-const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT =
+const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment';
-    'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment';
 const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT =
     'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment';
 
-const GET_COVID_DRIVETHRU_PROJECT_LIST =
+const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
-    'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
 
-const GET_COVID_DRIVETHRU_PAYMENT_INFO =
+const GET_COVID_DRIVETHRU_PAYMENT_INFO = 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
-    'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
 
-const GET_COVID_DRIVETHRU_FREE_SLOTS =
+const GET_COVID_DRIVETHRU_FREE_SLOTS = 'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
-    'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
 
 ///Smartwatch Integration Services
-const GET_PATIENT_LAST_RECORD =
+const GET_PATIENT_LAST_RECORD = 'Services/Patients.svc/REST/Med_GetPatientLastRecord';
-    'Services/Patients.svc/REST/Med_GetPatientLastRecord';
 
 ///My Trackers
-const GET_DIABETIC_RESULT_AVERAGE =
+const GET_DIABETIC_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
-    'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
+const GET_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_GetDiabtecResults';
-const GET_DIABTEC_RESULT =
+const ADD_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_AddDiabtecResult';
-    'Services/Patients.svc/REST/Patient_GetDiabtecResults';
+
-const ADD_DIABTEC_RESULT =
+const GET_BLOOD_PRESSURE_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';
-    'Services/Patients.svc/REST/Patient_AddDiabtecResult';
+const GET_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_GetBloodPressureResult';
-
+const ADD_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_AddBloodPressureResult';
-const GET_BLOOD_PRESSURE_RESULT_AVERAGE =
+
-    'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';
+const GET_WEIGHT_PRESSURE_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResultAverage';
-const GET_BLOOD_PRESSURE_RESULT =
+const GET_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResult';
-    'Services/Patients.svc/REST/Patient_GetBloodPressureResult';
+const ADD_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_AddWeightMeasurementResult';
-const ADD_BLOOD_PRESSURE_RESULT =
-    'Services/Patients.svc/REST/Patient_AddBloodPressureResult';
-
-const GET_WEIGHT_PRESSURE_RESULT_AVERAGE =
-    'Services/Patients.svc/REST/Patient_GetWeightMeasurementResultAverage';
-const GET_WEIGHT_PRESSURE_RESULT =
-    'Services/Patients.svc/REST/Patient_GetWeightMeasurementResult';
-const ADD_WEIGHT_PRESSURE_RESULT =
-    'Services/Patients.svc/REST/Patient_AddWeightMeasurementResult';
 
 const ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID =
     'Services/Patients.svc/Rest/GetActivePrescriptionReportByPatientID';
 
-const GET_CALL_INFO_HOURS_RESULT =
+const GET_CALL_INFO_HOURS_RESULT = 'Services/Doctors.svc/REST/GetCallInfoHoursResult';
-    'Services/Doctors.svc/REST/GetCallInfoHoursResult';
+const GET_CALL_REQUEST_TYPE_LOV = 'Services/Doctors.svc/REST/GetCallRequestType_LOV';
-const GET_CALL_REQUEST_TYPE_LOV =
+
-    'Services/Doctors.svc/REST/GetCallRequestType_LOV';
+const UPDATE_DIABETIC_RESULT = 'Services/Patients.svc/REST/Patient_UpdateDiabeticResult';
-
+
-const UPDATE_DIABETIC_RESULT =
+const SEND_AVERAGE_BLOOD_SUGAR_REPORT = 'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
-    'Services/Patients.svc/REST/Patient_UpdateDiabeticResult';
+const DEACTIVATE_DIABETIC_STATUS = 'services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
-
+const DEACTIVATE_BLOOD_PRESSURES_STATUS = 'services/Patients.svc/REST/Patient_DeactivateBloodPressureStatus';
-const SEND_AVERAGE_BLOOD_SUGAR_REPORT =
+
-    'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
+const UPDATE_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_UpdateBloodPressureResult';
-const DEACTIVATE_DIABETIC_STATUS =
+const SEND_AVERAGE_BLOOD_WEIGHT_REPORT = 'Services/Notifications.svc/REST/SendAverageBodyWeightReport';
-    'services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
+const SEND_AVERAGE_BLOOD_PRESSURE_REPORT = 'Services/Notifications.svc/REST/SendAverageBloodPressureReport';
-const DEACTIVATE_BLOOD_PRESSURES_STATUS =
+
-    'services/Patients.svc/REST/Patient_DeactivateBloodPressureStatus';
+const UPDATE_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_UpdateWeightMeasurementResult';
-
+const DEACTIVATE_WEIGHT_PRESSURE_RESULT = 'services/Patients.svc/REST/Patient_DeactivateWeightMeasurementStatus';
-const UPDATE_BLOOD_PRESSURE_RESULT =
-    'Services/Patients.svc/REST/Patient_UpdateBloodPressureResult';
-const SEND_AVERAGE_BLOOD_WEIGHT_REPORT =
-    'Services/Notifications.svc/REST/SendAverageBodyWeightReport';
-const SEND_AVERAGE_BLOOD_PRESSURE_REPORT =
-    'Services/Notifications.svc/REST/SendAverageBloodPressureReport';
-
-const UPDATE_WEIGHT_PRESSURE_RESULT =
-    'Services/Patients.svc/REST/Patient_UpdateWeightMeasurementResult';
-const DEACTIVATE_WEIGHT_PRESSURE_RESULT =
-    'services/Patients.svc/REST/Patient_DeactivateWeightMeasurementStatus';
 const GET_DOCTOR_RESPONSE = 'Services/Patients.svc/REST/GetDoctorResponse';
 const UPDATE_READ_STATUS = 'Services/Patients.svc/REST/UpdateReadStatus';
 const INSERT_CALL_INFO = 'Services/Doctors.svc/REST/InsertCallInfo';
@@ -441,35 +342,25 @@ const INSERT_CALL_INFO = 'Services/Doctors.svc/REST/InsertCallInfo';
 const GET_PATIENT_ALLERGIES = 'Services/Patients.svc/REST/GetPatientAllergies';
 
 // H2O
-const H2O_GET_USER_PROGRESS =
+const H2O_GET_USER_PROGRESS = "Services/H2ORemainder.svc/REST/H2O_GetUserProgress";
-    "Services/H2ORemainder.svc/REST/H2O_GetUserProgress";
+const H2O_INSERT_USER_ACTIVITY = "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity";
-const H2O_INSERT_USER_ACTIVITY =
+const H2O_GET_USER_DETAIL = "Services/H2ORemainder.svc/REST/H2O_GetUserDetails_New";
-    "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity";
+const H2O_UPDATE_USER_DETAIL = "Services/H2ORemainder.svc/REST/H2O_UpdateUserDetails_New";
-const H2O_GET_USER_DETAIL =
+const H2O_UNDO_USER_ACTIVITY = "Services/H2ORemainder.svc/REST/H2o_UndoUserActivity";
-    "Services/H2ORemainder.svc/REST/H2O_GetUserDetails_New";
-const H2O_UPDATE_USER_DETAIL =
-    "Services/H2ORemainder.svc/REST/H2O_UpdateUserDetails_New";
-const H2O_UNDO_USER_ACTIVITY =
-    "Services/H2ORemainder.svc/REST/H2o_UndoUserActivity";
 //E_Referral Services
 
-const GET_ALL_RELATIONSHIP_TYPES =
+const GET_ALL_RELATIONSHIP_TYPES = "Services/Patients.svc/REST/GetAllRelationshipTypes";
-    "Services/Patients.svc/REST/GetAllRelationshipTypes";
+const SEND_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/SendActivationCodeForEReferral';
-const SEND_ACTIVATION_CODE_FOR_E_REFERRAL =
+const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral';
-    'Services/Authentication.svc/REST/SendActivationCodeForEReferral';
-const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL =
-    'Services/Authentication.svc/REST/CheckActivationCodeForEReferral';
 const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities';
 const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral";
 const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
 
 // Encillary Orders
 
-const GET_ANCILLARY_ORDERS =
+const GET_ANCILLARY_ORDERS = 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderList';
-    'Services/Doctors.svc/REST/GetOnlineAncillaryOrderList';
 
-const GET_ANCILLARY_ORDERS_DETAILS =
+const GET_ANCILLARY_ORDERS_DETAILS = 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderProcList';
-    'Services/Doctors.svc/REST/GetOnlineAncillaryOrderProcList';
 
 //Pharmacy wishlist
 // const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
@@ -501,50 +392,34 @@ const GET_SHIPPING_OPTIONS = "get_shipping_option/";
 const DELETE_SHOPPING_CART = "delete_shopping_cart_items/";
 const DELETE_SHOPPING_CART_ALL = "delete_shopping_cart_item_by_customer/";
 const ORDER_SHOPPING_CART = "orders";
-const GET_LACUM_ACCOUNT_INFORMATION =
+const GET_LACUM_ACCOUNT_INFORMATION = "Services/Patients.svc/REST/GetLakumAccountInformation";
-    "Services/Patients.svc/REST/GetLakumAccountInformation";
+const GET_LACUM_GROUP_INFORMATION = "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
-const GET_LACUM_GROUP_INFORMATION =
+const LACUM_ACCOUNT_ACTIVATE = "Services/Patients.svc/REST/LakumAccountActivation";
-    "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
+const LACUM_ACCOUNT_DEACTIVATE = "Services/Patients.svc/REST/LakumAccountDeactivation";
-const LACUM_ACCOUNT_ACTIVATE =
+const CREATE_LAKUM_ACCOUNT = "Services/Patients.svc/REST/PHR_CreateLakumAccount";
-    "Services/Patients.svc/REST/LakumAccountActivation";
+const TRANSFER_YAHALA_LOYALITY_POINTS = "Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
-const LACUM_ACCOUNT_DEACTIVATE =
+const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
-    "Services/Patients.svc/REST/LakumAccountDeactivation";
-const CREATE_LAKUM_ACCOUNT =
-    "Services/Patients.svc/REST/PHR_CreateLakumAccount";
-const TRANSFER_YAHALA_LOYALITY_POINTS =
-    "Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
-const LAKUM_GET_USER_TERMS_AND_CONDITIONS =
-    "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
 const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
 const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
 const GET_MOST_VIEWED_PRODUCTS = "mostview?";
 const GET_NEW_PRODUCTS = "newproducts?";
 
 // Home Health Care
-const HHC_GET_ALL_SERVICES =
+const HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
-    "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
+const HHC_GET_ALL_CMC_SERVICES = "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
-const HHC_GET_ALL_CMC_SERVICES =
+const PATIENT_ER_UPDATE_PRES_ORDER = "Services/Patients.svc/REST/PatientER_UpdatePresOrder";
-    "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
+const GET_ORDER_DETAIL_BY_ID = "Services/Patients.svc/REST/PatientER_HHC_GetTransactionsForOrder";
-const PATIENT_ER_UPDATE_PRES_ORDER =
+const GET_CMC_ORDER_DETAIL_BY_ID = "Services/Patients.svc/REST/PatientER_CMC_GetTransactionsForOrder";
-    "Services/Patients.svc/REST/PatientER_UpdatePresOrder";
-const GET_ORDER_DETAIL_BY_ID =
-    "Services/Patients.svc/REST/PatientER_HHC_GetTransactionsForOrder";
-const GET_CMC_ORDER_DETAIL_BY_ID =
-    "Services/Patients.svc/REST/PatientER_CMC_GetTransactionsForOrder";
 const GET_CHECK_UP_ITEMS = "Services/Patients.svc/REST/GetCheckUpItems";
 const PUSH_NOTIFICATION_GET_ALL_NOTIFICATIONS =
     'Services/MobileNotifications.svc/REST/PushNotification_GetAllNotifications';
 const PUSH_NOTIFICATION_SET_MESSAGES_FROM_POOL_AS_READ =
     'Services/MobileNotifications.svc/REST/PushNotification_SetMessagesFromPoolAsRead';
-const GET_PATIENT_ALL_PRES_ORD =
+const GET_PATIENT_ALL_PRES_ORD = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-    'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const PATIENT_ER_INSERT_PRES_ORDER = 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
-const PATIENT_ER_INSERT_PRES_ORDER =
-    'Services/Patients.svc/REST/PatientER_InsertPresOrder';
 const PHARMACY_MAKE_REVIEW = 'epharmacy/api/insertreviews';
-const BLOOD_DONATION_REGISTER_BLOOD_TYPE =
+const BLOOD_DONATION_REGISTER_BLOOD_TYPE = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
-    'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
+const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
-const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION =
-    'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
 
 //Pharmacy wishlist
 const GET_WISHLIST = "shopping_cart_items/";
@@ -577,8 +452,7 @@ const GET_SUB_PRODUCTS = 'products?categoryid=';
 const GET_FINAL_PRODUCTS =
     'products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId=';
 const GET_CLINIC_CATEGORY = 'Services/Doctors.svc/REST/DP_GetClinicCategory';
-const GET_DISEASE_BY_CLINIC_ID =
+const GET_DISEASE_BY_CLINIC_ID = 'Services/Doctors.svc/REST/DP_GetDiseasesByClinicID';
-    'Services/Doctors.svc/REST/DP_GetDiseasesByClinicID';
 const SEARCH_DOCTOR_BY_TIME = 'Services/Doctors.svc/REST/SearchDoctorsByTime';
 
 const TIMER_MIN = 10;
@@ -594,8 +468,7 @@ const SCAN_QR_CODE = 'productbysku/';
 
 const FILTERED_PRODUCTS = 'products?categoryids=';
 
-const GET_DOCTOR_LIST_CALCULATION =
+const GET_DOCTOR_LIST_CALCULATION = "Services/Doctors.svc/REST/GetCallculationDoctors";
-    "Services/Doctors.svc/REST/GetCallculationDoctors";
 
 class AppGlobal {
   static var context;

lib/config/localized_values.dart

@@ -1264,6 +1264,8 @@ const Map localizedValues = {
   "stretcher": {"en": "Stretcher", "ar": "نقالة"},
   "none": {"en": "None", "ar": "لا شيء"},
   "RRT-Summary": {"en": "Summary", "ar": "ملخص الطلب"},
+  "Rapid-Response-Team": {"en": "Rapid Response Team", "ar": "فريق الاستجابة السريع"},
+  "rrtService": {"en": "RRT Service", "ar": "خدمة RRT"},
   "bill-amount": {"en": "Bill Amount", "ar": "مبلغ الفاتورة"},
   "transport-method": {"en": "Transportation Method", "ar": "طريقة النقل"},
   "directions": {"en": "Directions", "ar": "الاتجاهات"},

lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart

@@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/core/model/health_calcolator/get_doctor_by_
 import 'package:diplomaticquarterapp/core/model/health_calcolator/get_doctor_list_calcolation_model.dart';
 import 'package:diplomaticquarterapp/core/model/health_calcolator/get_doctor_list_calcolation_request_model.dart';
 import 'package:diplomaticquarterapp/core/service/base_service.dart';
+import 'package:flutter/cupertino.dart';
 
 class BariatricsService extends BaseService {
   List<ClinicCategory> clinicCategoryList = [];
@@ -75,19 +76,24 @@ class BariatricsService extends BaseService {
     }, body: body);
   }
 
-  Future getDoctorList() async {
+  Future getDoctorList({@required DiseasesByClinic disease}) async {
     hasError = false;
-    DoctorListByTimeRequestModel _doctorListReq = DoctorListByTimeRequestModel();
+    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
-    _doctorListReq.isGetNearAppointment = false;
-    _doctorListReq.continueDentalPlan = false;
-    _doctorListReq.isSearchAppointmnetByClinicID = true;
-    _doctorListReq.latitude = 0;
-    _doctorListReq.longitude = 0;
-    _doctorListReq.license = true;
-    _doctorListReq.clinicID = 108;
-    _doctorListReq.patientID = 0;
 
-    //body['ClinicID'] = 108; // hint: it is static depend on IONIC project
+    Map<String, dynamic> body = Map();
+    body['ClinicID'] = 108; // hint: it is static depend on IONIC project
+    body['ContinueDentalPlan'] = false;
+    body['IsGetNearAppointment'] = false;
+    body['IsSearchAppointmnetByClinicID'] = true;
+    body['LanguageID'] = languageID == 'ar' ? 1 : 2;
+    body['Latitude'] = 0;
+    body['License'] = true;
+    body['Longitude'] = 0;
+    body['PatientID'] = 0;
+    body['isDentalAllowedBackend'] = false;
+
+    if(disease != null)
+      body['DiseaseID'] = disease.diseasesID;
 
     await baseAppClient.post(GET_DOCTOR_LIST_BY_TIME, onSuccess: (dynamic response, int statusCode) {
       doctorListByTime.clear();
@@ -98,6 +104,6 @@ class BariatricsService extends BaseService {
     }, onFailure: (String error, int statusCode) {
       hasError = true;
       super.error = error;
-    }, body: _doctorListReq.toJson());
+    }, body: body);
   }
 }

lib/core/service/client/base_app_client.dart

@@ -29,8 +29,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
 ///       onFailure: (String error, int statusCode) {},
 ///   body: Map();
 ///
-AuthenticatedUserObject authenticatedUserObject =
+AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
-    locator<AuthenticatedUserObject>();
 VitalSignService _vitalSignService = locator<VitalSignService>();
 
 class BaseAppClient {
@@ -50,14 +49,10 @@ class BaseAppClient {
       //Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
       var pharmacyToken = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN);
       var user = await sharedPref.getObject(USER_PROFILE);
-      Map<String, String> headers = {
+      Map<String, String> headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
-        'Content-Type': 'application/json',
-        'Accept': 'application/json'
-      };
       if (!isExternal) {
         String token = await sharedPref.getString(TOKEN);
-        var languageID =
+        var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
-            await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
         if (body.containsKey('SetupID')) {
           body['SetupID'] = body.containsKey('SetupID')
               ? body['SetupID'] != null
@@ -72,19 +67,13 @@ class BaseAppClient {
 
         body['IPAdress'] = IP_ADDRESS;
         body['generalid'] = GENERAL_ID;
-        body['PatientOutSA'] = body.containsKey('PatientOutSA')
-            ? body['PatientOutSA'] != null
-                ? body['PatientOutSA']
-                : PATIENT_OUT_SA
-            : PATIENT_OUT_SA;
 
         if (body.containsKey('isDentalAllowedBackend')) {
-          body['isDentalAllowedBackend'] =
+          body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
-              body.containsKey('isDentalAllowedBackend')
+              ? body['isDentalAllowedBackend'] != null
-                  ? body['isDentalAllowedBackend'] != null
+                  ? body['isDentalAllowedBackend']
-                      ? body['isDentalAllowedBackend']
+                  : IS_DENTAL_ALLOWED_BACKEND
-                      : IS_DENTAL_ALLOWED_BACKEND
+              : IS_DENTAL_ALLOWED_BACKEND;
-                  : IS_DENTAL_ALLOWED_BACKEND;
         }
 
         body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@@ -107,19 +96,20 @@ class BaseAppClient {
               : PATIENT_TYPE_ID;
           if (user != null) {
             body['TokenID'] = token;
-            body['PatientID'] = body['PatientID'] != null
+            body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
-                ? body['PatientID']
-                : user['PatientID'];
             body['PatientOutSA'] = user['OutSA'];
+            body['PatientOutSA'] = body.containsKey('PatientOutSA')
+                ? body['PatientOutSA'] != null
+                    ? body['PatientOutSA']
+                    : PATIENT_OUT_SA
+                : PATIENT_OUT_SA;
             body['SessionID'] = SESSION_ID; //getSe
+
             headers = {
               'Content-Type': 'application/json',
               'Accept': 'application/json',
               'Authorization': pharmacyToken,
-              'Mobilenumber': user != null
+              'Mobilenumber': user != null ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString()) : "",
-                  ? Utils.getPhoneNumberWithoutZero(
-                      user['MobileNumber'].toString())
-                  : "",
               'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
               'Username': user['PatientID'].toString(),
             };
@@ -131,8 +121,7 @@ class BaseAppClient {
       print("Body : ${json.encode(body)}");
 
       if (await Utils.checkConnection()) {
-        final response = await http.post(url.trim(),
+        final response = await http.post(url.trim(), body: json.encode(body), headers: headers);
-            body: json.encode(body), headers: headers);
         final int statusCode = response.statusCode;
         print("statusCode :$statusCode");
         if (statusCode < 200 || statusCode >= 400 || json == null) {
@@ -144,8 +133,7 @@ class BaseAppClient {
             onSuccess(parsed, statusCode);
           } else {
             if (parsed['ErrorType'] == 4) {
-              navigateToAppUpdate(
+              navigateToAppUpdate(AppGlobal.context, parsed['ErrorEndUserMessage']);
-                  AppGlobal.context, parsed['ErrorEndUserMessage']);
             }
             if (isAllowAny) {
               onSuccess(parsed, statusCode);
@@ -160,34 +148,24 @@ class BaseAppClient {
                 if (parsed != null) {
                   onSuccess(parsed, statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                   logout();
                 }
               }
-            } else if (parsed['MessageStatus'] == 1 ||
+            } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
-                parsed['SMSLoginRequired'] == true) {
               onSuccess(parsed, statusCode);
-            } else if (parsed['MessageStatus'] == 2 &&
+            } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
-                parsed['IsAuthenticated']) {
               if (parsed['SameClinicApptList'] != null) {
                 onSuccess(parsed, statusCode);
               } else {
-                if (parsed['message'] == null &&
+                if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
-                    parsed['ErrorEndUserMessage'] == null) {
                   if (parsed['ErrorSearchMsg'] == null) {
-                    onFailure("Server Error found with no available message",
+                    onFailure("Server Error found with no available message", statusCode);
-                        statusCode);
                   } else {
                     onFailure(parsed['ErrorSearchMsg'], statusCode);
                   }
                 } else {
-                  onFailure(
+                  onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['message'] ??
-                          parsed['ErrorEndUserMessage'] ??
-                          parsed['ErrorMessage'],
-                      statusCode);
                 }
               }
             } else if (!parsed['IsAuthenticated']) {
@@ -201,9 +179,7 @@ class BaseAppClient {
                 if (parsed['message'] != null) {
                   onFailure(parsed['message'] ?? parsed['message'], statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                 }
               }
             }
@@ -240,16 +216,13 @@ class BaseAppClient {
         'Content-Type': 'application/json',
         'Accept': 'application/json',
         'Authorization': token ?? '',
-        'Mobilenumber': user != null
+        'Mobilenumber': user != null ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString()) : "",
-            ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString())
-            : "",
         'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
         'Username': user != null ? user['PatientID'].toString() : "",
       };
       if (!isExternal) {
         String token = await sharedPref.getString(TOKEN);
-        var languageID =
+        var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
-            await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
         if (body.containsKey('SetupID')) {
           body['SetupID'] = body.containsKey('SetupID')
               ? body['SetupID'] != null
@@ -271,12 +244,11 @@ class BaseAppClient {
             : PATIENT_OUT_SA;
 
         if (body.containsKey('isDentalAllowedBackend')) {
-          body['isDentalAllowedBackend'] =
+          body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
-              body.containsKey('isDentalAllowedBackend')
+              ? body['isDentalAllowedBackend'] != null
-                  ? body['isDentalAllowedBackend'] != null
+                  ? body['isDentalAllowedBackend']
-                      ? body['isDentalAllowedBackend']
+                  : IS_DENTAL_ALLOWED_BACKEND
-                      : IS_DENTAL_ALLOWED_BACKEND
+              : IS_DENTAL_ALLOWED_BACKEND;
-                  : IS_DENTAL_ALLOWED_BACKEND;
         }
 
         body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@@ -299,9 +271,7 @@ class BaseAppClient {
               : PATIENT_TYPE_ID;
           if (user != null) {
             body['TokenID'] = token;
-            body['PatientID'] = body['PatientID'] != null
+            body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
-                ? body['PatientID']
-                : user['PatientID'];
             body['PatientOutSA'] = user['OutSA'];
             body['SessionID'] = SESSION_ID; //getSe
             headers = {
@@ -320,8 +290,7 @@ class BaseAppClient {
       print("Body : ${json.encode(body)}");
 
       if (await Utils.checkConnection()) {
-        final response = await http.post(url.trim(),
+        final response = await http.post(url.trim(), body: json.encode(body), headers: headers);
-            body: json.encode(body), headers: headers);
         final int statusCode = response.statusCode;
         print("statusCode :$statusCode");
         if (statusCode < 200 || statusCode >= 400 || json == null) {
@@ -333,8 +302,7 @@ class BaseAppClient {
             onSuccess(parsed, statusCode);
           } else {
             if (parsed['ErrorType'] == 4) {
-              navigateToAppUpdate(
+              navigateToAppUpdate(AppGlobal.context, parsed['ErrorEndUserMessage']);
-                  AppGlobal.context, parsed['ErrorEndUserMessage']);
             }
             if (isAllowAny) {
               onSuccess(parsed, statusCode);
@@ -349,34 +317,24 @@ class BaseAppClient {
                 if (parsed != null) {
                   onSuccess(parsed, statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                   logout();
                 }
               }
-            } else if (parsed['MessageStatus'] == 1 ||
+            } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
-                parsed['SMSLoginRequired'] == true) {
               onSuccess(parsed, statusCode);
-            } else if (parsed['MessageStatus'] == 2 &&
+            } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
-                parsed['IsAuthenticated']) {
               if (parsed['SameClinicApptList'] != null) {
                 onSuccess(parsed, statusCode);
               } else {
-                if (parsed['message'] == null &&
+                if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
-                    parsed['ErrorEndUserMessage'] == null) {
                   if (parsed['ErrorSearchMsg'] == null) {
-                    onFailure("Server Error found with no available message",
+                    onFailure("Server Error found with no available message", statusCode);
-                        statusCode);
                   } else {
                     onFailure(parsed['ErrorSearchMsg'], statusCode);
                   }
                 } else {
-                  onFailure(
+                  onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['message'] ??
-                          parsed['ErrorEndUserMessage'] ??
-                          parsed['ErrorMessage'],
-                      statusCode);
                 }
               }
             } else if (!parsed['IsAuthenticated']) {
@@ -390,9 +348,7 @@ class BaseAppClient {
                 if (parsed['message'] != null) {
                   onFailure(parsed['message'] ?? parsed['message'], statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                 }
               }
             }
@@ -408,8 +364,7 @@ class BaseAppClient {
   }
 
   Future navigateToAppUpdate(context, String text) async {
-    Navigator.pushReplacement(
+    Navigator.pushReplacement(context, FadePage(page: AppUpdatePage(appUpdateText: text)));
-        context, FadePage(page: AppUpdatePage(appUpdateText: text)));
   }
 
   get(String endPoint,
@@ -433,10 +388,7 @@ class BaseAppClient {
     if (await Utils.checkConnection()) {
       final response = await http.get(
         url.trim(),
-        headers: {
+        headers: {'Content-Type': 'application/json', 'Accept': 'application/json'},
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
       );
       final int statusCode = response.statusCode;
       print("statusCode :$statusCode");
@@ -480,9 +432,7 @@ class BaseAppClient {
         'Content-Type': 'text/html; charset=utf-8',
         'Accept': 'application/json',
         'Authorization': token ?? '',
-        'Mobilenumber': user != null
+        'Mobilenumber': user != null ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString()) : "",
-            ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString())
-            : "",
         'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
         'Username': user != null ? user['PatientID'].toString() : "",
       });
@@ -491,8 +441,7 @@ class BaseAppClient {
 
       if (statusCode < 200 || statusCode >= 400 || json == null) {
         if (statusCode == 401) {
-          AppToast.showErrorToast(
+          AppToast.showErrorToast(message: TranslationBase.of(AppGlobal.context).pharmacyRelogin);
-              message: TranslationBase.of(AppGlobal.context).pharmacyRelogin);
           Navigator.of(AppGlobal.context).pushNamed(HOME);
         } else {
           onFailure('Error While Fetching data', statusCode);
@@ -520,10 +469,7 @@ class BaseAppClient {
       final response = await http.post(
         url.trim(),
         body: json.encode(body),
-        headers: {
+        headers: {'Content-Type': 'application/json', 'Accept': 'application/json'},
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
       );
 
       final int statusCode = response.statusCode;
@@ -556,10 +502,7 @@ class BaseAppClient {
     if (await Utils.checkConnection()) {
       final response = await http.get(
         url.trim(),
-        headers: {
+        headers: {'Content-Type': 'application/json', 'Accept': 'application/json'},
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
       );
 
       final int statusCode = response.statusCode;
@@ -586,10 +529,7 @@ class BaseAppClient {
       final response = await http.put(
         url.trim(),
         body: json.encode(body),
-        headers: {
+        headers: {'Content-Type': 'application/json', 'Accept': 'application/json'},
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
       );
 
       final int statusCode = response.statusCode;
@@ -622,10 +562,7 @@ class BaseAppClient {
     if (await Utils.checkConnection()) {
       final response = await http.delete(
         url.trim(),
-        headers: {
+        headers: {'Content-Type': 'application/json', 'Accept': 'application/json'},
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
       );
 
       final int statusCode = response.statusCode;
@@ -645,10 +582,8 @@ class BaseAppClient {
     await sharedPref.remove(LOGIN_TOKEN_ID);
     await sharedPref.remove(PHARMACY_CUSTOMER_ID);
     await authenticatedUserObject.getUser();
-    Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin =
+    Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin = false;
-        false;
+    var model = Provider.of<ToDoCountProviderModel>(AppGlobal.context, listen: false);
-    var model =
-        Provider.of<ToDoCountProviderModel>(AppGlobal.context, listen: false);
     _vitalSignService.weightKg = "";
     _vitalSignService.heightCm = "";
     model.setState(0, false);
@@ -662,8 +597,7 @@ class BaseAppClient {
 
   static defaultHttpParameters() async {
     String token = await sharedPref.getString(TOKEN);
-    var languageID =
+    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
-        await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
     var user = await sharedPref.getObject(USER_PROFILE);
     var params = {};
     if (user != null) {
@@ -699,8 +633,7 @@ class BaseAppClient {
     try {
       if (isExternal) {
         String token = await sharedPref.getString(TOKEN);
-        var languageID =
+        var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
-            await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
         var user = await sharedPref.getObject(USER_PROFILE);
         if (body.containsKey('SetupID')) {
           body['SetupID'] = body.containsKey('SetupID')
@@ -723,12 +656,11 @@ class BaseAppClient {
             : PATIENT_OUT_SA;
 
         if (body.containsKey('isDentalAllowedBackend')) {
-          body['isDentalAllowedBackend'] =
+          body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
-              body.containsKey('isDentalAllowedBackend')
+              ? body['isDentalAllowedBackend'] != null
-                  ? body['isDentalAllowedBackend'] != null
+                  ? body['isDentalAllowedBackend']
-                      ? body['isDentalAllowedBackend']
+                  : IS_DENTAL_ALLOWED_BACKEND
-                      : IS_DENTAL_ALLOWED_BACKEND
+              : IS_DENTAL_ALLOWED_BACKEND;
-                  : IS_DENTAL_ALLOWED_BACKEND;
         }
 
         body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@@ -751,9 +683,7 @@ class BaseAppClient {
               : PATIENT_TYPE_ID;
           if (user != null) {
             body['TokenID'] = token;
-            body['PatientID'] = body['PatientID'] != null
+            body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
-                ? body['PatientID']
-                : user['PatientID'];
             body['PatientOutSA'] = user['OutSA'];
             body['SessionID'] = SESSION_ID; //getSessionId(token);
           }
@@ -765,17 +695,14 @@ class BaseAppClient {
       var ss = json.encode(body);
 
       if (await Utils.checkConnection()) {
-        final response =
+        final response = await http.post(url.trim(), body: json.encode(body), headers: {
-            await http.post(url.trim(), body: json.encode(body), headers: {
           // 'Content-Type': 'application/json',
           // 'Accept': 'application/json',
           // 'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
           'Content-Type': 'application/json',
           'Accept': 'application/json',
           'Authorization': token ?? '',
-          'Mobilenumber': user != null
+          'Mobilenumber': user != null ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString()) : "",
-              ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString())
-              : "",
           'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
           'Username': user != null ? user['PatientID'].toString() : "",
         });
@@ -790,8 +717,7 @@ class BaseAppClient {
             onSuccess(parsed, statusCode);
           } else {
             if (parsed['ErrorType'] == 4) {
-              navigateToAppUpdate(
+              navigateToAppUpdate(AppGlobal.context, parsed['ErrorEndUserMessage']);
-                  AppGlobal.context, parsed['ErrorEndUserMessage']);
             }
             if (isAllowAny) {
               onSuccess(parsed, statusCode);
@@ -806,31 +732,21 @@ class BaseAppClient {
                 if (parsed != null) {
                   onSuccess(parsed, statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                   logout();
                 }
               }
-            } else if (parsed['MessageStatus'] == 1 ||
+            } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
-                parsed['SMSLoginRequired'] == true) {
               onSuccess(parsed, statusCode);
-            } else if (parsed['MessageStatus'] == 2 &&
+            } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
-                parsed['IsAuthenticated']) {
+              if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
-              if (parsed['message'] == null &&
-                  parsed['ErrorEndUserMessage'] == null) {
                 if (parsed['ErrorSearchMsg'] == null) {
-                  onFailure("Server Error found with no available message",
+                  onFailure("Server Error found with no available message", statusCode);
-                      statusCode);
                 } else {
                   onFailure(parsed['ErrorSearchMsg'], statusCode);
                 }
               } else {
-                onFailure(
+                onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                    parsed['message'] ??
-                        parsed['ErrorEndUserMessage'] ??
-                        parsed['ErrorMessage'],
-                    statusCode);
               }
             } else if (!parsed['IsAuthenticated']) {
               await logout();
@@ -843,9 +759,7 @@ class BaseAppClient {
                 if (parsed['message'] != null) {
                   onFailure(parsed['message'] ?? parsed['message'], statusCode);
                 } else {
-                  onFailure(
+                  onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
-                      parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
-                      statusCode);
                 }
               }
             }

lib/core/service/medical/BloodPressureService.dart

@@ -73,7 +73,7 @@ class BloodPressureService extends BaseService {
     super.error = "";
     Map<String, dynamic> body = Map();
     body['isDentalAllowedBackend'] = false;
-    body['to'] = user.emailAddress;
+    body['To'] = user.emailAddress;
     await baseAppClient.post(SEND_AVERAGE_BLOOD_PRESSURE_REPORT,
         onSuccess: (response, statusCode) async {},
         onFailure: (String error, int statusCode) {

lib/core/service/medical/BloodSugarService.dart

@@ -114,7 +114,7 @@ class BloodSugarService extends BaseService {
     super.error = "";
     Map<String, dynamic> body = Map();
     body['isDentalAllowedBackend'] = false;
-    body['to'] = user.emailAddress;
+    body['To'] = user.emailAddress;
     await baseAppClient.post(SEND_AVERAGE_BLOOD_SUGAR_REPORT,
         onSuccess: (response, statusCode) async {},
         onFailure: (String error, int statusCode) {

lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart

@@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/core/model/health_calcolator/get_doctor_by_
 import 'package:diplomaticquarterapp/core/model/health_calcolator/get_doctor_list_calcolation_model.dart';
 import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
+import 'package:flutter/cupertino.dart';
 
 import '../../../../locator.dart';
 
@@ -52,9 +53,9 @@ class BariatricsViewModel extends BaseViewModel {
     }
   }
 
-  void getDoctorList() async {
+  void getDoctorList({@required DiseasesByClinic disease}) async {
     setState(ViewState.Busy);
-    await _service.getDoctorList();
+    await _service.getDoctorList(disease:disease);
     if (_service.hasError) {
       error = _service.error;
       setState(ViewState.Error);

lib/core/viewModels/medical/labs_view_model.dart

@@ -122,14 +122,17 @@ class LabsViewModel extends BaseViewModel {
       error = _labsService.error;
       setState(ViewState.Error);
     } else {
-      bool isShouldClear = false;
+      /// commented out based on PAP-304
-      if (_labsService.labOrdersResultsList.length == 1) {
+      // bool isShouldClear = false;
-        labOrdersResultsList.forEach((element) {
+      // if (_labsService.labOrdersResultsList.length == 1) {
-          if (element.resultValue.contains('/') || element.resultValue.contains('*') || element.resultValue.isEmpty)
+      //   labOrdersResultsList.forEach((element) {
-            isShouldClear = true;
+      //     if (element.resultValue.contains('/') || element.resultValue.contains('*') || element.resultValue.isEmpty)
-        });
+      //       isShouldClear = true;
-      }
+      //   });
-      if (isShouldClear) _labsService.labOrdersResultsList.clear();
+      // }
+      // if (isShouldClear)
+      //
+      //   _labsService.labOrdersResultsList.clear();
       setState(ViewState.Idle);
     }
   }

lib/main.dart

@@ -1,30 +1,29 @@
+import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
 import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
 import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart';
 import 'package:diplomaticquarterapp/theme/theme_value.dart';
-import 'package:diplomaticquarterapp/uitl/HMG_Geofence.dart';
 import 'package:diplomaticquarterapp/uitl/LocalNotification.dart';
 import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart';
-import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:firebase_analytics/observer.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
-
-import 'Constants.dart';
-import 'config/shared_pref_kay.dart';
 import 'config/size_config.dart';
-import 'core/model/geofencing/requests/GeoZonesRequestModel.dart';
-import 'core/service/geofencing/GeofencingServices.dart';
 import 'core/viewModels/project_view_model.dart';
 import 'locator.dart';
 import 'pages/pharmacies/compare-list.dart';
+import 'package:firebase_core/firebase_core.dart';
+
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  FirebaseApp defaultApp = await Firebase.initializeApp();
+
   setupLocator();
   runApp(MyApp());
 }
@@ -35,6 +34,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyApp extends State<MyApp> {
+
   @override
   void initState() {
     // ProjectViewModel projectProvider;
@@ -52,6 +52,7 @@ class _MyApp extends State<MyApp> {
           .showNow(title: "Payload", subtitle: payload, payload: payload);
     });
 
+
     // final themeNotifier = Provider.of<ThemeNotifier>(context);
     precacheImage(AssetImage('assets/images/powerd-by.jpg'), context);
     return LayoutBuilder(
@@ -82,6 +83,9 @@ class _MyApp extends State<MyApp> {
               ],
               child: Consumer<ProjectViewModel>(
                 builder: (context, projectProvider, child) => MaterialApp(
+                  navigatorObservers: [
+                    GAnalytics.shared.navObserver()
+                  ],
                   showSemanticsDebugger: false,
                   title: 'Diplomatic Quarter App',
                   locale: projectProvider.appLocal,

lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart

@@ -17,6 +17,7 @@ import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
 import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
 import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
 import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart';
+import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
 import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
 import 'package:diplomaticquarterapp/pages/symptom-checker/info.dart';
@@ -281,12 +282,10 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
                     title: TranslationBase.of(context).childVaccine,
                   ),
                 ServicesContainer(
-                  onTap: () => Navigator.push(
+                  onTap: (){
-                    context,
+                    Navigator.pop(context);
-                    FadePage(
+                    LandingPage.shared.switchToDoFromHMGServices();
-                      page: ToDo(isShowAppBar: true),
+                  },
-                    ),
-                  ),
                   imageLocation:
                       'assets/images/new-design/upcoming_icon_bottom_bar.png',
                   title: TranslationBase.of(context).todoList,

lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart

@@ -99,17 +99,8 @@ class _BariatricsPageState extends State<BariatricsPage> {
                 handler: () async {
                   Navigator.push(
                     context,
-                    FadePage(page: DoctorList()),
+                    FadePage(page: DoctorList(diseaseByClinic: _selectedDisease,)),
                   );
-                  // await model.searchDoctorsByTime(_selectedDisease);
-                  // if (model.state == ViewState.ErrorLocal) {
-                  //   AppToast.showErrorToast(message: model.error);
-                  // } else {}
-
-                  // Navigator.push(
-                  //   context,
-                  //   MaterialPageRoute(builder: (context) => BariatricsPage()),
-                  // );
                 },
               ),
             ),
@@ -131,15 +122,6 @@ class _BariatricsPageState extends State<BariatricsPage> {
                     context,
                     FadePage(page: DoctorList()),
                   );
-                  await model.searchDoctorsByTime(_selectedDisease);
-                  if (model.state == ViewState.ErrorLocal) {
-                    AppToast.showErrorToast(message: model.error);
-                  }
-
-                  // Navigator.push(
-                  //   context,
-                  //   MaterialPageRoute(builder: (context) => BariatricsPage()),
-                  // );
                 },
               ),
             ),

lib/pages/AlHabibMedicalService/health_calculator/doctor_list.dart

@@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart';
 import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@@ -8,13 +9,14 @@ import 'package:flutter/material.dart';
 import 'package:rating_bar/rating_bar.dart';
 
 class DoctorList extends StatelessWidget {
-  const DoctorList({Key key}) : super(key: key);
+  DiseasesByClinic diseaseByClinic;
+  DoctorList({Key key, this.diseaseByClinic}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return BaseView<BariatricsViewModel>(
         allowAny: true,
-        onModelReady: (model) => model.getDoctorList(),
+        onModelReady: (model) => model.getDoctorList(disease: diseaseByClinic),
         builder: (BuildContext context, BariatricsViewModel model, Widget child) => AppScaffold(
               isShowDecPage: false,
               isShowAppBar: true,

lib/pages/ErService/ErOptions.dart

@@ -1,8 +1,12 @@
+import 'dart:convert';
+
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/uitl/location_util.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import '../../uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart';
 
@@ -23,6 +27,7 @@ class ErOptions extends StatefulWidget {
 
 class _ErOptionsState extends State<ErOptions> {
   LocationUtils locationUtils;
+  ProjectViewModel projectViewModel;
 
   @override
   void initState() {
@@ -35,6 +40,9 @@ class _ErOptionsState extends State<ErOptions> {
   }
   @override
   Widget build(BuildContext context) {
+    projectViewModel = Provider.of<ProjectViewModel>(context);
+    final rrtLocked = !projectViewModel.havePrivilege(68);
+
     return AppScaffold(
       isShowAppBar: widget.isAppbar,
       appBarTitle: TranslationBase.of(context).bookAppo,
@@ -45,6 +53,7 @@ class _ErOptionsState extends State<ErOptions> {
           children: <Widget>[
 
             Container(
+              height: 170,
               margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
               child: Row(
                 mainAxisSize: MainAxisSize.max,
@@ -82,6 +91,7 @@ class _ErOptionsState extends State<ErOptions> {
             ),
             Container(
               margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
+              height: 170,
               child: Row(
                 mainAxisSize: MainAxisSize.max,
                 mainAxisAlignment: MainAxisAlignment.start,
@@ -94,14 +104,24 @@ class _ErOptionsState extends State<ErOptions> {
                       onTap: (){
                         Navigator.push(
                             context,
-                            FadePage(
+                            FadePage(page: DdServicesPage())
-                                page: DdServicesPage()));
+                        );
                       },
 
                     ),
                   ),
                   Expanded(
-                    child: Container(),
+                    child: CardCommonEr(
+                        locked: rrtLocked,
+                        image: 'assets/images/new-design/AM.PNG',
+                        text: TranslationBase.of(context).rrtService,
+                        subText: TranslationBase.of(context).RapidResponseTeam,
+                        onTap:(){
+                          Navigator.push(
+                              context,
+                              FadePage(
+                                  page: NearestEr()));
+                        }),
                   )
                 ],
               ),

lib/pages/ErService/widgets/card_common.dart

@@ -10,51 +10,72 @@ class CardCommonEr extends StatelessWidget {
   final image;
   final text;
   final subText;
+  final bool locked;
 
   final Function onTap;
   const CardCommonEr(
-      {@required this.image,
+      {
-      @required this.text,
+        this.locked = false,
-      @required this.subText,
+        @required this.image,
-      @required this.onTap});
+        @required this.text,
+        @required this.subText,
+        @required this.onTap,
+      });
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () => onTap(),
+      onTap: locked ? null : onTap,
-      child: Container(
+      child: Opacity(
-        margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0),
+        opacity: locked ? 0.25 : 1.0,
-        decoration: BoxDecoration(boxShadow: [
+        child: Stack(
-          BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)
+          children: [
-        ], borderRadius: BorderRadius.circular(10), color: Colors.white),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
             Container(
-              margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0),
+            margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0),
-              child: Text(this.text,
+            decoration: BoxDecoration(boxShadow: [
-                  overflow: TextOverflow.clip,
+              BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)
-                  style: TextStyle(
+            ], borderRadius: BorderRadius.circular(10), color: Colors.white),
-                      color: new Color(0xFFc5272d),
+            child: Column(
-                      letterSpacing: 1.0,
+              crossAxisAlignment: CrossAxisAlignment.start,
-                      fontSize: 20.0)),
+              children: <Widget>[
+                Container(
+                  margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0),
+                  child: Text(this.text,
+                      overflow: TextOverflow.clip,
+                      style: TextStyle(
+                          color: new Color(0xFFc5272d),
+                          letterSpacing: 1.0,
+                          fontSize: 20.0)),
+                ),
+                Container(
+                  margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0),
+                  child: Text(this.subText,
+                      overflow: TextOverflow.clip,
+                      style: TextStyle(
+                          color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)),
+                ),
+                Spacer(),
+                Container(
+                  alignment: Alignment.bottomRight,
+                  margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0),
+                  child: Image.asset(this.image, width: 60.0, height: 60.0),
+                ),
+              ],
             ),
-            Container(
+          ),
-              margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0),
+            if(locked)
-              child: Text(this.subText,
+              Align(
-                  overflow: TextOverflow.clip,
+                  alignment: Alignment.center,
-                  style: TextStyle(
+                  child: lock()
-                      color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)),
+              )
-            ),
+          ] ,
-            Container(
-              alignment: Alignment.bottomRight,
-              margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0),
-              child: Image.asset(this.image, width: 60.0, height: 60.0),
-            ),
-          ],
         ),
       ),
     );
   }
 
+  Widget lock(){
+    return Container(child: Icon(Icons.lock_rounded, size: 80),);
+  }
+
 }

lib/pages/ToDoList/ToDo.dart

@@ -101,6 +101,7 @@ class _ToDoState extends State<ToDo> {
                   return Container(
                     margin: EdgeInsets.all(10.0),
                     child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Container(
                           child: Card(
@@ -372,44 +373,32 @@ class _ToDoState extends State<ToDo> {
                             color: Color(0xff20bc44),
                           ),
                           height: 30.0,
-                          margin: projectViewModel.isArabic
+                          padding: EdgeInsets.only(right:15),
-                              ? EdgeInsets.fromLTRB(160.0, 0.0, 30.0, 0.0)
+                          margin: EdgeInsets.symmetric(horizontal:20),
-                              : EdgeInsets.fromLTRB(20.0, 0.0, 160.0, 0.0),
                           transform: Matrix4.translationValues(0.0, -8.0, 0.0),
                           child: Row(
+                            mainAxisSize: MainAxisSize.min,
                             mainAxisAlignment: MainAxisAlignment.start,
                             children: [
                               widget.appoList[index].isLiveCareAppointment
-                                  ? Container(
+                                  ? Image.asset(
-                                      margin: EdgeInsets.fromLTRB(
+                                      "assets/images/new-design/video.png")
-                                          5.0, 0.0, 5.0, 0.0),
+                                  : Image.asset(
-                                      child: Image.asset(
+                                      "assets/images/new-design/walkin.png"),
-                                          "assets/images/new-design/video.png"),
-                                    )
-                                  : Container(
-                                      margin: EdgeInsets.fromLTRB(
-                                          5.0, 0.0, 5.0, 0.0),
-                                      child: Image.asset(
-                                          "assets/images/new-design/walkin.png"),
-                                    ),
                               widget.appoList[index].isLiveCareAppointment
-                                  ? Container(
+                                  ? Text(
-                                      child: Text(
+                                      TranslationBase.of(context).videoAppo,
-                                          TranslationBase.of(context).videoAppo,
+                                      style: TextStyle(
-                                          style: TextStyle(
+                                          color: Colors.white,
-                                              color: Colors.white,
+                                          fontWeight: FontWeight.bold,
-                                              fontWeight: FontWeight.bold,
+                                          fontSize: 11.0))
-                                              fontSize: 11.0)),
+                                  : Text(
-                                    )
+                                      TranslationBase.of(context)
-                                  : Container(
+                                          .walkinAppo,
-                                      child: Text(
+                                      style: TextStyle(
-                                          TranslationBase.of(context)
+                                          color: Colors.white,
-                                              .walkinAppo,
+                                          fontWeight: FontWeight.bold,
-                                          style: TextStyle(
+                                          fontSize: 11.0))
-                                              color: Colors.white,
-                                              fontWeight: FontWeight.bold,
-                                              fontSize: 11.0)),
-                                    )
                             ],
                           ),
                         ),

lib/pages/landing/home_page.dart

@@ -1,3 +1,5 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
@@ -19,6 +21,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:feather_icons_flutter/feather_icons_flutter.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -37,15 +40,15 @@ class HomePage extends StatefulWidget {
 }
 
 class _HomePageState extends State<HomePage> {
-  PharmacyModuleViewModel pharmacyModuleViewModel =
+  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
-      locator<PharmacyModuleViewModel>();
 
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return BaseView<DashboardViewModel>(
-      onModelReady: (model) => () {
+      onModelReady: (model) => () async {
         model.getPatientRadOrders();
+        var user = await sharedPref.getObject(USER_PROFILE);
       },
       builder: (_, model, wi) => AppScaffold(
         isShowDecPage: false,
@@ -65,9 +68,7 @@ class _HomePageState extends State<HomePage> {
                           height: 210,
                           decoration: BoxDecoration(
                             image: DecorationImage(
-                                image: ExactAssetImage(
+                                image: ExactAssetImage('assets/images/dashboard_top_bg.png'), fit: BoxFit.cover),
-                                    'assets/images/dashboard_top_bg.png'),
-                                fit: BoxFit.cover),
                           ),
                           child: Stack(
                             children: <Widget>[
@@ -76,131 +77,103 @@ class _HomePageState extends State<HomePage> {
                                 left: 5,
                                 right: 5,
                                 child: Container(
-                                  width:
+                                  width: MediaQuery.of(context).size.width * 0.8,
-                                      MediaQuery.of(context).size.width * 0.8,
                                   child: Row(
                                     children: <Widget>[
                                       Expanded(
-                                        child: Container(
+                                        child: Visibility(
-                                          height: 125,
+                                          visible: model.user.outSA == 1 ? false : true,
-                                          padding: EdgeInsets.all(5),
-                                          margin: EdgeInsets.all(5),
-                                          decoration: BoxDecoration(
-                                              image: DecorationImage(
-                                                image: AssetImage(
-                                                    "assets/images/new-design/covid_bg_transparent.png"),
-                                                fit: BoxFit.fill,
-                                              ),
-                                              color:
-                                                  Colors.white.withOpacity(0.3),
-                                              borderRadius: BorderRadius.all(
-                                                  Radius.circular(5))),
                                           child: Container(
-                                            child: Column(
+                                            height: 125,
-                                              children: <Widget>[
+                                            padding: EdgeInsets.all(5),
-                                                Texts(
+                                            margin: EdgeInsets.all(5),
-                                                  TranslationBase.of(context)
+                                            decoration: BoxDecoration(
-                                                      .covidTest,
+                                                image: DecorationImage(
-                                                  color: Colors.white,
+                                                  image:
-                                                  fontWeight: FontWeight.w700,
+                                                      AssetImage("assets/images/new-design/covid_bg_transparent.png"),
+                                                  fit: BoxFit.fill,
                                                 ),
-                                                Row(
+                                                color: Colors.white.withOpacity(0.3),
-                                                  mainAxisAlignment:
+                                                borderRadius: BorderRadius.all(Radius.circular(5))),
-                                                      MainAxisAlignment
+                                            child: Container(
-                                                          .spaceAround,
+                                              child: Column(
-                                                  children: <Widget>[
+                                                children: <Widget>[
-                                                    Container(
+                                                  Texts(
-                                                      margin: EdgeInsets.only(
+                                                    TranslationBase.of(context).covidTest,
-                                                        top: 15.0,
+                                                    color: Colors.white,
+                                                    fontWeight: FontWeight.w700,
+                                                  ),
+                                                  Row(
+                                                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                                                    children: <Widget>[
+                                                      Container(
+                                                        margin: EdgeInsets.only(
+                                                          top: 15.0,
+                                                        ),
+                                                        child: SvgPicture.asset(
+                                                            'assets/images/new-design/covid-19-car.svg',
+                                                            width: 45.0,
+                                                            height: 45.0),
                                                       ),
-                                                      child: SvgPicture.asset(
+                                                      Container(
-                                                          'assets/images/new-design/covid-19-car.svg',
+                                                        margin: EdgeInsets.only(top: 5.0),
-                                                          width: 45.0,
+                                                        child: Column(
-                                                          height: 45.0),
+                                                          children: <Widget>[
-                                                    ),
+                                                            Texts(
-                                                    Container(
+                                                              TranslationBase.of(context).driveThru,
-                                                      margin: EdgeInsets.only(
+                                                              fontWeight: FontWeight.w700,
-                                                          top: 5.0),
+                                                              color: Colors.white,
-                                                      child: Column(
-                                                        children: <Widget>[
-                                                          Texts(
-                                                            TranslationBase.of(
-                                                                    context)
-                                                                .driveThru,
-                                                            fontWeight:
-                                                                FontWeight.w700,
-                                                            color: Colors.white,
-                                                          ),
-                                                          ButtonTheme(
-                                                            shape:
-                                                                RoundedRectangleBorder(
-                                                              borderRadius:
-                                                                  BorderRadius
-                                                                      .circular(
-                                                                          5.0),
                                                             ),
-                                                            minWidth: MediaQuery.of(
+                                                            ButtonTheme(
-                                                                        context)
+                                                              shape: RoundedRectangleBorder(
-                                                                    .size
+                                                                borderRadius: BorderRadius.circular(5.0),
-                                                                    .width *
+                                                              ),
-                                                                0.15,
+                                                              minWidth: MediaQuery.of(context).size.width * 0.15,
-                                                            height: 25.0,
+                                                              height: 25.0,
-                                                            child: RaisedButton(
+                                                              child: RaisedButton(
-                                                              color: Colors
+                                                                color: Colors.red[800],
-                                                                  .red[800],
+                                                                textColor: Colors.white,
-                                                              textColor:
+                                                                disabledTextColor: Colors.white,
-                                                                  Colors.white,
+                                                                disabledColor: new Color(0xFFbcc2c4),
-                                                              disabledTextColor:
+                                                                onPressed: () {
-                                                                  Colors.white,
+                                                                  navigateToCovidDriveThru();
-                                                              disabledColor:
+                                                                },
-                                                                  new Color(
-                                                                      0xFFbcc2c4),
-                                                              onPressed: () {
-                                                                navigateToCovidDriveThru();
-                                                              },
-                                                              child: Center(
                                                                 child: Center(
                                                                   child: Center(
-                                                                    child:
+                                                                    child: Center(
-                                                                        Center(
+                                                                      child: Center(
-                                                                      child:
+                                                                        child: Texts(
-                                                                          Texts(
+                                                                          TranslationBase.of(context).bookNow,
-                                                                        TranslationBase.of(context)
+                                                                          fontWeight: FontWeight.w700,
-                                                                            .bookNow,
+                                                                          color: Colors.white,
-                                                                        fontWeight:
+                                                                        ),
-                                                                            FontWeight.w700,
-                                                                        color: Colors
-                                                                            .white,
                                                                       ),
                                                                     ),
                                                                   ),
                                                                 ),
                                                               ),
                                                             ),
-                                                          ),
+                                                          ],
-                                                        ],
+                                                        ),
                                                       ),
-                                                    ),
+                                                    ],
-                                                  ],
+                                                  ),
-                                                ),
+                                                ],
-                                              ],
+                                              ),
                                             ),
                                           ),
                                         ),
                                       ),
                                       Expanded(
                                         child: InkWell(
-                                          onTap: () => Navigator.push(context,
+                                          onTap: () => Navigator.push(context, FadePage(page: LiveCareHome())),
-                                              FadePage(page: LiveCareHome())),
                                           child: Container(
                                             height: 125,
                                             padding: EdgeInsets.all(15),
                                             margin: EdgeInsets.all(5),
                                             decoration: BoxDecoration(
-                                                color: Colors.white
+                                                color: Colors.white.withOpacity(0.3),
-                                                    .withOpacity(0.3),
+                                                borderRadius: BorderRadius.all(Radius.circular(5))),
-                                                borderRadius: BorderRadius.all(
-                                                    Radius.circular(5))),
                                             child: SvgPicture.asset(
                                               projectViewModel.isArabic
                                                   ? 'assets/images/new-design/livecare_arabic_logo.svg'
@@ -216,23 +189,15 @@ class _HomePageState extends State<HomePage> {
                             ],
                           ),
                         ),
-                        Container(
+                        Container(width: double.infinity, height: projectViewModel.isArabic ? 110 : 80)
-                            width: double.infinity,
-                            height: projectViewModel.isArabic ? 110 : 80)
                       ],
                     ),
                     Positioned(
                       top: 155,
                       left: MediaQuery.of(context).size.width *
-                          (MediaQuery.of(context).orientation ==
+                          (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03),
-                                  Orientation.landscape
-                              ? 0.02
-                              : 0.03),
                       right: MediaQuery.of(context).size.width *
-                          (MediaQuery.of(context).orientation ==
+                          (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03),
-                                  Orientation.landscape
-                              ? 0.02
-                              : 0.03),
                       child: (!model.isLogin)
                           ? Container(
                               width: double.infinity,
@@ -240,14 +205,10 @@ class _HomePageState extends State<HomePage> {
                               decoration: BoxDecoration(
                                   color: HexColor('#A59E9E'),
                                   shape: BoxShape.rectangle,
-                                  border: Border.all(
+                                  border: Border.all(color: Colors.transparent, width: 0.5),
-                                      color: Colors.transparent, width: 0.5),
+                                  borderRadius: BorderRadius.all(Radius.circular(9)),
-                                  borderRadius:
-                                      BorderRadius.all(Radius.circular(9)),
                                   image: DecorationImage(
-                                      image: ExactAssetImage(
+                                      image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover)),
-                                          'assets/images/bg_graphic.png'),
-                                      fit: BoxFit.cover)),
                               child: Container(
                                 margin: EdgeInsets.all(5),
                                 child: Column(
@@ -263,37 +224,30 @@ class _HomePageState extends State<HomePage> {
                                       fontSize: 23,
                                     ),
                                     Texts(
-                                      TranslationBase.of(context)
+                                      TranslationBase.of(context).myMedicalFileSubTitle,
-                                          .myMedicalFileSubTitle,
                                       color: Colors.black,
                                       fontSize: 16,
                                     ),
                                     Align(
-                                      alignment: projectViewModel.isArabic
+                                      alignment:
-                                          ? Alignment.bottomLeft
+                                          projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight,
-                                          : Alignment.bottomRight,
                                       child: InkWell(
                                         onTap: () {
                                           widget.goToMyProfile();
                                         },
                                         child: Container(
-                                          margin: EdgeInsets.only(
+                                          margin: EdgeInsets.only(left: 15, right: 15),
-                                              left: 15, right: 15),
                                           width: 90,
                                           height: 30,
                                           decoration: BoxDecoration(
                                             color: HexColor('#D81A2E'),
                                             shape: BoxShape.rectangle,
-                                            border: Border.all(
+                                            border: Border.all(color: Colors.transparent, width: 0.5),
-                                                color: Colors.transparent,
+                                            borderRadius: BorderRadius.all(Radius.circular(0)),
-                                                width: 0.5),
-                                            borderRadius: BorderRadius.all(
-                                                Radius.circular(0)),
                                           ),
                                           child: Center(
                                             child: Texts(
-                                              TranslationBase.of(context)
+                                              TranslationBase.of(context).viewMore,
-                                                  .viewMore,
                                               color: Colors.white,
                                               fontWeight: FontWeight.w700,
                                               fontSize: 12,
@@ -312,14 +266,10 @@ class _HomePageState extends State<HomePage> {
                               decoration: BoxDecoration(
                                 color: HexColor('#A59E9E'),
                                 shape: BoxShape.rectangle,
-                                border: Border.all(
+                                border: Border.all(color: Colors.transparent, width: 0.5),
-                                    color: Colors.transparent, width: 0.5),
+                                borderRadius: BorderRadius.all(Radius.circular(9)),
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(9)),
                                 image: DecorationImage(
-                                    image: ExactAssetImage(
+                                    image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover),
-                                        'assets/images/bg_graphic.png'),
-                                    fit: BoxFit.cover),
                               ),
                               child: Container(
                                 margin: EdgeInsets.all(5),
@@ -327,81 +277,51 @@ class _HomePageState extends State<HomePage> {
                                   children: <Widget>[
                                     Row(
                                       children: <Widget>[
-                                        if (projectViewModel.user != null &&
+                                        if (projectViewModel.user != null && model.isLogin)
-                                            model.isLogin)
                                           Expanded(
                                             child: Column(
-                                              crossAxisAlignment:
+                                              crossAxisAlignment: CrossAxisAlignment.start,
-                                                  CrossAxisAlignment.start,
                                               children: <Widget>[
                                                 SizedBox(
                                                   height: 8,
                                                 ),
-                                                model.user.cRSVerificationStatus ==
+                                                model.user.cRSVerificationStatus == 2
-                                                        2
                                                     ? Row(
                                                         children: [
                                                           Texts(
-                                                            model.user
+                                                            model.user.firstName + " " + model.user.lastName,
-                                                                    .firstName +
+                                                            color: Colors.grey[100],
-                                                                " " +
-                                                                model.user
-                                                                    .lastName,
-                                                            color: Colors
-                                                                .grey[100],
                                                             bold: true,
                                                             fontSize: 15,
                                                           ),
                                                           Container(
-                                                            margin: EdgeInsets
+                                                            margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
-                                                                .fromLTRB(
-                                                                    8.0,
-                                                                    0.0,
-                                                                    8.0,
-                                                                    0.0),
                                                             child: SvgPicture.asset(
                                                                 "assets/images/new-design/verification_check.svg"),
                                                           ),
                                                         ],
                                                       )
-                                                    : model.user.cRSVerificationStatus ==
+                                                    : model.user.cRSVerificationStatus == 3
-                                                            3
                                                         ? Row(
                                                             children: [
                                                               Texts(
-                                                                model.user
+                                                                model.user.firstName + " " + model.user.lastName,
-                                                                        .firstName +
+                                                                color: Colors.grey[100],
-                                                                    " " +
-                                                                    model.user
-                                                                        .lastName,
-                                                                color: Colors
-                                                                    .grey[100],
                                                                 bold: true,
                                                                 fontSize: 15,
                                                               ),
                                                               Container(
-                                                                margin: EdgeInsets
+                                                                margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
-                                                                    .fromLTRB(
+                                                                child: SvgPicture.asset(
-                                                                        8.0,
+                                                                    "assets/images/new-design/pending.svg"),
-                                                                        0.0,
-                                                                        8.0,
-                                                                        0.0),
-                                                                child: SvgPicture
-                                                                    .asset(
-                                                                        "assets/images/new-design/pending.svg"),
                                                               ),
                                                             ],
                                                           )
                                                         : Row(
                                                             children: [
                                                               Texts(
-                                                                model.user
+                                                                model.user.firstName + " " + model.user.lastName,
-                                                                        .firstName +
+                                                                color: Colors.grey[100],
-                                                                    " " +
-                                                                    model.user
-                                                                        .lastName,
-                                                                color: Colors
-                                                                    .grey[100],
                                                                 bold: true,
                                                                 fontSize: 15,
                                                               ),
@@ -435,17 +355,14 @@ class _HomePageState extends State<HomePage> {
                                             decoration: BoxDecoration(
                                               color: HexColor('#D81A2E'),
                                               shape: BoxShape.rectangle,
-                                              border: Border.all(
+                                              border: Border.all(color: Colors.transparent, width: 0.5),
-                                                  color: Colors.transparent,
-                                                  width: 0.5),
                                               borderRadius: BorderRadius.all(
                                                 Radius.circular(5),
                                               ),
                                             ),
                                             child: Center(
                                               child: Texts(
-                                                TranslationBase.of(context)
+                                                TranslationBase.of(context).myMedicalFile,
-                                                    .myMedicalFile,
                                                 color: Colors.white,
                                                 fontSize: 12,
                                                 textAlign: TextAlign.center,
@@ -484,10 +401,8 @@ class _HomePageState extends State<HomePage> {
                                                 width: 25,
                                                 height: 40,
                                               ),
-                                              Texts(
+                                              Texts('${model.weightKg} ${TranslationBase.of(context).kg}',
-                                                  '${model.weightKg} ${TranslationBase.of(context).kg}',
+                                                  color: Colors.white, fontSize: 17)
-                                                  color: Colors.white,
-                                                  fontSize: 17)
                                             ],
                                           ),
                                         ),
@@ -502,9 +417,7 @@ class _HomePageState extends State<HomePage> {
                                                 width: 35,
                                                 height: 40,
                                               ),
-                                              Texts('${model.booldType}',
+                                              Texts('${model.booldType}', color: Colors.white, fontSize: 17)
-                                                  color: Colors.white,
-                                                  fontSize: 17)
                                             ],
                                           ),
                                         ),
@@ -518,12 +431,10 @@ class _HomePageState extends State<HomePage> {
                   ],
                 ),
                 Padding(
-                  padding:
+                  padding: const EdgeInsets.only(bottom: 15, right: 15, left: 15),
-                      const EdgeInsets.only(bottom: 15, right: 15, left: 15),
                   child: InkWell(
                     onTap: () {
-                      Navigator.of(context).push(MaterialPageRoute(
+                      Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage()));
-                          builder: (context) => PackagesHomePage()));
                     },
                     child: Container(
                       decoration: BoxDecoration(
@@ -551,131 +462,126 @@ class _HomePageState extends State<HomePage> {
                 if (projectViewModel.havePrivilege(64) ||
                     projectViewModel.havePrivilege(65) ||
                     projectViewModel.havePrivilege(67))
-                  Container(
+                  if (model.user.outSA == 0)
-                    margin: EdgeInsets.only(left: 15, right: 15),
+                    Container(
-                    child: Row(
+                      margin: EdgeInsets.only(left: 15, right: 15),
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      child: Row(
-                      children: <Widget>[
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        if (projectViewModel.havePrivilege(64))
+                        children: <Widget>[
-                          DashboardItem(
+                          if (projectViewModel.havePrivilege(64))
-                            onTap: () {
+                            DashboardItem(
-                              Navigator.push(
+                              onTap: () {
-                                context,
+                                Navigator.push(
-                                FadePage(
+                                  context,
-                                  page: HomeHealthCarePage(),
+                                  FadePage(
-                                ),
+                                    page: HomeHealthCarePage(),
-                              );
+                                  ),
-                            },
+                                );
-                            child: Center(
+                              },
-                              child: Padding(
+                              child: Center(
-                                padding: const EdgeInsets.all(15.0),
+                                child: Padding(
-                                child: Column(
+                                  padding: const EdgeInsets.all(15.0),
-                                  children: <Widget>[
+                                  child: Column(
-                                    Image.asset(
+                                    children: <Widget>[
-                                      'assets/images/home_health_care_icon.png',
+                                      Image.asset(
-                                      width: 50,
+                                        'assets/images/home_health_care_icon.png',
-                                      height: 50,
+                                        width: 50,
-                                    ),
+                                        height: 50,
-                                    SizedBox(
+                                      ),
-                                      height: 10,
+                                      SizedBox(
-                                    ),
+                                        height: 10,
-                                    Texts(
+                                      ),
-                                      TranslationBase.of(context)
+                                      Texts(
-                                          .homeHealthCare,
+                                        TranslationBase.of(context).homeHealthCare,
-                                      textAlign: TextAlign.center,
+                                        textAlign: TextAlign.center,
-                                      color: Colors.white,
+                                        color: Colors.white,
-                                      fontWeight: FontWeight.w700,
+                                        fontWeight: FontWeight.w700,
-                                      fontSize:
+                                        fontSize: SizeConfig.textMultiplier * 1.55,
-                                          SizeConfig.textMultiplier * 1.55,
+                                      )
-                                    )
+                                    ],
-                                  ],
+                                  ),
                                 ),
                               ),
+                              height: MediaQuery.of(context).size.width * 0.4,
+                              imageName: 'home_healthcare_service_bg.png',
+                              opacity: 0.5,
                             ),
-                            height: MediaQuery.of(context).size.width * 0.4,
+                          if (projectViewModel.havePrivilege(65))
-                            imageName: 'home_healthcare_service_bg.png',
+                            DashboardItem(
-                            opacity: 0.5,
+                              onTap: () => getPharmacyToken(model),
-                          ),
+                              child: Center(
-                        if (projectViewModel.havePrivilege(65))
+                                child: Padding(
-                          DashboardItem(
+                                  padding: const EdgeInsets.all(15.0),
-                            onTap: () => getPharmacyToken(model),
+                                  child: Column(
-                            child: Center(
+                                    children: <Widget>[
-                              child: Padding(
+                                      Image.asset(
-                                padding: const EdgeInsets.all(15.0),
+                                        'assets/images/pharmacy_logo.png',
-                                child: Column(
+                                        width: 40,
-                                  children: <Widget>[
+                                        height: 40,
-                                    Image.asset(
+                                      ),
-                                      'assets/images/pharmacy_logo.png',
+                                      SizedBox(
-                                      width: 40,
+                                        height: 20,
-                                      height: 40,
+                                      ),
-                                    ),
+                                      Texts(
-                                    SizedBox(
+                                        TranslationBase.of(context).onlinePharmacy,
-                                      height: 20,
+                                        textAlign: TextAlign.center,
-                                    ),
+                                        color: Colors.white,
-                                    Texts(
+                                        fontWeight: FontWeight.w700,
-                                      TranslationBase.of(context)
+                                        fontSize: SizeConfig.textMultiplier * 1.55,
-                                          .onlinePharmacy,
+                                      )
-                                      textAlign: TextAlign.center,
+                                    ],
-                                      color: Colors.white,
+                                  ),
-                                      fontWeight: FontWeight.w700,
-                                      fontSize:
-                                          SizeConfig.textMultiplier * 1.55,
-                                    )
-                                  ],
                                 ),
                               ),
+                              height: MediaQuery.of(context).size.width * 0.4,
+                              imageName: 'al-habib_onlne_pharmacy_bg.png',
                             ),
-                            height: MediaQuery.of(context).size.width * 0.4,
+                          if (projectViewModel.havePrivilege(67))
-                            imageName: 'al-habib_onlne_pharmacy_bg.png',
+                            DashboardItem(
-                          ),
+                              onTap: () {
-                        if (projectViewModel.havePrivilege(67))
+                                Navigator.push(
-                          DashboardItem(
+                                  context,
-                            onTap: () {
+                                  FadePage(
-                              Navigator.push(
+                                    page: CMCPage(),
-                                context,
+                                  ),
-                                FadePage(
+                                );
-                                  page: CMCPage(),
+                              },
-                                ),
+                              child: Center(
-                              );
+                                child: Padding(
-                            },
+                                  padding: const EdgeInsets.all(15.0),
-                            child: Center(
+                                  child: Column(
-                              child: Padding(
+                                    children: <Widget>[
-                                padding: const EdgeInsets.all(15.0),
+                                      Image.asset(
-                                child: Column(
+                                        'assets/images/comprehensive_medical_checkup_logo.png',
-                                  children: <Widget>[
+                                        width: 50,
-                                    Image.asset(
+                                        height: 50,
-                                      'assets/images/comprehensive_medical_checkup_logo.png',
+                                      ),
-                                      width: 50,
+                                      SizedBox(
-                                      height: 50,
+                                        height: 10,
-                                    ),
+                                      ),
-                                    SizedBox(
+                                      Texts(
-                                      height: 10,
+                                        TranslationBase.of(context).cmcHeading,
-                                    ),
+                                        textAlign: TextAlign.center,
-                                    Texts(
+                                        color: Colors.white,
-                                      TranslationBase.of(context).cmcHeading,
+                                        fontWeight: FontWeight.w700,
-                                      textAlign: TextAlign.center,
+                                        fontSize: SizeConfig.textMultiplier * 1.55,
-                                      color: Colors.white,
+                                      )
-                                      fontWeight: FontWeight.w700,
+                                    ],
-                                      fontSize:
+                                  ),
-                                          SizeConfig.textMultiplier * 1.55,
-                                    )
-                                  ],
                                 ),
                               ),
+                              height: MediaQuery.of(context).size.width * 0.4,
+                              color: HexColor("#747C80"),
+                              imageName: 'emergency_service_image.png',
                             ),
-                            height: MediaQuery.of(context).size.width * 0.4,
+                        ],
-                            color: HexColor("#747C80"),
+                      ),
-                            imageName: 'emergency_service_image.png',
-                          ),
-                      ],
                     ),
-                  ),
                 SizedBox(
                   height: 8,
                 ),
                 InkWell(
-                  onTap: () =>
+                  onTap: () => Navigator.push(context, FadePage(page: PaymentService())),
-                      Navigator.push(context, FadePage(page: PaymentService())),
                   child: Container(
                     margin: EdgeInsets.only(left: 15, right: 15),
                     child: Row(
@@ -696,8 +602,7 @@ class _HomePageState extends State<HomePage> {
                                     height: 5,
                                   ),
                                   Texts(
-                                    TranslationBase.of(context)
+                                    TranslationBase.of(context).onlinePaymentService,
-                                        .onlinePaymentService,
                                     textAlign: TextAlign.center,
                                     color: Colors.black87,
                                     bold: false,
@@ -728,8 +633,7 @@ class _HomePageState extends State<HomePage> {
                                       height: 10,
                                     ),
                                     Texts(
-                                      TranslationBase.of(context)
+                                      TranslationBase.of(context).offersAndPackages,
-                                          .offersAndPackages,
                                       textAlign: TextAlign.center,
                                       color: Colors.black87,
                                       bold: false,
@@ -769,13 +673,11 @@ class _HomePageState extends State<HomePage> {
                                         height: 10,
                                       ),
                                       Texts(
-                                        TranslationBase.of(context)
+                                        TranslationBase.of(context).emergencyServices,
-                                            .emergencyServices,
                                         textAlign: TextAlign.center,
                                         color: Colors.black87,
                                         bold: false,
-                                        fontSize:
+                                        fontSize: SizeConfig.textMultiplier * 1.7,
-                                            SizeConfig.textMultiplier * 1.7,
                                       )
                                     ],
                                   ),
@@ -813,8 +715,7 @@ class _HomePageState extends State<HomePage> {
                                 fontWeight: FontWeight.normal,
                               ),
                               Texts(
-                                TranslationBase.of(context)
+                                TranslationBase.of(context).viewAllHabibMedicalService,
-                                    .viewAllHabibMedicalService,
                                 color: Colors.white,
                                 fontWeight: FontWeight.normal,
                                 fontSize: 10,
@@ -835,15 +736,13 @@ class _HomePageState extends State<HomePage> {
                         opacity: 0.5,
                         color: Colors.grey[700],
                         width: MediaQuery.of(context).size.width * 0.45,
-                        onTap: () => Navigator.push(
+                        onTap: () => Navigator.push(context, FadePage(page: AllHabibMedicalService())),
-                            context, FadePage(page: AllHabibMedicalService())),
                       ),
                       DashboardItem(
                         onTap: () {
                           // Navigator.push(
                           //     context, FadePage(page: FeedbackHomePage()));
-                          Navigator.push(
+                          Navigator.push(context, FadePage(page: ContactUsPage()));
-                              context, FadePage(page: ContactUsPage()));
                         },
                         child: Container(
                           width: double.infinity,
@@ -965,10 +864,8 @@ class DashboardItem extends StatelessWidget {
               ? DecorationImage(
                   image: ExactAssetImage('assets/images/$imageName'),
                   fit: BoxFit.cover,
-                  colorFilter: hasColorFilter
+                  colorFilter:
-                      ? new ColorFilter.mode(
+                      hasColorFilter ? new ColorFilter.mode(Colors.black.withOpacity(0.2), BlendMode.dstIn) : null,
-                          Colors.black.withOpacity(0.2), BlendMode.dstIn)
-                      : null,
                 )
               : null,
         ),

lib/pages/landing/landing_page.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/model/geofencing/requests/GeoZonesRequestModel.dart';
@@ -31,9 +32,11 @@ import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart';
+import 'package:firebase_analytics/observer.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
@@ -43,12 +46,22 @@ import '../../routes.dart';
 import 'home_page.dart';
 
 class LandingPage extends StatefulWidget {
+  static LandingPage shared;
+  _LandingPageState state;
+  LandingPage() {
+    LandingPage.shared = this;
+  }
+
   static bool isOpenCallPage = false;
 
   static IncomingCallData incomingCallData = new IncomingCallData();
 
   @override
-  _LandingPageState createState() => _LandingPageState();
+  _LandingPageState createState() => state = _LandingPageState();
+
+  switchToDoFromHMGServices(){
+    state.changeCurrentTab(4);
+  }
 }
 
 class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
@@ -84,18 +97,22 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   bool isPageNavigated = false;
   LocationUtils locationUtils;
 
-  _changeCurrentTab(int tab) {
+  changeCurrentTab(int tab) {
     setState(() {
-      currentTab = tab;
+      if(currentTab > 0 && tab == 2)
-      if (tab != 0)
+        pageController.jumpToPage(0);
+      else if (tab != 0)
         pageController.jumpToPage(tab);
       else {
         IS_VOICE_COMMAND_CLOSED = false;
         pageController.jumpToPage(tab);
       }
+      currentTab = tab;
     });
   }
 
+
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     super.didChangeAppLifecycleState(state);
@@ -189,6 +206,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
       // if (results[Permission.calendar].isGranted) ;
     });
     requestPermissions();
+
     // });
     //
     // //_firebase Background message handler
@@ -367,7 +385,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
 
   checkValue(projectProvider) {
     if (projectProvider.searchValue != null) {
-      _changeCurrentTab(2);
+      changeCurrentTab(2);
     }
   }
 
@@ -545,7 +563,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
           children: [
             HomePage(
               goToMyProfile: () {
-                _changeCurrentTab(1);
+                changeCurrentTab(1);
               },
             ),
             MedicalProfilePage(),
@@ -555,7 +573,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
           ], // Please do not remove the BookingOptions from this array
         ),
         bottomNavigationBar: BottomNavBar(
-          changeIndex: _changeCurrentTab,
+          changeIndex: changeCurrentTab,
           index: currentTab,
         ),
         floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked ,
@@ -564,7 +582,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
                 ? FloatingButton(
                     elevation: true,
                     onTap: () {
-                      _changeCurrentTab(2);
+                      changeCurrentTab(2);
                     })
                 : null);
   }

lib/pages/login/login.dart

@@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
@@ -40,6 +41,7 @@ class Login extends StatefulWidget {
 class _Login extends State<Login> {
   final util = Utils();
   final nationalIDorFile = TextEditingController();
+  final mobileNumberController = TextEditingController();
   final int loginType = LoginType.loginType;
   String mobileNo;
   String countryCode = '966';
@@ -62,6 +64,11 @@ class _Login extends State<Login> {
   void initState() {
 //    getDeviceToken();
     super.initState();
+
+    if(BASE_URL.contains("uat.")){
+      nationalIDorFile.text = "1231755";
+      mobileNumberController.text = mobileNo = "537503378";
+    }
   }
 
   getDeviceToken() async {
@@ -102,6 +109,7 @@ class _Login extends State<Login> {
                     Directionality(
                         textDirection: TextDirection.ltr,
                         child: MobileNo(
+                            controller: mobileNumberController,
                             onNumberChange: (value) =>
                                 {mobileNo = value, validateForm()},
                             onCountryChange: (value) => countryCode = value)),

lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart

@@ -32,7 +32,16 @@ class WeightMonthlyPage extends StatelessWidget {
       body: model.weighMonthTimeSeriesData.isEmpty
           ? Container(
               child: Center(
-                child: Texts(TranslationBase.of(context).noDataAvailable),
+                child: Container(
+                  child: Center(
+                    child: MonthLineChartCurved(
+                      horizontalInterval: 1.0,
+                      title: TranslationBase.of(context).weight,
+                      timeSeries: model.weighMonthTimeSeriesData,
+                      indexes: model.weighMonthTimeSeriesData.length ~/ 5.5 ?? 0,
+                    ),
+                  ),
+                ),
               ),
             )
           : ListView(

lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart

@@ -30,7 +30,12 @@ class WeightWeeklyPage extends StatelessWidget {
               child: Center(
                 child: Container(
                   child: Center(
-                    child: Texts(TranslationBase.of(context).noDataAvailable),
+                    child: LineChartCurved(
+                      horizontalInterval: 1.0,
+                      title: TranslationBase.of(context).weight,
+                      timeSeries: model.weightWeekTimeSeriesData,
+                      indexes: model.weightWeekTimeSeriesData.length ~/ 5.5 ?? 0,
+                    ),
                   ),
                 ),
               ),

lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart

@@ -31,7 +31,16 @@ class WeightYearPage extends StatelessWidget {
       body: model.weightYearTimeSeriesData.isEmpty
           ? Container(
               child: Center(
-                child: Texts(TranslationBase.of(context).noDataAvailable),
+                child: Container(
+                  child: Center(
+                    child: LineChartCurved(
+                      horizontalInterval: 1.0,
+                      title: TranslationBase.of(context).weight,
+                      timeSeries: model.weightYearTimeSeriesData,
+                      indexes: model.weightWeekTimeSeriesData.length ~/ 5.5 ?? 0,
+                    ),
+                  ),
+                ),
               ),
             )
           : ListView(

lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart

@@ -27,13 +27,13 @@ class AddBloodPressurePage extends StatefulWidget {
 
   const AddBloodPressurePage(
       {Key key,
-        this.bloodSugarDate,
+      this.bloodSugarDate,
-        this.measureTimeSelectedType,
+      this.measureTimeSelectedType,
-        this.isUpdate = false,
+      this.isUpdate = false,
-        this.lineItemNo,
+      this.lineItemNo,
-        this.model,
+      this.model,
-        this.bloodSystolicValue,
+      this.bloodSystolicValue,
-        this.bloodDiastolicValue})
+      this.bloodDiastolicValue})
       : super(key: key);
 
   @override
@@ -42,15 +42,14 @@ class AddBloodPressurePage extends StatefulWidget {
 
 class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
   TextEditingController _bloodSystolicValueController = TextEditingController();
-  TextEditingController _bloodDiastolicValueController =
+  TextEditingController _bloodDiastolicValueController = TextEditingController();
-  TextEditingController();
   DateTime bloodSugarDate = DateTime.now();
   DateTime timeSugarDate = DateTime.now();
   int measuredArm = 1;
   bool isButtonDisabled = false;
   final List<String> measureTimeEnList = [
-    'Left',
+    'Left arm ',
-    'Right',
+    'Right arm',
   ];
   final List<String> measureTimeArList = [
     'الذراع الأيسر',
@@ -81,44 +80,38 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
 
     return AppScaffold(
       isShowAppBar: true,
-      appBarTitle: widget.isUpdate
+      appBarTitle: widget.isUpdate ? TranslationBase.of(context).update : TranslationBase.of(context).add,
-          ? TranslationBase.of(context).update
-          : TranslationBase.of(context).add,
       appBarIcons: widget.isUpdate
-      ? [
+          ? [
-      IconButton(
+              IconButton(
-        icon: Icon(Icons.delete),
+                icon: Icon(Icons.delete),
-        color: Colors.white,
+                color: Colors.white,
-        onPressed: () {
+                onPressed: () {
-          ConfirmDialog dialog = new ConfirmDialog(
+                  ConfirmDialog dialog = new ConfirmDialog(
-              context: context,
+                      context: context,
-              confirmMessage: 'Remove this measure',
+                      confirmMessage: 'Remove this measure',
-              okText: TranslationBase.of(context).ok,
+                      okText: TranslationBase.of(context).ok,
-              cancelText: TranslationBase.of(context).cancel,
+                      cancelText: TranslationBase.of(context).cancel,
-              okFunction: () async {
+                      okFunction: () async {
-                ConfirmDialog.closeAlertDialog(context);
+                        ConfirmDialog.closeAlertDialog(context);
 
-                GifLoaderDialogUtils.showMyDialog(context);
+                        GifLoaderDialogUtils.showMyDialog(context);
-                widget.model
+                        widget.model.deactivateDiabeticStatus(lineItemNo: widget.lineItemNo).then((value) {
-                    .deactivateDiabeticStatus(
+                          GifLoaderDialogUtils.hideDialog(context);
-                    lineItemNo: widget.lineItemNo)
+                          if (widget.model.state == ViewState.ErrorLocal)
-                    .then((value) {
+                            AppToast.showErrorToast(message: widget.model.error);
-                  GifLoaderDialogUtils.hideDialog(context);
+                          else
-                  if (widget.model.state == ViewState.ErrorLocal)
+                            Navigator.pop(context);
-                    AppToast.showErrorToast(
+                        }).catchError((e) {
-                        message: widget.model.error);
+                          GifLoaderDialogUtils.hideDialog(context);
-                  else
+                          AppToast.showErrorToast(message: widget.model.error);
-                    Navigator.pop(context);
+                        });
-                }).catchError((e) {
+                      },
-                  GifLoaderDialogUtils.hideDialog(context);
+                      cancelFunction: () => {});
-                  AppToast.showErrorToast(message: widget.model.error);
+                  dialog.showAlertDialog(context);
-                });
+                },
-              },
+              )
-              cancelFunction: () => {});
+            ]
-          dialog.showAlertDialog(context);
-        },
-      )
-      ]
           : null,
       body: SingleChildScrollView(
         physics: BouncingScrollPhysics(),
@@ -151,17 +144,13 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
               ),
               InkWell(
                 onTap: () {
-                  confirmSelectMeasureTimeDialog(projectViewModel.isArabic
+                  confirmSelectMeasureTimeDialog(!projectViewModel.isArabic ? measureTimeArList : measureTimeEnList);
-                      ? measureTimeEnList
-                      : measureTimeArList);
                 },
                 child: Container(
                   padding: EdgeInsets.all(12),
                   width: double.infinity,
                   height: 65,
-                  decoration: BoxDecoration(
+                  decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
-                      borderRadius: BorderRadius.circular(12),
-                      color: Colors.white),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
@@ -183,22 +172,18 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
                       showTitleActions: true,
                       minTime: DateTime(DateTime.now().year - 1, 1, 1),
                       maxTime: DateTime.now(), onConfirm: (date) {
-                        setState(
+                    setState(
-                              () {
+                      () {
-                            bloodSugarDate = date;
+                        bloodSugarDate = date;
-                          },
-                        );
                       },
-                      currentTime: bloodSugarDate,
+                    );
-                      locale: projectViewModel.localeType);
+                  }, currentTime: bloodSugarDate, locale: projectViewModel.localeType);
                 },
                 child: Container(
                   padding: EdgeInsets.all(12),
                   width: double.infinity,
                   height: 65,
-                  decoration: BoxDecoration(
+                  decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
-                      borderRadius: BorderRadius.circular(12),
-                      color: Colors.white),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
@@ -213,30 +198,22 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
               ),
               InkWell(
                 onTap: () {
-                  DatePicker.showTimePicker(context, showTitleActions: true,
+                  DatePicker.showTimePicker(context, showTitleActions: true, onConfirm: (date) {
-                      onConfirm: (date) {
+                    setState(
-                        setState(
+                      () {
-                              () {
+                        timeSugarDate = date;
-                            timeSugarDate = date;
-                          },
-                        );
                       },
-                      currentTime: timeSugarDate,
+                    );
-                      locale: projectViewModel.localeType);
+                  }, currentTime: timeSugarDate, locale: projectViewModel.localeType);
                 },
                 child: Container(
                   padding: EdgeInsets.all(12),
                   width: double.infinity,
                   height: 65,
-                  decoration: BoxDecoration(
+                  decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
-                      borderRadius: BorderRadius.circular(12),
-                      color: Colors.white),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
+                    children: [Texts(TranslationBase.of(context).time), Texts(getTime())],
-                      Texts(TranslationBase.of(context).time),
-                      Texts(getTime())
-                    ],
                   ),
                 ),
               ),
@@ -254,23 +231,18 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
               loading: widget.model.state == ViewState.BusyLocal,
               label: TranslationBase.of(context).save.toUpperCase(),
               textColor: Colors.white,
-              color: isButtonDisabled
+              color: isButtonDisabled ? Colors.grey[900] : Colors.grey,
-                  ? Colors.grey[900]
-                  : Colors.grey,
               onTap: () async {
-                if (_bloodSystolicValueController.text.isNotEmpty &&
+                if (_bloodSystolicValueController.text.isNotEmpty && _bloodDiastolicValueController.text.isNotEmpty) {
-                    _bloodDiastolicValueController.text.isNotEmpty) {
                   GifLoaderDialogUtils.showMyDialog(context);
 
                   widget.model
                       .addORUpdateDiabtecResult(
                     isUpdate: widget.isUpdate,
                     bloodPressureDate:
-                    '${bloodSugarDate.year}-${bloodSugarDate.month}-${bloodSugarDate.day} ${timeSugarDate.hour}:${timeSugarDate.minute}:00',
+                        '${bloodSugarDate.year}-${bloodSugarDate.month}-${bloodSugarDate.day} ${timeSugarDate.hour}:${timeSugarDate.minute}:00',
-                    diastolicPressure:
+                    diastolicPressure: _bloodDiastolicValueController.text.toString(),
-                    _bloodDiastolicValueController.text.toString(),
+                    systolicePressure: _bloodSystolicValueController.text.toString(),
-                    systolicePressure:
-                    _bloodSystolicValueController.text.toString(),
                     measuredArm: measuredArm,
                   )
                       .then((value) {
@@ -318,7 +290,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
   }
 
   void validateForm() {
-    print("_bloodSystolicValueController "+_bloodSystolicValueController.text.length.toString());
+    print("_bloodSystolicValueController " + _bloodSystolicValueController.text.length.toString());
     if (measureTimeSelectedType != 'Left Arm' &&
         _bloodSystolicValueController.text.length > 0 &&
         _bloodDiastolicValueController.text.length > 0) {
@@ -348,5 +320,4 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
     //   });
     // }
   }
-
 }

lib/pages/medical/my_trackers/blood_pressure/BloodPressureMonthly.dart

@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
@@ -21,7 +22,7 @@ class BloodPressureMonthlyPage extends StatelessWidget {
     ProjectViewModel projectViewModel = Provider.of(context);
 
     return AppScaffold(
-      body: model.weighMonthTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),):ListView(
+      body: ListView(
         children: [
             Container(
               margin: EdgeInsets.only(top: 12, left: 8, right: 8),
@@ -29,8 +30,8 @@ class BloodPressureMonthlyPage extends StatelessWidget {
               child: MonthCurvedChartBloodPressure(
                 horizontalInterval: 20.0,
                 title: TranslationBase.of(context).bloodPressure,
-                timeSeries1: model.weighMonthTimeSeriesDataTop,
+                timeSeries1: model.weighMonthTimeSeriesDataTop.isEmpty?[TimeSeriesSales3(0,0.0)]:model.weighMonthTimeSeriesDataTop,
-                timeSeries2: model.weighMonthTimeSeriesDataLow,
+                timeSeries2: model.weighMonthTimeSeriesDataLow.isEmpty?[TimeSeriesSales3(0,0.0)]:model.weighMonthTimeSeriesDataLow,
                 indexes: model.weightWeekTimeSeriesDataLow.length ~/ 5.5,
               ),
             ),
@@ -47,7 +48,7 @@ class BloodPressureMonthlyPage extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                Table(
+                model.weighMonthTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),):Table(
                   border: TableBorder.symmetric(
                     inside: BorderSide(width: 2.0, color: Colors.grey[300]),
                   ),

lib/pages/medical/my_trackers/blood_pressure/BloodPressureYeaPage.dart

@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
@@ -18,7 +19,7 @@ class BloodPressureYearPage extends StatelessWidget {
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return AppScaffold(
-      body: model.weightYearTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),):ListView(
+      body:ListView(
         children: [
           Container(
             margin: EdgeInsets.only(top: 12, left: 8, right: 8),
@@ -26,8 +27,8 @@ class BloodPressureYearPage extends StatelessWidget {
             child: CurvedChartBloodPressure(
               horizontalInterval: 3.0,// model.weightWeekTimeSeriesDataLow.length==1 ?1 :20.0,
               title: TranslationBase.of(context).bloodPressure,
-              timeSeries1: model.weightYearTimeSeriesDataTop,
+              timeSeries1: model.weightYearTimeSeriesDataTop.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:model.weightYearTimeSeriesDataTop,
-              timeSeries2: model.weightYearTimeSeriesDataLow,
+              timeSeries2: model.weightYearTimeSeriesDataLow.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:model.weightYearTimeSeriesDataLow,
               indexes: model.weightWeekTimeSeriesDataLow.length ~/ 5.5,
             ),
           ),
@@ -44,7 +45,7 @@ class BloodPressureYearPage extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                Table(
+                model.weightYearTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),):Table(
                   border: TableBorder.symmetric(
                     inside: BorderSide(width: 2.0, color: Colors.grey[300]),
                   ),

lib/pages/medical/my_trackers/blood_pressure/bloodPressureWeeklyPage.dart

@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@@ -21,7 +22,7 @@ class BloodPressureWeeklyPage extends StatelessWidget {
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return AppScaffold(
-      body: model.weightWeekTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),): ListView(
+      body:  ListView(
         children: [
           Container(
             margin: EdgeInsets.only(top: 12, left: 8, right: 8),
@@ -29,8 +30,8 @@ class BloodPressureWeeklyPage extends StatelessWidget {
             child: CurvedChartBloodPressure(
               horizontalInterval:3.0,
               title: TranslationBase.of(context).bloodPressure,
-              timeSeries1: model.weightWeekTimeSeriesDataTop,
+              timeSeries1: model.weightWeekTimeSeriesDataTop.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:model.weightWeekTimeSeriesDataTop,
-              timeSeries2: model.weightWeekTimeSeriesDataLow,
+              timeSeries2: model.weightWeekTimeSeriesDataLow.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:model.weightWeekTimeSeriesDataLow,
               indexes: model.weightWeekTimeSeriesDataLow.length ~/ 5.5,
             ),
           ),
@@ -47,7 +48,7 @@ class BloodPressureWeeklyPage extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                Table(
+                model.weightWeekTimeSeriesDataTop.isEmpty? Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),): Table(
                   border: TableBorder.symmetric(
                     inside: BorderSide(width: 2.0, color: Colors.grey[300]),
                   ),

lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart

@@ -282,11 +282,11 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
               label: TranslationBase.of(context).save.toUpperCase(),
               textColor: Colors.white,
               color: isButtonDisabled ? Colors.grey[900] : Colors.grey,
-              onTap: () {
+              onTap: () async {
                 if (_bloodSugarValueController.text.isNotEmpty) {
                   if (widget.isUpdate) {
                     GifLoaderDialogUtils.showMyDialog(context);
-                    widget.bloodSugarViewMode
+                    await widget.bloodSugarViewMode
                         .updateDiabtecResult(
                         month: bloodSugarDate,
                         hour: timeSugarDate,
@@ -294,8 +294,8 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
                         measuredTime: measuredTime,
                         lineItemNo: widget.lineItemNo,
                         bloodSugerResult:
-                        _bloodSugarValueController.text.toString())
+                        _bloodSugarValueController.text.toString());
-                        .then((value) {
+
                       GifLoaderDialogUtils.hideDialog(context);
                       if (widget.bloodSugarViewMode.state ==
                           ViewState.ErrorLocal)
@@ -303,9 +303,10 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
                             message: widget.bloodSugarViewMode.error);
                       else
                         Navigator.pop(context);
-                    });
+
-                  } else
+                  } else {
-                    widget.bloodSugarViewMode
+                    GifLoaderDialogUtils.showMyDialog(context);
+                    await widget.bloodSugarViewMode
                         .addDiabtecResult(
                       diabtecUnit: measureUnitSelectedType,
                       measuredTime: measuredTime,
@@ -313,15 +314,17 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
                       _bloodSugarValueController.text.toString(),
                       bloodSugerDateChart:
                       '${bloodSugarDate.year}-${bloodSugarDate.month}-${bloodSugarDate.day} ${timeSugarDate.hour}:${timeSugarDate.minute}:00',
-                    )
+                    );
-                        .then((value) {
+
                       GifLoaderDialogUtils.hideDialog(context);
                       if (widget.bloodSugarViewMode.state == ViewState.Error)
                         AppToast.showErrorToast(
                             message: widget.bloodSugarViewMode.error);
                       else
                         Navigator.pop(context);
-                    });
+
+                  }
+
                 }
               }),
         ),

lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart

@@ -1,6 +1,7 @@
 import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart';
 import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/WeekChartDate.dart';
 import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/YearMonthlyChartDate.dart';
+import 'package:diplomaticquarterapp/core/viewModels/medical/blood_sugar_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/LineChartCurved.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/MonthLineChartCurved.dart';
@@ -17,25 +18,32 @@ import 'package:provider/provider.dart';
 
 class BloodMonthlyPage extends StatelessWidget {
   final List<DiabtecPatientResult> diabtecPatientResult;
-  final List<TimeSeriesSales3> timeSeriesData ;
+  final List<TimeSeriesSales3> timeSeriesData;
+  final BloodSugarViewMode bloodSugarViewMode;
 
-  const BloodMonthlyPage({Key key, this.diabtecPatientResult, this.timeSeriesData})
+
+  const BloodMonthlyPage(
+      {Key key, this.diabtecPatientResult, this.timeSeriesData, this.bloodSugarViewMode})
       : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return AppScaffold(
-      body: timeSeriesData.isEmpty?Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),): ListView(
+      baseViewModel: bloodSugarViewMode,
+      body: ListView(
         children: [
           Container(
+              margin: EdgeInsets.only(top: 12, left: 8, right: 8),
               width: double.maxFinite,
               color: Colors.white,
               child: MonthLineChartCurved(
-                title: 'Sugar',
+                title: '${TranslationBase.of(context).bloodSugar}',
-                timeSeries: timeSeriesData,
+                timeSeries: timeSeriesData.isEmpty
+                    ? [TimeSeriesSales3(0, 0.0)]
+                    : timeSeriesData,
                 indexes: timeSeriesData.length ~/ 5.5,
-              )
+              )),
-          ),
           SizedBox(
             height: 12,
           ),
@@ -49,12 +57,20 @@ class BloodMonthlyPage extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                Table(
+                timeSeriesData.isEmpty
-                  border: TableBorder.symmetric(
+                    ? Container(
-                    inside: BorderSide(width: 2.0, color: Colors.grey[300]),
+                        child: Center(
-                  ),
+                          child: Texts(
-                  children: fullData(context,projectViewModel),
+                              TranslationBase.of(context).noDataAvailable),
-                ),
+                        ),
+                      )
+                    : Table(
+                        border: TableBorder.symmetric(
+                          inside:
+                              BorderSide(width: 2.0, color: Colors.grey[300]),
+                        ),
+                        children: fullData(context, projectViewModel),
+                      ),
               ],
             ),
           )
@@ -63,7 +79,8 @@ class BloodMonthlyPage extends StatelessWidget {
     );
   }
 
-  List<TableRow> fullData(BuildContext context,ProjectViewModel projectViewModel) {
+  List<TableRow> fullData(
+      BuildContext context, ProjectViewModel projectViewModel) {
     List<TableRow> tableRow = [];
     tableRow.add(
       TableRow(
@@ -73,8 +90,12 @@ class BloodMonthlyPage extends StatelessWidget {
               decoration: BoxDecoration(
                 color: Theme.of(context).primaryColor,
                 borderRadius: BorderRadius.only(
-                  topLeft: projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
+                  topLeft: projectViewModel.isArabic
-                  topRight: projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0),
+                      ? Radius.circular(0.0)
+                      : Radius.circular(10.0),
+                  topRight: projectViewModel.isArabic
+                      ? Radius.circular(10.0)
+                      : Radius.circular(0.0),
                 ),
               ),
               child: Center(
@@ -120,8 +141,12 @@ class BloodMonthlyPage extends StatelessWidget {
                 decoration: BoxDecoration(
                   color: Theme.of(context).primaryColor,
                   borderRadius: BorderRadius.only(
-                    topLeft: projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0),
+                    topLeft: projectViewModel.isArabic
-                    topRight: projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
+                        ? Radius.circular(10.0)
+                        : Radius.circular(0.0),
+                    topRight: projectViewModel.isArabic
+                        ? Radius.circular(0.0)
+                        : Radius.circular(10.0),
                   ),
                 ),
                 child: Center(
@@ -133,7 +158,6 @@ class BloodMonthlyPage extends StatelessWidget {
                 ),
                 height: 40),
           ),
-
         ],
       ),
     );
@@ -149,7 +173,7 @@ class BloodMonthlyPage extends StatelessWidget {
                   color: Colors.white,
                   child: Center(
                     child: Texts(
-                      '${projectViewModel.isArabic ? DateUtil.getMonthDayYearDateFormattedAr(diabtec.dateChart):DateUtil.getMonthDayYearDateFormatted(diabtec.dateChart)} ',
+                      '${projectViewModel.isArabic ? DateUtil.getMonthDayYearDateFormattedAr(diabtec.dateChart) : DateUtil.getMonthDayYearDateFormatted(diabtec.dateChart)} ',
                       textAlign: TextAlign.center,
                       fontSize: 12,
                     ),

lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart

@@ -1,5 +1,6 @@
 import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart';
 import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/WeekChartDate.dart';
+import 'package:diplomaticquarterapp/core/viewModels/medical/blood_sugar_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/LineChartCurved.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
@@ -16,27 +17,24 @@ import 'package:provider/provider.dart';
 class BloodYearPage extends StatelessWidget {
   final List<DiabtecPatientResult> diabtecPatientResult;
   final List<TimeSeriesSales2> timeSeriesData;
+  final BloodSugarViewMode bloodSugarViewMode;
 
-  const BloodYearPage({Key key, this.diabtecPatientResult, this.timeSeriesData}) : super(key: key);
+  const BloodYearPage({Key key, this.diabtecPatientResult, this.timeSeriesData, this.bloodSugarViewMode}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return AppScaffold(
-      body: timeSeriesData.isEmpty
+      baseViewModel: bloodSugarViewMode,
-          ? Container(
+      body: ListView(
-              child: Center(
-                child: Texts(TranslationBase.of(context).noDataAvailable),
-              ),
-            )
-          : ListView(
               children: [
                 Container(
+                    margin: EdgeInsets.only(top: 12, left: 8, right: 8),
                     width: double.maxFinite,
                     color: Colors.white,
                     child: LineChartCurved(
-                      title: 'Sugar',
+                      title: '${TranslationBase.of(context).bloodSugar}',
-                      timeSeries: timeSeriesData,
+                      timeSeries: timeSeriesData.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:timeSeriesData,
                       indexes: timeSeriesData.length ~/ 5.5 ?? 0,
                     )),
                 SizedBox(
@@ -52,7 +50,13 @@ class BloodYearPage extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
-                      Table(
+                      timeSeriesData.isEmpty
+                          ? Container(
+                        child: Center(
+                          child: Texts(TranslationBase.of(context).noDataAvailable),
+                        ),
+                      )
+                          :Table(
                         border: TableBorder.symmetric(
                           inside: BorderSide(width: 2.0, color: Colors.grey[300]),
                         ),

lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart

@@ -75,7 +75,7 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage>
         ),],
         isShowAppBar: true,
         appBarTitle: TranslationBase.of(context).bloodSugar,
-        baseViewModel: model,
+        // baseViewModel: model,
         body: Scaffold(
           extendBodyBehindAppBar: true,
           appBar: TabBarWidget(tabController: _tabController,),
@@ -93,11 +93,12 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage>
                     ),
                     BloodMonthlyPage(
                       timeSeriesData: model.monthTimeSeriesData,
-                      diabtecPatientResult: model.monthDiabtecPatientResult,
+                      diabtecPatientResult: model.monthDiabtecPatientResult, bloodSugarViewMode: model,
                     ),
                     BloodYearPage(
                       timeSeriesData: model.yearTimeSeriesData,
                       diabtecPatientResult: model.yearDiabtecPatientResult,
+                      bloodSugarViewMode: model,
                     )
                   ],
                 ),

lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart

@@ -31,20 +31,15 @@ class BloodSugarWeeklyPage extends StatelessWidget {
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return AppScaffold(
-      body: timeSeriesData.isEmpty
+      baseViewModel: bloodSugarViewMode,
-          ? Container(
+      body:  ListView(
-              child: Center(
-                child: Texts(TranslationBase.of(context).noDataAvailable),
-              ),
-            )
-          : ListView(
               children: [
                 Container(
                   margin: EdgeInsets.only(top: 12, left: 8, right: 8),
                   color: Colors.white,
                   child: LineChartCurved(
-                    title: 'Sugar',
+                    title: '${TranslationBase.of(context).bloodSugar}',
-                    timeSeries: timeSeriesData,
+                    timeSeries: timeSeriesData.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:timeSeriesData,
                     indexes: timeSeriesData.length ~/ 5.5,
                   ),
                 ),
@@ -61,7 +56,13 @@ class BloodSugarWeeklyPage extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
-                      Table(
+                      timeSeriesData.isEmpty
+                          ? Container(
+                        child: Center(
+                          child: Texts(TranslationBase.of(context).noDataAvailable),
+                        ),
+                      )
+                          :Table(
                         border: TableBorder.symmetric(
                           inside: BorderSide(width: 2.0, color: Colors.grey[300]),
                         ),

lib/pages/medical/my_trackers/widget/LineChartCurved.dart

@@ -10,11 +10,7 @@ class LineChartCurved extends StatelessWidget {
   final int indexes;
   final double horizontalInterval;
 
-  LineChartCurved(
+  LineChartCurved({this.title, this.timeSeries, this.indexes, this.horizontalInterval = 20.0});
-      {this.title,
-      this.timeSeries,
-      this.indexes,
-      this.horizontalInterval = 20.0});
 
   List<int> xAxixs = List();
   List<double> yAxixs = List();
@@ -24,7 +20,7 @@ class LineChartCurved extends StatelessWidget {
     getXaxix();
     getYaxix();
     return AspectRatio(
-      aspectRatio: 1.1,
+      aspectRatio: 1.0,
       child: Container(
         decoration: const BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(18)),
@@ -40,8 +36,7 @@ class LineChartCurved extends StatelessWidget {
                 ),
                 Text(
                   title,
-                  style: TextStyle(
+                  style: TextStyle(color: Colors.black, fontSize: 15, letterSpacing: 2),
-                      color: Colors.black, fontSize: 15, letterSpacing: 2),
                   textAlign: TextAlign.center,
                 ),
                 SizedBox(
@@ -49,8 +44,7 @@ class LineChartCurved extends StatelessWidget {
                 ),
                 Expanded(
                   child: Padding(
-                    padding: const EdgeInsets.only(
+                    padding: const EdgeInsets.only(right: 18.0, left: 16.0, top: 15, bottom: 15),
-                        right: 18.0, left: 16.0, top: 15, bottom: 15),
                     child: LineChart(
                       sampleData1(context),
                       swapAnimationDuration: const Duration(milliseconds: 250),
@@ -97,10 +91,7 @@ class LineChartCurved extends StatelessWidget {
         handleBuiltInTouches: true,
       ),
       gridData: FlGridData(
-          horizontalInterval: horizontalInterval,
+          horizontalInterval: horizontalInterval, show: true, drawVerticalLine: true, drawHorizontalLine: true),
-          show: true,
-          drawVerticalLine: true,
-          drawHorizontalLine: true),
       titlesData: FlTitlesData(
         bottomTitles: SideTitles(
           showTitles: true,
@@ -137,12 +128,19 @@ class LineChartCurved extends StatelessWidget {
             fontSize: 10,
           ),
           getTitles: (value) {
-            if (value.toInt() == 0)
+            // if (value.toInt() == 0)
-              return '${value.toInt()}';
+            //   return '${value.toInt()}';
-            else if (value.toInt() % horizontalInterval == 0)
+            // else if (value.toInt() % horizontalInterval == 0)
-              return '${value.toInt()}';
+            //   return '${value.toInt()}';
-            else
+            // else
-              return '';
+            //   return '';
+
+            // if (value.toInt() == 0)
+            //   return '${value.toInt()}';
+            // else if (value.toInt() % horizontalInterval == 0)
+            //   return '${value.toInt()}';
+            // else
+              return '${value.toInt()}';//'${(value.toInt() +(horizontalInterval - value.toInt() % horizontalInterval) )}';
           },
           margin: 12,
         ),
@@ -196,6 +194,9 @@ class LineChartCurved extends StatelessWidget {
 
   List<LineChartBarData> getData(context) {
     List<FlSpot> spots = List();
+    if (timeSeries.length == 0) {
+      spots.add(FlSpot(0, 0));
+    }
     for (int index = 0; index < timeSeries.length; index++) {
       spots.add(FlSpot(index.toDouble(), timeSeries[index].sales));
     }

lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart

@@ -21,7 +21,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
   Widget build(BuildContext context) {
     getXaxix();
     return AspectRatio(
-      aspectRatio: 1.1,
+      aspectRatio: 1.0,
       child: Container(
         decoration: const BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(18)),
@@ -143,12 +143,12 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
             fontSize: 10,
           ),
           getTitles: (value) {
-            if (value.toInt() == 0)
+            // if (value.toInt() == 0)
+            //   return '${value.toInt()}';
+            // else if (value.toInt() % horizontalInterval == 0)
+            //   return '${value.toInt()}';
+            // else
               return '${value.toInt()}';
-            else if (value.toInt() % horizontalInterval == 0)
-              return '${value.toInt()}';
-            else
-              return '';
           },
           margin: 12,
         ),

lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart

@@ -10,11 +10,7 @@ class MonthLineChartCurved extends StatelessWidget {
   final int indexes;
   final double horizontalInterval;
 
-  MonthLineChartCurved(
+  MonthLineChartCurved({this.title, this.timeSeries, this.indexes, this.horizontalInterval = 15.0});
-      {this.title,
-      this.timeSeries,
-      this.indexes,
-      this.horizontalInterval = 15.0});
 
   List<int> xAxixs = List();
   List<double> yAxixs = List();
@@ -40,8 +36,7 @@ class MonthLineChartCurved extends StatelessWidget {
                 ),
                 Text(
                   title,
-                  style: TextStyle(
+                  style: TextStyle(color: Colors.black, fontSize: 15, letterSpacing: 2),
-                      color: Colors.black, fontSize: 15, letterSpacing: 2),
                   textAlign: TextAlign.center,
                 ),
                 SizedBox(
@@ -49,8 +44,7 @@ class MonthLineChartCurved extends StatelessWidget {
                 ),
                 Expanded(
                   child: Padding(
-                    padding: const EdgeInsets.only(
+                    padding: const EdgeInsets.only(right: 18.0, left: 16.0, top: 15, bottom: 15),
-                        right: 18.0, left: 16.0, top: 15, bottom: 15),
                     child: LineChart(
                       sampleData1(context),
                       swapAnimationDuration: const Duration(milliseconds: 250),
@@ -97,10 +91,7 @@ class MonthLineChartCurved extends StatelessWidget {
         handleBuiltInTouches: true,
       ),
       gridData: FlGridData(
-          horizontalInterval: horizontalInterval,
+          horizontalInterval: horizontalInterval, show: true, drawVerticalLine: true, drawHorizontalLine: true),
-          show: true,
-          drawVerticalLine: true,
-          drawHorizontalLine: true),
       titlesData: FlTitlesData(
         bottomTitles: SideTitles(
           showTitles: true,
@@ -180,6 +171,9 @@ class MonthLineChartCurved extends StatelessWidget {
 
   List<LineChartBarData> getData(context) {
     List<FlSpot> spots = List();
+    if (timeSeries.length == 0) {
+      spots.add(FlSpot(0, 0));
+    }
     for (int index = 0; index < timeSeries.length; index++) {
       spots.add(FlSpot(index.toDouble(), timeSeries[index].sales));
     }

lib/services/clinic_services/get_clinic_service.dart

@@ -35,8 +35,7 @@ class ClinicListService extends BaseService {
 
     dynamic localRes;
 
-    await baseAppClient.post(GET_CLINICS_LIST_URL,
+    await baseAppClient.post(GET_CLINICS_LIST_URL, onSuccess: (response, statusCode) async {
-        onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {
       throw error;
@@ -54,7 +53,7 @@ class ClinicListService extends BaseService {
       "VersionID": req.VersionID,
       "Channel": req.Channel,
       "generalid": 'Cs2020@2016\$2958',
-      "PatientOutSA": 0,
+      "PatientOutSA": user.outSA,
       "TokenID": "",
       "IsActiveAppointment": true,
       "DeviceTypeID": req.DeviceTypeID,
@@ -65,12 +64,11 @@ class ClinicListService extends BaseService {
 
     dynamic localRes;
 
-    await baseAppClient.post(GET_ACTIVE_APPOINTMENTS_LIST_URL,
+    await baseAppClient.post(GET_ACTIVE_APPOINTMENTS_LIST_URL, onSuccess: (response, statusCode) async {
-        onSuccess: (response, statusCode) async {
+      localRes = response;
-          localRes = response;
+    }, onFailure: (String error, int statusCode) {
-        }, onFailure: (String error, int statusCode) {
+      throw error;
-          throw error;
+    }, body: request);
-        }, body: request);
     return Future.value(localRes);
   }
 
@@ -92,8 +90,7 @@ class ClinicListService extends BaseService {
 
     dynamic localRes;
 
-    await baseAppClient.post(GET_PROJECTS_LIST,
+    await baseAppClient.post(GET_PROJECTS_LIST, onSuccess: (response, statusCode) async {
-        onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {
       throw error;
@@ -101,15 +98,12 @@ class ClinicListService extends BaseService {
     return Future.value(localRes);
   }
 
-  Future<Map> getChiefComplaintsList(
+  Future<Map> getChiefComplaintsList(int clinicID, int projectID, BuildContext context, {doctorId}) async {
-      int clinicID, int projectID, BuildContext context,
-      {doctorId}) async {
     //Utils.showProgressDialog(context);
     Map<String, dynamic> request;
 
     if (await this.sharedPref.getObject(USER_PROFILE) != null) {
-      var data = AuthenticatedUser.fromJson(
+      var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
-          await this.sharedPref.getObject(USER_PROFILE));
       authUser = data;
     }
 
@@ -137,8 +131,7 @@ class ClinicListService extends BaseService {
 
     dynamic localRes;
 
-    await baseAppClient.post(GET_DOCTORS_LIST_URL,
+    await baseAppClient.post(GET_DOCTORS_LIST_URL, onSuccess: (response, statusCode) async {
-        onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {
       throw error;
@@ -146,19 +139,15 @@ class ClinicListService extends BaseService {
     return Future.value(localRes);
   }
 
-  Future<Map> getChiefComplaintDoctorList(
+  Future<Map> getChiefComplaintDoctorList(int chiefComplaintID, int projectID, BuildContext context, {doctorId}) async {
-      int chiefComplaintID, int projectID, BuildContext context,
-      {doctorId}) async {
     Map<String, dynamic> request;
 
     if (await this.sharedPref.getObject(USER_PROFILE) != null) {
-      var data = AuthenticatedUser.fromJson(
+      var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
-          await this.sharedPref.getObject(USER_PROFILE));
       authUser = data;
     }
 
-    if (await this.sharedPref.getDouble(USER_LAT) != null &&
+    if (await this.sharedPref.getDouble(USER_LAT) != null && await this.sharedPref.getDouble(USER_LONG) != null) {
-        await this.sharedPref.getDouble(USER_LONG) != null) {
       lat = await this.sharedPref.getDouble(USER_LAT);
       long = await this.sharedPref.getDouble(USER_LONG);
     }
@@ -179,13 +168,12 @@ class ClinicListService extends BaseService {
       "Latitude": lat.toString(),
       "Longitude": long.toString(),
       "DeviceTypeID": req.DeviceTypeID,
-      "IsPublicRequest" : true
+      "IsPublicRequest": true
     };
 
     dynamic localRes;
 
-    await baseAppClient.post(GET_DENTAL_DOCTORS_LIST_URL,
+    await baseAppClient.post(GET_DENTAL_DOCTORS_LIST_URL, onSuccess: (response, statusCode) async {
-        onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {
       throw error;

lib/splashPage.dart

@@ -3,9 +3,12 @@ import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:firebase_analytics/observer.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
+import 'analytics/google-analytics.dart';
 import 'config/shared_pref_kay.dart';
 import 'config/size_config.dart';
 import 'core/service/AuthenticatedUserObject.dart';

lib/uitl/translations_delegate_base.dart

@@ -1159,6 +1159,8 @@ class TranslationBase {
   String get stretcher => localizedValues['stretcher'][locale.languageCode];
   String get none => localizedValues['none'][locale.languageCode];
   String get RRTSummary => localizedValues['RRT-Summary'][locale.languageCode];
+  String get RapidResponseTeam => localizedValues['Rapid-Response-Team'][locale.languageCode];
+  String get rrtService => localizedValues['rrtService'][locale.languageCode];
   String get billAmount => localizedValues['bill-amount'][locale.languageCode];
   String get transportMethod =>
       localizedValues['transport-method'][locale.languageCode];
@@ -1644,6 +1646,7 @@ class TranslationBase {
       localizedValues["upcoming-pay-options"][locale.languageCode];
   String get pleaseAcceptTerms =>
       localizedValues["please-accept-terms"][locale.languageCode];
+
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/uitl/utils.dart

@@ -61,10 +61,8 @@ class Utils {
 
   /// Check The Internet Connection
   static Future<bool> checkConnection() async {
-    ConnectivityResult connectivityResult =
+    ConnectivityResult connectivityResult = await (Connectivity().checkConnectivity());
-        await (Connectivity().checkConnectivity());
+    if ((connectivityResult == ConnectivityResult.mobile) || (connectivityResult == ConnectivityResult.wifi)) {
-    if ((connectivityResult == ConnectivityResult.mobile) ||
-        (connectivityResult == ConnectivityResult.wifi)) {
       return true;
     } else {
       return false;
@@ -128,19 +126,11 @@ class Utils {
   }
 
   static String getAppointmentTransID(int projectID, int clinicID, int appoNo) {
-    return projectID.toString() +
+    return projectID.toString() + '-' + clinicID.toString() + '-' + appoNo.toString();
-        '-' +
-        clinicID.toString() +
-        '-' +
-        appoNo.toString();
   }
 
   static String getAdvancePaymentTransID(int projectID, int fileNumber) {
-    return projectID.toString() +
+    return projectID.toString() + '-' + fileNumber.toString() + '-' + DateTime.now().millisecondsSinceEpoch.toString();
-        '-' +
-        fileNumber.toString() +
-        '-' +
-        DateTime.now().millisecondsSinceEpoch.toString();
   }
 
   bool validateIDBox(String value, type) {
@@ -151,7 +141,7 @@ class Utils {
   }
 
   String loginIDPattern(loginType) {
-    var length = loginType == 1 ? 10 : 7;
+    var length = loginType == 1 ? 10 : 6;
     return "([0-9]{" + length.toString() + "})";
   }
 
@@ -198,22 +188,14 @@ class Utils {
   }
 
   static validEmail(email) {
-    return RegExp(
+    return RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+").hasMatch(email);
-            r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+")
-        .hasMatch(email);
   }
 
-  static List<Widget> myMedicalList(
+  static List<Widget> myMedicalList({ProjectViewModel projectViewModel, BuildContext context, bool isLogin, count}) {
-      {ProjectViewModel projectViewModel,
-      BuildContext context,
-      bool isLogin,
-      count}) {
     List<Widget> medical = List();
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(5)
+      onTap: () => projectViewModel.havePrivilege(5) ? Navigator.push(context, FadePage(page: MyAppointments())) : null,
-          ? Navigator.push(context, FadePage(page: MyAppointments()))
-          : null,
       child: isLogin
           ? Stack(children: [
               MedicalProfileItem(
@@ -232,8 +214,7 @@ class Utils {
                   borderRadius: BorderRadius.circular(8),
                   badgeContent: Container(
                     padding: EdgeInsets.all(2.0),
-                    child: Text(count.toString(),
+                    child: Text(count.toString(), style: TextStyle(color: Colors.white, fontSize: 16.0)),
-                        style: TextStyle(color: Colors.white, fontSize: 16.0)),
                   ),
                 ),
               ),
@@ -246,7 +227,6 @@ class Utils {
               isEnable: projectViewModel.havePrivilege(5),
             ),
     ));
-
     if (projectViewModel.havePrivilege(10)) {
       medical.add(InkWell(
         onTap: () => Navigator.push(context, FadePage(page: LabsHomePage())),
@@ -259,9 +239,8 @@ class Utils {
     }
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(7)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: RadiologyHomePage()))
+          projectViewModel.havePrivilege(7) ? Navigator.push(context, FadePage(page: RadiologyHomePage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).radiology,
         imagePath: 'radiology_icon.png',
@@ -271,9 +250,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(12)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: HomePrescriptionsPage()))
+          projectViewModel.havePrivilege(12) ? Navigator.push(context, FadePage(page: HomePrescriptionsPage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).medicines,
         imagePath: 'prescription_icon.png',
@@ -298,9 +276,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(48)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: ActiveMedicationsPage()))
+          projectViewModel.havePrivilege(48) ? Navigator.push(context, FadePage(page: ActiveMedicationsPage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).myMedical,
         imagePath: 'active_medications.png',
@@ -326,9 +303,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(14)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: EyeMeasurementsPage()))
+          projectViewModel.havePrivilege(14) ? Navigator.push(context, FadePage(page: EyeMeasurementsPage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).eye,
         imagePath: 'eye_measurement_icon.png',
@@ -338,9 +314,7 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(22)
+      onTap: () => projectViewModel.havePrivilege(22) ? Navigator.push(context, FadePage(page: InsuranceCard())) : null,
-          ? Navigator.push(context, FadePage(page: InsuranceCard()))
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).insurance,
         imagePath: 'insurance_card_icon.png',
@@ -361,9 +335,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(18)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: InsuranceApproval()))
+          projectViewModel.havePrivilege(18) ? Navigator.push(context, FadePage(page: InsuranceApproval())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).insuranceApproval,
         imagePath: 'insurance_approvals_icon.png',
@@ -373,9 +346,7 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(23)
+      onTap: () => projectViewModel.havePrivilege(23) ? Navigator.push(context, FadePage(page: AllergiesPage())) : null,
-          ? Navigator.push(context, FadePage(page: AllergiesPage()))
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).allergies,
         imagePath: 'my_allergies_icon.png',
@@ -385,9 +356,7 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(26)
+      onTap: () => projectViewModel.havePrivilege(26) ? Navigator.push(context, FadePage(page: MyVaccines())) : null,
-          ? Navigator.push(context, FadePage(page: MyVaccines()))
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).myVaccines,
         imagePath: 'my_vaccines_icon.png',
@@ -397,9 +366,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(20)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: HomeReportPage()))
+          projectViewModel.havePrivilege(20) ? Navigator.push(context, FadePage(page: HomeReportPage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).medical,
         imagePath: 'medical_reports_icon.png',
@@ -409,9 +377,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(19)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: MonthlyReportsPage()))
+          projectViewModel.havePrivilege(19) ? Navigator.push(context, FadePage(page: MonthlyReportsPage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).monthly,
         imagePath: 'monthly_reports_icon.png',
@@ -421,9 +388,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(16)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: PatientSickLeavePage()))
+          projectViewModel.havePrivilege(16) ? Navigator.push(context, FadePage(page: PatientSickLeavePage())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).sick,
         imagePath: 'sick_leaves_icons.png',
@@ -433,9 +399,7 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(47)
+      onTap: () => projectViewModel.havePrivilege(47) ? Navigator.push(context, FadePage(page: MyBalancePage())) : null,
-          ? Navigator.push(context, FadePage(page: MyBalancePage()))
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).myBalance,
         imagePath: 'check-in.png',
@@ -453,9 +417,7 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(24)
+      onTap: () => projectViewModel.havePrivilege(24) ? Navigator.push(context, FadePage(page: MyTrackers())) : null,
-          ? Navigator.push(context, FadePage(page: MyTrackers()))
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).myTrackers,
         imagePath: 'my_tracker_icon.png',
@@ -465,9 +427,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(30)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: SmartWatchInstructions()))
+          projectViewModel.havePrivilege(30) ? Navigator.push(context, FadePage(page: SmartWatchInstructions())) : null,
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).smartWatches,
         imagePath: 'smartwatch_icon.png',
@@ -477,9 +438,8 @@ class Utils {
     ));
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(28)
+      onTap: () =>
-          ? Navigator.push(context, FadePage(page: AskDoctorHomPage()))
+          projectViewModel.havePrivilege(28) ? Navigator.push(context, FadePage(page: AskDoctorHomPage())) : null,
-          : null,
       child: MedicalProfileItem(
           title: TranslationBase.of(context).askYour,
           imagePath: 'ask_doctor_icon.png',
@@ -501,8 +461,7 @@ class Utils {
             } else {
               AlertDialogBox(
                   context: context,
-                  confirmMessage:
+                  confirmMessage: "Please login with your account first to use this feature",
-                      "Please login with your account first to use this feature",
                   okText: "OK",
                   okFunction: () {
                     AlertDialogBox.closeAlertDialog(context);
@@ -519,9 +478,7 @@ class Utils {
     }
 
     medical.add(InkWell(
-      onTap: () => projectViewModel.havePrivilege(40)
+      onTap: () => projectViewModel.havePrivilege(40) ? launch('whatsapp://send?phone=18885521858&text=') : null,
-          ? launch('whatsapp://send?phone=18885521858&text=')
-          : null,
       child: MedicalProfileItem(
         title: TranslationBase.of(context).chatbot,
         imagePath: 'insurance_approvals_icon.png',
@@ -533,14 +490,12 @@ class Utils {
     return medical;
   }
 
-  static Widget loadNetworkImage(
+  static Widget loadNetworkImage({@required String url, BoxFit fitting = BoxFit.cover}) {
-      {@required String url, BoxFit fitting = BoxFit.cover}) {
     return CachedNetworkImage(
         placeholderFadeInDuration: Duration(milliseconds: 250),
         fit: fitting,
         imageUrl: url,
-        placeholder: (context, url) =>
+        placeholder: (context, url) => Container(child: Center(child: CircularProgressIndicator())),
-            Container(child: Center(child: CircularProgressIndicator())),
         errorWidget: (context, url, error) {
           return Icon(
             Icons.error,
@@ -574,8 +529,7 @@ Widget applyShadow(
 }
 
 Future<AuthenticatedUser> userData() async {
-  var userData = AuthenticatedUser.fromJson(
+  var userData = AuthenticatedUser.fromJson(await AppSharedPreferences().getObject(MAIN_USER));
-      await AppSharedPreferences().getObject(MAIN_USER));
   return userData;
 }
 
@@ -589,17 +543,33 @@ extension IndexedIterable<E> on Iterable<E> {
 
 openAppStore({String androidPackageName, String iOSAppID}) async {
   if (Platform.isAndroid) {
-    assert(!(androidPackageName == null),
+    assert(!(androidPackageName == null), "Should have valid value in androidPackageName parameter");
-        "Should have valid value in androidPackageName parameter");
+    if ((await FlutterHmsGmsAvailability.isGmsAvailable)) launch("market://details?id=com.ejada.hmg");
-    if ((await FlutterHmsGmsAvailability.isGmsAvailable))
+    if ((await FlutterHmsGmsAvailability.isHmsAvailable)) launch("appmarket://details?id=com.ejada.hmg");
-      launch("market://details?id=com.ejada.hmg");
-    if ((await FlutterHmsGmsAvailability.isHmsAvailable))
-      launch("appmarket://details?id=com.ejada.hmg");
   } else if (Platform.isIOS) {
     assert((iOSAppID == null), "Should have valid value in iOSAppID parameter");
     launch("https://itunes.apple.com/kr/app/apple-store/$iOSAppID)");
   }
 }
+
+String labelFrom({@required String className}){
+  RegExp exp = RegExp(r'(?<=[a-z])[A-Z]');
+
+  String result = className.replaceAllMapped(exp, (m) {
+    var str = m.group(0);
+    if(str != null){
+      return ('_' + str);
+    }
+    return "";
+  });
+
+  if(result.isEmpty)
+    return className;
+
+  result = result.replaceAll("_", " ");
+  return result;
+}
+
 /*
   userBoard.asMap().map((i, element) => MapEntry(i, Stack(
   GestureDetector(onTap: () {

pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   # Localizations
   flutter_localizations:
     sdk: flutter
-  intl: ^0.16.1
+  intl: ^0.16.0
   # web view
   webview_flutter: ^0.3.24
   # http client
@@ -52,6 +52,7 @@ dependencies:
   shared_preferences: ^0.5.8
   flutter_flexible_toast: ^0.1.4
   firebase_messaging: ^7.0.3
+  firebase_analytics: ^6.3.0
   cloud_firestore: ^0.14.3
   android_intent: ^0.3.7+7
   # Progress bar