diff --git a/assets/images/new/app_setting.svg b/assets/images/new/app_setting.svg
new file mode 100644
index 00000000..d97a11ac
--- /dev/null
+++ b/assets/images/new/app_setting.svg
@@ -0,0 +1,17 @@
+
diff --git a/assets/images/new/ear.svg b/assets/images/new/ear.svg
new file mode 100644
index 00000000..c5146029
--- /dev/null
+++ b/assets/images/new/ear.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/family_files.svg b/assets/images/new/family_files.svg
new file mode 100644
index 00000000..ce3c5c84
--- /dev/null
+++ b/assets/images/new/family_files.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/head.svg b/assets/images/new/head.svg
new file mode 100644
index 00000000..50da3a8d
--- /dev/null
+++ b/assets/images/new/head.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/logo.svg b/assets/images/new/logo.svg
new file mode 100644
index 00000000..e777d9ee
--- /dev/null
+++ b/assets/images/new/logo.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/logout.svg b/assets/images/new/logout.svg
new file mode 100644
index 00000000..b767fbff
--- /dev/null
+++ b/assets/images/new/logout.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/notifications.svg b/assets/images/new/notifications.svg
new file mode 100644
index 00000000..5866a81b
--- /dev/null
+++ b/assets/images/new/notifications.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/strips.svg b/assets/images/new/strips.svg
new file mode 100644
index 00000000..d93430bc
--- /dev/null
+++ b/assets/images/new/strips.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/images/new/tooth.svg b/assets/images/new/tooth.svg
new file mode 100644
index 00000000..2b2e3430
--- /dev/null
+++ b/assets/images/new/tooth.svg
@@ -0,0 +1,3 @@
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index f8bca863..246b1e66 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -13,8 +13,8 @@ const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders';
-//const BASE_URL = 'https://uat.hmgwebservices.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
//const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -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 =
- 'Services/Patients.svc/REST/PatientER_GetDriverLocation';
+const DRIVER_LOCATION = '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 =
- "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
+const WIFI_CREDENTIALS = "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
///Doctor
-const GET_MY_DOCTOR =
- 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
+const GET_MY_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
const GET_DOCTOR_PROFILE = 'Services/Doctors.svc/REST/GetDocProfiles';
-const GET_DOCTOR_RATING_NOTES =
- 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
-const GET_DOCTOR_RATING_DETAILS =
- 'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
+const GET_DOCTOR_RATING_NOTES = 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
+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 =
- 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PRESCRIPTION_REPORT =
- 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
-const SEND_PRESCRIPTION_EMAIL =
- 'Services/Notifications.svc/REST/SendPrescriptionEmail';
-const GET_PRESCRIPTION_REPORT_ENH =
- 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
+const GET_PRESCRIPTIONS_ALL_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PRESCRIPTION_REPORT = 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
+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 =
- 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
-const SEND_LAB_RESULT_EMAIL =
- 'Services/Notifications.svc/REST/SendLabReportEmail';
-const GET_Patient_LAB_RESULT =
- 'Services/Patients.svc/REST/GetPatientLabResults';
-const GET_Patient_LAB_ORDERS_RESULT =
- 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
+const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
+const SEND_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail';
+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 =
- 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
+const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT = 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
-const GET_PATIENT_ORDERS_DETAILS =
- 'Services/Patients.svc/REST/Rad_UpdatePatientRadOrdersToRead';
+const GET_PATIENT_ORDERS_DETAILS = 'Services/Patients.svc/REST/Rad_UpdatePatientRadOrdersToRead';
const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
-const SEND_RAD_REPORT_EMAIL =
- 'Services/Notifications.svc/REST/SendRadReportEmail';
+const SEND_RAD_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendRadReportEmail';
///Feedback
const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList';
@@ -95,37 +79,26 @@ const GET_PATIENT_AppointmentHistory = 'Services'
'/Doctors.svc/REST/PateintHasAppoimentHistory';
///VITAL SIGN
-const GET_PATIENT_VITAL_SIGN =
- 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
+const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
///Er Nearest
-const GET_NEAREST_HOSPITAL =
- 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
+const GET_NEAREST_HOSPITAL = 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
///ED Online
-const ER_GET_VISUAL_TRIAGE_QUESTIONS =
- "services/Doctors.svc/REST/ER_GetVisualTriageQuestions";
-const ER_SAVE_TRIAGE_INFORMATION =
- "services/Doctors.svc/REST/ER_SaveTriageInformation";
-const ER_GetPatientPaymentInformationForERClinic =
- "services/Doctors.svc/REST/ER_GetPatientPaymentInformationForERClinic";
+const ER_GET_VISUAL_TRIAGE_QUESTIONS = "services/Doctors.svc/REST/ER_GetVisualTriageQuestions";
+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 =
- 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
-const GET_PATIENT_ALL_PRES_ORDERS =
- 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID =
- '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';
+const GET_AMBULANCE_REQUEST = 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
+const GET_PATIENT_ALL_PRES_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID = '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';
/// ER RRT
const GET_ALL_RC_TRANSPORTATION = 'rc/api/Transportation/getalltransportation';
-const GET_ALL_RRT_QUESTIONS =
- 'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions';
+const GET_ALL_RRT_QUESTIONS = 'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions';
///FindUs
const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';
@@ -134,15 +107,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 =
- 'Services/Community.svc/REST/GetBabyByUserID';
+const GET_BABYINFORMATION_REQUEST = '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 =
- 'Services/Community.svc/REST/GetUserInformation_New';
+const GET_USERINFORMATION_REQUEST = 'Services/Community.svc/REST/GetUserInformation_New';
///Update email
const UPDATE_PATENT_EMAIL = 'Services/Patients.svc/REST/UpdatePateintEmail';
@@ -164,29 +135,21 @@ const GET_TABLE_REQUEST = 'Services/Community.svc/REST/CreateVaccinationTable';
const GET_CITIES_REQUEST = 'Services/Lists.svc/REST/GetAllCities';
///BloodDetails
-const GET_BLOOD_REQUEST =
- 'services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails';
+const GET_BLOOD_REQUEST = 'services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails';
-const SAVE_BLOOD_REQUEST =
- 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
+const SAVE_BLOOD_REQUEST = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
-const GET_BLOOD_AGREEMENT =
- 'Services/PatientVarification.svc/REST/CheckUserAgreementForBloodDonation';
-const SAVE_BLOOD_AGREEMENT =
- 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
+const GET_BLOOD_AGREEMENT = 'Services/PatientVarification.svc/REST/CheckUserAgreementForBloodDonation';
+const SAVE_BLOOD_AGREEMENT = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
///Reports
const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo';
-const INSERT_REQUEST_FOR_MEDICAL_REPORT =
- 'Services/Doctors.svc/REST/InsertRequestForMedicalReport';
-const SEND_MEDICAL_REPORT_EMAIL =
- 'Services/Notifications.svc/REST/SendMedicalReportEmail';
+const INSERT_REQUEST_FOR_MEDICAL_REPORT = 'Services/Doctors.svc/REST/InsertRequestForMedicalReport';
+const SEND_MEDICAL_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendMedicalReportEmail';
///Rate
-const IS_LAST_APPOITMENT_RATED =
- 'Services/Doctors.svc/REST/IsLastAppoitmentRated';
-const GET_APPOINTMENT_DETAILS_BY_NO =
- 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
+const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated';
+const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
const GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID';
@@ -198,8 +161,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 =
- "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
+const GET_ACTIVE_APPOINTMENTS_LIST_URL = "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
//URL to get projects list
const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject';
@@ -208,118 +170,86 @@ 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 =
- "Services/Doctors.svc/REST/Dental_DoctorChiefComplaintMapping";
+const GET_DENTAL_DOCTORS_LIST_URL = "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 =
- "Services/Doctors.svc/REST/InsertSpecificAppointment";
+const INSERT_SPECIFIC_APPOINTMENT = "Services/Doctors.svc/REST/InsertSpecificAppointment";
//URL to get patient share
-const GET_PATIENT_SHARE =
- "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNO";
+const GET_PATIENT_SHARE = "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNO";
//URL to get patient appointment history
-const GET_PATIENT_APPOINTMENT_HISTORY =
- "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
+const GET_PATIENT_APPOINTMENT_HISTORY = "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
-const SEND_REPORT_EYE_EMAIL =
- "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
+const SEND_REPORT_EYE_EMAIL = "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
-const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL =
- "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
+const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL = "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
//URL to get patient appointment curfew history
-const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY =
- "Services/Doctors.svc/REST/AppoimentHistoryForCurfew";
+const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = "Services/Doctors.svc/REST/AppoimentHistoryForCurfew";
//URL to confirm appointment
-const CONFIRM_APPOINTMENT =
- "Services/MobileNotifications.svc/REST/ConfirmAppointment";
+const CONFIRM_APPOINTMENT = "Services/MobileNotifications.svc/REST/ConfirmAppointment";
-const INSERT_VIDA_REQUEST =
- "Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart";
+const INSERT_VIDA_REQUEST = "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 =
- "Services/Doctors.svc/REST/GenerateQRAppointmentNo";
+const GENERATE_QR_APPOINTMENT = "Services/Doctors.svc/REST/GenerateQRAppointmentNo";
//URL send email appointment QR
-const EMAIL_QR_APPOINTMENT =
- "Services/Notifications.svc/REST/sendEmailForOnLineCheckin";
+const EMAIL_QR_APPOINTMENT = "Services/Notifications.svc/REST/sendEmailForOnLineCheckin";
//URL check payment status
-const CHECK_PAYMENT_STATUS =
- "Services/PayFort_Serv.svc/REST/GetRequestStatusByRequestID";
+const CHECK_PAYMENT_STATUS = "Services/PayFort_Serv.svc/REST/GetRequestStatusByRequestID";
//URL create advance payment
const CREATE_ADVANCE_PAYMENT = "Services/Doctors.svc/REST/CreateAdvancePayment";
-const HIS_CREATE_ADVANCE_PAYMENT =
- "Services/Patients.svc/REST/HIS_CreateAdvancePayment";
+const HIS_CREATE_ADVANCE_PAYMENT = "Services/Patients.svc/REST/HIS_CreateAdvancePayment";
-const ADD_ADVANCE_NUMBER_REQUEST =
- 'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
+const ADD_ADVANCE_NUMBER_REQUEST = 'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
-const IS_ALLOW_ASK_DOCTOR =
- 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
-const GET_CALL_REQUEST_TYPE =
- 'Services/Doctors.svc/REST/GetCallRequestType_LOV';
-const ADD_VIDA_REQUEST =
- 'Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart';
+const IS_ALLOW_ASK_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
+const GET_CALL_REQUEST_TYPE = '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 =
- 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinics';
+const GET_LIVECARE_CLINICS = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinics';
-const GET_LIVECARE_SCHEDULE_CLINICS =
- 'Services/Doctors.svc/REST/PatientER_GetClinicsHaveSchedule';
+const GET_LIVECARE_SCHEDULE_CLINICS = 'Services/Doctors.svc/REST/PatientER_GetClinicsHaveSchedule';
-const GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST =
- 'Services/Doctors.svc/REST/PatientER_GetDoctorByClinicID';
+const GET_LIVECARE_SCHEDULE_CLINIC_DOCTOR_LIST = 'Services/Doctors.svc/REST/PatientER_GetDoctorByClinicID';
-const GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS =
- 'Services/Doctors.svc/REST/PatientER_GetDoctorFreeSlots';
+const GET_LIVECARE_SCHEDULE_DOCTOR_TIME_SLOTS = 'Services/Doctors.svc/REST/PatientER_GetDoctorFreeSlots';
-const INSERT_LIVECARE_SCHEDULE_APPOINTMENT =
- 'Services/Doctors.svc/REST/InsertSpecificAppoitmentForSchedule';
+const INSERT_LIVECARE_SCHEDULE_APPOINTMENT = 'Services/Doctors.svc/REST/InsertSpecificAppoitmentForSchedule';
-const GET_PATIENT_SHARE_LIVECARE =
- "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNOForLiveCare";
+const GET_PATIENT_SHARE_LIVECARE = "Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNOForLiveCare";
-const GET_LIVECARE_CLINIC_TIMING =
- 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinicsServiceTimingsSchedule';
+const GET_LIVECARE_CLINIC_TIMING = 'Services/ER_VirtualCall.svc/REST/PatientER_GetClinicsServiceTimingsSchedule';
-const GET_ER_APPOINTMENT_FEES =
- 'Services/DoctorApplication.svc/REST/GetERAppointmentFees';
+const GET_ER_APPOINTMENT_FEES = 'Services/DoctorApplication.svc/REST/GetERAppointmentFees';
const GET_ER_APPOINTMENT_TIME = 'Services/ER_VirtualCall.svc/REST/GetRestTime';
-const ADD_NEW_CALL_FOR_PATIENT_ER =
- 'Services/DoctorApplication.svc/REST/NewCallForPatientER';
+const ADD_NEW_CALL_FOR_PATIENT_ER = 'Services/DoctorApplication.svc/REST/NewCallForPatientER';
-const GET_LIVECARE_HISTORY =
- 'Services/ER_VirtualCall.svc/REST/GetPatientErVirtualHistory';
-const CANCEL_LIVECARE_REQUEST =
- 'Services/ER_VirtualCall.svc/REST/DeleteErRequest';
-const SEND_LIVECARE_INVOICE_EMAIL =
- 'Services/Notifications.svc/REST/SendInvoiceForLiveCare';
+const GET_LIVECARE_HISTORY = 'Services/ER_VirtualCall.svc/REST/GetPatientErVirtualHistory';
+const CANCEL_LIVECARE_REQUEST = '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 =
- 'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
+const UPDATE_HEALTH_TERMS = 'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
-const GET_PATIENT_HEALTH_STATS =
- 'Services/Patients.svc/REST/Med_GetTransactionsSts';
+const GET_PATIENT_HEALTH_STATS = 'Services/Patients.svc/REST/Med_GetTransactionsSts';
-const SEND_CHECK_IN_NFC_REQUEST =
- 'Services/Patients.svc/REST/Patient_CheckAppointmentValidation_ForNFC';
+const SEND_CHECK_IN_NFC_REQUEST = 'Services/Patients.svc/REST/Patient_CheckAppointmentValidation_ForNFC';
//URL to get medicine and pharmacies list
const CHANNEL = 3;
@@ -340,21 +270,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 =
- "Services/Patients.svc/REST/Get_PatientInsuranceDetails";
-const GET_PAtIENTS_INSURANCE_UPDATED =
- "Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
+const GET_PAtIENTS_INSURANCE = "Services/Patients.svc/REST/Get_PatientInsuranceDetails";
+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 =
- "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
-const UPLOAD_INSURANCE_CARD =
- 'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
+const GET_PATIENT_INSURANCE_DETAILS = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
+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 =
- "Services/Patients.svc/REST/GetApprovalStatus_DWH";
+const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus_DWH";
const SEARCH_BOT = 'HabibiChatBotApi/BotInterface/GetVoiceCommandResponse';
const GET_VACCINATIONS_ITEMS = "/Services/ERP.svc/REST/GET_VACCINATIONS_ITEMS";
@@ -364,84 +289,53 @@ const GET_PATIENT_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
const SendSickLeaveEmail = 'Services/Notifications.svc/REST/SendSickLeaveEmail';
-const GET_PATIENT_AdVANCE_BALANCE_AMOUNT =
- 'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount';
-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 =
- 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment';
-const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT =
- 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment';
+const GET_PATIENT_AdVANCE_BALANCE_AMOUNT = 'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount';
+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 = 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment';
+const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment';
-const GET_COVID_DRIVETHRU_PROJECT_LIST =
- 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
+const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
-const GET_COVID_DRIVETHRU_PAYMENT_INFO =
- 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
+const GET_COVID_DRIVETHRU_PAYMENT_INFO = 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
-const GET_COVID_DRIVETHRU_FREE_SLOTS =
- 'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
+const GET_COVID_DRIVETHRU_FREE_SLOTS = 'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
-const GET_COVID_DRIVETHRU_PROCEDURES_LIST =
- 'Services/Doctors.svc/REST/COVID19_GetTestProcedures';
+const GET_COVID_DRIVETHRU_PROCEDURES_LIST = 'Services/Doctors.svc/REST/COVID19_GetTestProcedures';
///Smartwatch Integration Services
-const GET_PATIENT_LAST_RECORD =
- 'Services/Patients.svc/REST/Med_GetPatientLastRecord';
+const GET_PATIENT_LAST_RECORD = 'Services/Patients.svc/REST/Med_GetPatientLastRecord';
///My Trackers
-const GET_DIABETIC_RESULT_AVERAGE =
- 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
-const GET_DIABTEC_RESULT =
- 'Services/Patients.svc/REST/Patient_GetDiabtecResults';
-const ADD_DIABTEC_RESULT =
- 'Services/Patients.svc/REST/Patient_AddDiabtecResult';
-
-const GET_BLOOD_PRESSURE_RESULT_AVERAGE =
- 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';
-const GET_BLOOD_PRESSURE_RESULT =
- 'Services/Patients.svc/REST/Patient_GetBloodPressureResult';
-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 =
- 'Services/Doctors.svc/REST/GetCallInfoHoursResult';
-const GET_CALL_REQUEST_TYPE_LOV =
- 'Services/Doctors.svc/REST/GetCallRequestType_LOV';
-
-const UPDATE_DIABETIC_RESULT =
- 'Services/Patients.svc/REST/Patient_UpdateDiabeticResult';
-
-const SEND_AVERAGE_BLOOD_SUGAR_REPORT =
- 'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
-const DEACTIVATE_DIABETIC_STATUS =
- 'services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
-const DEACTIVATE_BLOOD_PRESSURES_STATUS =
- 'services/Patients.svc/REST/Patient_DeactivateBloodPressureStatus';
-
-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_DIABETIC_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
+const GET_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_GetDiabtecResults';
+const ADD_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_AddDiabtecResult';
+
+const GET_BLOOD_PRESSURE_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';
+const GET_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_GetBloodPressureResult';
+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 = 'Services/Doctors.svc/REST/GetCallInfoHoursResult';
+const GET_CALL_REQUEST_TYPE_LOV = 'Services/Doctors.svc/REST/GetCallRequestType_LOV';
+
+const UPDATE_DIABETIC_RESULT = 'Services/Patients.svc/REST/Patient_UpdateDiabeticResult';
+
+const SEND_AVERAGE_BLOOD_SUGAR_REPORT = 'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
+const DEACTIVATE_DIABETIC_STATUS = 'services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
+const DEACTIVATE_BLOOD_PRESSURES_STATUS = 'services/Patients.svc/REST/Patient_DeactivateBloodPressureStatus';
+
+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';
@@ -449,35 +343,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 =
- "Services/H2ORemainder.svc/REST/H2O_GetUserProgress";
-const H2O_INSERT_USER_ACTIVITY =
- "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity";
-const H2O_GET_USER_DETAIL =
- "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";
+const H2O_GET_USER_PROGRESS = "Services/H2ORemainder.svc/REST/H2O_GetUserProgress";
+const H2O_INSERT_USER_ACTIVITY = "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity";
+const H2O_GET_USER_DETAIL = "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 =
- "Services/Patients.svc/REST/GetAllRelationshipTypes";
-const SEND_ACTIVATION_CODE_FOR_E_REFERRAL =
- 'Services/Authentication.svc/REST/SendActivationCodeForEReferral';
-const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL =
- 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral';
+const GET_ALL_RELATIONSHIP_TYPES = "Services/Patients.svc/REST/GetAllRelationshipTypes";
+const SEND_ACTIVATION_CODE_FOR_E_REFERRAL = '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 =
- 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderList';
+const GET_ANCILLARY_ORDERS = 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderList';
-const GET_ANCILLARY_ORDERS_DETAILS =
- 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderProcList';
+const GET_ANCILLARY_ORDERS_DETAILS = 'Services/Doctors.svc/REST/GetOnlineAncillaryOrderProcList';
//Pharmacy wishlist
// const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
@@ -509,50 +393,32 @@ 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 =
- "Services/Patients.svc/REST/GetLakumAccountInformation";
-const GET_LACUM_GROUP_INFORMATION =
- "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
-const LACUM_ACCOUNT_ACTIVATE =
- "Services/Patients.svc/REST/LakumAccountActivation";
-const LACUM_ACCOUNT_DEACTIVATE =
- "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 GET_LACUM_ACCOUNT_INFORMATION = "Services/Patients.svc/REST/GetLakumAccountInformation";
+const GET_LACUM_GROUP_INFORMATION = "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
+const LACUM_ACCOUNT_ACTIVATE = "Services/Patients.svc/REST/LakumAccountActivation";
+const LACUM_ACCOUNT_DEACTIVATE = "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 =
- "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
-const HHC_GET_ALL_CMC_SERVICES =
- "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
-const PATIENT_ER_UPDATE_PRES_ORDER =
- "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 HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
+const HHC_GET_ALL_CMC_SERVICES = "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
+const PATIENT_ER_UPDATE_PRES_ORDER = "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 =
- 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const PATIENT_ER_INSERT_PRES_ORDER =
- 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
+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 = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+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 =
- 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
-const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION =
- 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
+const BLOOD_DONATION_REGISTER_BLOOD_TYPE = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
+const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
//Pharmacy wishlist
const GET_WISHLIST = "shopping_cart_items/";
@@ -572,21 +438,17 @@ const GET_CUSTOMER_INFO = "VerifyCustomer";
//Pharmacy
-const GET_PHARMACY_CATEGORISE =
- 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
+const GET_PHARMACY_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
const GET_OFFERS_CATEGORISE = 'discountcategories';
const GET_OFFERS_PRODUCTS = 'offerproducts/';
-const GET_CATEGORISE_PARENT =
- 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_CATEGORISE_PARENT = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
const GET_PARENT_PRODUCTS = 'products?categoryid=';
-const GET_SUB_CATEGORISE =
- 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_SUB_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
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 =
- 'Services/Doctors.svc/REST/DP_GetDiseasesByClinicID';
+const GET_DISEASE_BY_CLINIC_ID = 'Services/Doctors.svc/REST/DP_GetDiseasesByClinicID';
const SEARCH_DOCTOR_BY_TIME = 'Services/Doctors.svc/REST/SearchDoctorsByTime';
const TIMER_MIN = 10;
@@ -602,8 +464,7 @@ const SCAN_QR_CODE = 'productbysku/';
const FILTERED_PRODUCTS = 'products?categoryids=';
-const GET_DOCTOR_LIST_CALCULATION =
- "Services/Doctors.svc/REST/GetCallculationDoctors";
+const GET_DOCTOR_LIST_CALCULATION = "Services/Doctors.svc/REST/GetCallculationDoctors";
class AppGlobal {
static var context;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index a910e2e5..616e7c44 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -993,6 +993,8 @@ const Map localizedValues = {
"disagree": {"en": "No, this is not the correct information", "ar": "غير موافق، هذه المعلومات غير الصحيحة"},
"expiry-date": {"en": "Expiry Date", "ar": "تاريخ انتهاء الصلاحية"},
"class": {"en": "Class", "ar": "فئة"},
+ "offersdiscount": {"en": "Offers \& Discounts", "ar": "العروض والخصومات"},
+ "explore": {"en": "Explore Now", "ar": "استكشف الآن"},
"approval": {"en": "Approval", "ar": "موافقة"},
"no-data": {"en": "No data found", "ar": "لاتوجد بيانات"},
"insurance-details": {"en": "Insurance Details", "ar": "تفاصيل التأمين"},
diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart
new file mode 100644
index 00000000..6d6d28c5
--- /dev/null
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@@ -0,0 +1,480 @@
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
+import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
+import 'package:diplomaticquarterapp/models/gradient_color.dart';
+import 'package:diplomaticquarterapp/models/hmg_services.dart';
+import 'package:diplomaticquarterapp/models/slider_data.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart';
+import 'package:diplomaticquarterapp/pages/landing/widgets/logged_slider_view.dart';
+import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart';
+import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart';
+import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
+import 'dart:math' as math;
+
+class HomePageFragment2 extends StatefulWidget {
+ Function onPharmacyClick, onLoginClick;
+
+ HomePageFragment2({this.onLoginClick, this.onPharmacyClick});
+
+ @override
+ _HomePageFragment2State createState() => _HomePageFragment2State();
+}
+
+class _HomePageFragment2State extends State {
+ ProjectViewModel projectViewModel;
+ List hmgServices = [];
+ List appoList = [];
+
+ @override
+ void initState() {
+ // TODO: implement initState
+ super.initState();
+
+ // getPatientAppointmentHistory1();
+ // getFamilyFiles();
+ }
+
+ initialiseHmgServices(bool isLogin) {
+ hmgServices.clear();
+ hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
+ hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin));
+ hmgServices.add(new HmgServices(2, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
+ hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
+ hmgServices.add(new HmgServices(4, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Refferal.svg", isLogin));
+ hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/RRT.svg", isLogin));
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ projectViewModel = Provider.of(context);
+ initialiseHmgServices(false);
+ var appoCountProvider = Provider.of(context);
+ List myMedicalList = Utils.myMedicalListHomePage(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel.isLogin);
+ return Container(
+ width: double.infinity,
+ child: Column(
+ children: [
+ projectViewModel.isLogin
+ ? AspectRatio(
+ aspectRatio: 2.5,
+ child: Padding(
+ padding: const EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6),
+ child: LoggedSliderView(
+ projectViewModel,
+ new SliderData(TranslationBase.of(context).fileno + ": " + projectViewModel.user.patientID.toString(), projectViewModel.user.firstName + ' ' + projectViewModel.user.lastName,
+ "", bannerColor[0].darkColor, bannerColor[0].lightColor)),
+ ),
+ )
+ : AspectRatio(
+ aspectRatio: 2.5,
+ child: Container(
+ margin: EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6),
+ child: SliderView(
+ onLoginClick: () {
+ widget.onLoginClick();
+ },
+ ),
+ // height: MediaQuery.of(context).size.width / 2.6,
+ ),
+ ),
+ projectViewModel.isLogin
+ ? Column(
+ children: [
+ Padding(
+ padding: projectViewModel.isArabic
+ ? EdgeInsets.only(
+ right: 20,
+ left: 8,
+ )
+ : EdgeInsets.only(
+ left: 20,
+ right: 8,
+ ),
+ child: Row(
+ children: [
+ Expanded(
+ child: Text(
+ TranslationBase.of(context).myMedicalFile,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 18,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ FlatButton(
+ onPressed: () {
+ navigateTo(context, MedicalProfilePageNew());
+ },
+ child: Text(
+ TranslationBase.of(context).viewMedicalFile,
+ style: TextStyle(
+ color: CustomColors.accentColor,
+ fontSize: 14,
+ decoration: TextDecoration.underline,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ mHeight(4),
+ Container(
+ width: double.infinity,
+ height: MediaQuery.of(context).size.width * 0.26,
+ child: ListView.separated(
+ itemCount: 4,
+ padding: EdgeInsets.zero,
+ scrollDirection: Axis.horizontal,
+ physics: BouncingScrollPhysics(),
+ itemBuilder: (context, index) {
+ return projectViewModel.isArabic
+ ? Container(
+ child: myMedicalList[index],
+ width: MediaQuery.of(context).size.width * 0.26,
+ height: MediaQuery.of(context).size.width * 0.26,
+ margin: EdgeInsets.only(left: index == 3 ? 20 : 0, right: index == 0 ? 20 : 0),
+ )
+ : Container(
+ child: myMedicalList[index],
+ width: MediaQuery.of(context).size.width * 0.26,
+ height: MediaQuery.of(context).size.width * 0.26,
+ margin: EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == 3 ? 20 : 0),
+ );
+ },
+ separatorBuilder: (BuildContext context, int index) {
+ return mWidth(12);
+ },
+ ),
+ ),
+ ],
+ )
+ : Container(),
+ mHeight(16),
+ Column(
+ children: [
+ Divider(
+ height: 1,
+ color: Color(0xFFC7C7C7),
+ ),
+ Container(
+ width: double.infinity,
+ height: MediaQuery.of(context).size.width * 0.3,
+ padding: EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 16),
+ color: Colors.white,
+ child: Row(
+ children: [
+ offersButton(),
+ mWidth(10),
+ hmgButton(),
+ ],
+ ),
+ ),
+ Divider(
+ height: 1,
+ color: Color(0xFFC7C7C7),
+ ),
+ ],
+ ),
+ mHeight(12),
+ Column(
+ children: [
+ Padding(
+ padding: const EdgeInsets.only(
+ left: 20,
+ right: 8,
+ ),
+ child: Row(
+ children: [
+ Expanded(
+ child: Text(
+ TranslationBase.of(context).hMGService,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 18,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ FlatButton(
+ onPressed: () {
+ Navigator.push(context, FadePage(page: AllHabibMedicalService()));
+ },
+ child: Text(
+ TranslationBase.of(context).viewAllServices,
+ style: TextStyle(
+ color: CustomColors.accentColor,
+ fontSize: 14,
+ decoration: TextDecoration.underline,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(
+ left: 20,
+ right: 20,
+ top: 4,
+ ),
+ child: GridView.builder(
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemCount: hmgServices.length,
+ padding: EdgeInsets.zero,
+ itemBuilder: (BuildContext context, int index) {
+ return ServicesView(hmgServices[index], index);
+ }),
+ ),
+ ],
+ ),
+ mHeight(140),
+ ],
+ ),
+ );
+ }
+
+ Widget offersButton() {
+ return Expanded(
+ flex: 1,
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ clipBehavior: Clip.antiAlias,
+ decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
+ child: Stack(
+ children: [
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ // color: Color(0xFF2B353E),
+ decoration: containerRadius(Color(0xFF2B353E), 20),
+ ),
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ clipBehavior: Clip.antiAlias,
+ decoration: projectViewModel.isArabic
+ ? containerBottomRightRadiusWithGradientForAr(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor)
+ : containerBottomRightRadiusWithGradient(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
+ child: Stack(
+ children: [
+ SvgPicture.asset(
+ "assets/images/new/strips.svg",
+ width: double.infinity,
+ height: double.infinity,
+ fit: BoxFit.cover,
+ ),
+ ],
+ ),
+ ),
+ projectViewModel.isArabic
+ ? Positioned(
+ right: -16,
+ top: 2,
+ child: Transform.rotate(
+ angle: math.pi / 4,
+ child: Container(
+ padding: EdgeInsets.only(left: 18, right: 18, top: 6, bottom: 3),
+ color: CustomColors.accentColor,
+ child: Text(
+ TranslationBase.of(context).newDes,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 9,
+ height: 0.8,
+ ),
+ ),
+ ),
+ ),
+ )
+ : Positioned(
+ left: -16,
+ top: 2,
+ child: Transform.rotate(
+ angle: -math.pi / 4,
+ child: Container(
+ padding: EdgeInsets.only(left: 18, right: 18, top: 6, bottom: 3),
+ color: CustomColors.accentColor,
+ child: Text(
+ TranslationBase.of(context).newDes,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 9,
+ ),
+ ),
+ ),
+ ),
+ ),
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ padding: EdgeInsets.only(left: projectViewModel.isArabic ? 20 : 25, right: projectViewModel.isArabic ? 25 : 20),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ TranslationBase.of(context).offersdiscount,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 14,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ Text(
+ TranslationBase.of(context).explore,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 10,
+ fontWeight: FontWeight.bold,
+ height: projectViewModel.isArabic ? 0.8 : 1,
+ ),
+ ),
+ mHeight(8),
+ Row(
+ children: [
+ showFloating("assets/images/new/ear.svg"),
+ mWidth(4),
+ showFloating("assets/images/new/head.svg"),
+ mWidth(4),
+ showFloating("assets/images/new/tooth.svg"),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ Widget hmgButton() {
+ return Expanded(
+ flex: 1,
+ child: InkWell(
+ onTap: () {
+ widget.onPharmacyClick();
+ },
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ clipBehavior: Clip.antiAlias,
+ decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
+ child: Stack(
+ children: [
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ // color: Color(0xFF2B353E),
+ decoration: containerRadius(Color(0xFF359846), 20),
+ ),
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ clipBehavior: Clip.antiAlias,
+ decoration: projectViewModel.isArabic
+ ? containerBottomRightRadiusWithGradientForAr(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor)
+ : containerBottomRightRadiusWithGradient(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
+ child: Stack(
+ children: [
+ SvgPicture.asset(
+ "assets/images/new/strips.svg",
+ width: double.infinity,
+ height: double.infinity,
+ fit: BoxFit.cover,
+ ),
+ ],
+ ),
+ ),
+ projectViewModel.isArabic
+ ? Positioned(
+ left: 20,
+ top: 12,
+ child: Opacity(
+ opacity: 0.1,
+ child: SvgPicture.asset(
+ "assets/images/new/Pharmacy.svg",
+ height: MediaQuery.of(context).size.width * 0.15,
+ ),
+ ),
+ )
+ : Positioned(
+ right: 20,
+ top: 12,
+ child: Opacity(
+ opacity: 0.1,
+ child: SvgPicture.asset(
+ "assets/images/new/Pharmacy.svg",
+ height: MediaQuery.of(context).size.width * 0.15,
+ ),
+ ),
+ ),
+ Container(
+ width: double.infinity,
+ height: double.infinity,
+ padding: EdgeInsets.all(16),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ SvgPicture.asset(
+ "assets/images/new/Pharmacy.svg",
+ height: MediaQuery.of(context).size.width * 0.065,
+ ),
+ mFlex(1),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ TranslationBase.of(context).HMGPharmacy,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 14,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ Text(
+ TranslationBase.of(context).ecommerceSolution,
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: 10,
+ fontWeight: FontWeight.bold,
+ height: projectViewModel.isArabic ? 0.2 : 1,
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget showFloating(String icon) {
+ return Container(
+ width: MediaQuery.of(context).size.width * 0.06,
+ height: MediaQuery.of(context).size.width * 0.06,
+ decoration: containerRadius(CustomColors.accentColor, 100),
+ padding: EdgeInsets.all(4),
+ child: SvgPicture.asset(icon),
+ );
+ }
+}
diff --git a/lib/pages/landing/home_page_2.dart b/lib/pages/landing/home_page_2.dart
index 1f37adca..491f2264 100644
--- a/lib/pages/landing/home_page_2.dart
+++ b/lib/pages/landing/home_page_2.dart
@@ -20,6 +20,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
+import 'fragments/home_page_fragment2.dart';
import 'landing_page_pharmcy.dart';
class HomePage2 extends StatefulWidget {
@@ -49,21 +50,29 @@ class _HomePageState2 extends State {
physics: BouncingScrollPhysics(),
child: Column(
children: [
- !model.isLogin
- ? HomePageFragment(
- onPharmacyClick: () {
- getPharmacyToken(model);
- },
- onLoginClick: () {
- widget.onLoginClick();
- },
- )
- : LoggedHomePageFragment(
- projectViewModel,
- onPharmacyClick: () {
- getPharmacyToken(model);
- },
- ),
+ // !model.isLogin
+ // ? HomePageFragment2(
+ // onPharmacyClick: () {
+ // getPharmacyToken(model);
+ // },
+ // onLoginClick: () {
+ // widget.onLoginClick();
+ // },
+ // )
+ // : LoggedHomePageFragment(
+ // projectViewModel,
+ // onPharmacyClick: () {
+ // getPharmacyToken(model);
+ // },
+ // ),
+ HomePageFragment2(
+ onLoginClick: () {
+ widget.onLoginClick();
+ },
+ onPharmacyClick: () {
+ getPharmacyToken(model);
+ },
+ )
],
),
),
diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index e90c36d2..e98636da 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -50,6 +50,7 @@ import 'home_page.dart';
class LandingPage extends StatefulWidget {
static LandingPage shared;
_LandingPageState state;
+
LandingPage() {
LandingPage.shared = this;
}
diff --git a/lib/pages/landing/widgets/slider_view.dart b/lib/pages/landing/widgets/slider_view.dart
index ab02ecf3..a50c1a39 100644
--- a/lib/pages/landing/widgets/slider_view.dart
+++ b/lib/pages/landing/widgets/slider_view.dart
@@ -19,7 +19,7 @@ class SliderView extends StatelessWidget {
return Card(
shape: cardRadius(20),
elevation: 0,
- margin: EdgeInsets.all(6),
+ margin: EdgeInsets.all(0),
child: Card(
shape: cardRadius(20),
clipBehavior: Clip.antiAlias,
diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart
index 6305528d..08f1f19b 100644
--- a/lib/theme/colors.dart
+++ b/lib/theme/colors.dart
@@ -13,5 +13,5 @@ class CustomColors {
static const Color lightGreyColor = Color(0xFFE2E2E2);
static const Color darkGreyColor = Color(0xFFC9C9C9);
static const Color pharmacyGreyColor = Color(0xFFDBDBDB);
- static const Color backgroudGreyColor = Color(0xFF7F7F7);
+ static const Color backgroudGreyColor = Color(0xFFEFEFEF);
}
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index 89609143..d25ce6cc 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -1719,6 +1719,8 @@ class TranslationBase {
String get continues => localizedValues["continue"][locale.languageCode];
String get skip => localizedValues["skip"][locale.languageCode];
+ String get offersdiscount => localizedValues["offersdiscount"][locale.languageCode];
+ String get explore => localizedValues["explore"][locale.languageCode];
String get calorieCalcDesc => localizedValues["calorieCalcDesc"][locale.languageCode];
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index c64058e0..63031263 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -15,14 +15,17 @@ import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -45,15 +48,12 @@ class _AppDrawerState extends State {
ProjectViewModel projectProvider;
var sharedPref = new AppSharedPreferences();
var familyFileProvider = FamilyFilesProvider();
- PharmacyModuleViewModel pharmacyModuleViewModel =
- locator();
+ PharmacyModuleViewModel pharmacyModuleViewModel = locator();
AuthenticatedUser user;
AuthenticatedUser mainUser;
- AuthenticatedUserObject authenticatedUserObject =
- locator();
+ AuthenticatedUserObject authenticatedUserObject = locator();
VitalSignService _vitalSignService = locator();
- AppointmentRateViewModel appointmentRateViewModel =
- locator();
+ AppointmentRateViewModel appointmentRateViewModel = locator();
ToDoCountProviderModel toDoProvider;
String booldType;
String notificationCount;
@@ -67,13 +67,11 @@ class _AppDrawerState extends State {
child: Container(
color: Colors.white,
child: Theme(
- data: Theme.of(context).copyWith(
- canvasColor: Theme.of(context).scaffoldBackgroundColor),
+ data: Theme.of(context).copyWith(canvasColor: Theme.of(context).scaffoldBackgroundColor),
child: Drawer(
child: Column(
children: [
Expanded(
- flex: 4,
child: ListView(
padding: EdgeInsets.zero,
children: [
@@ -84,71 +82,79 @@ class _AppDrawerState extends State {
child: Column(
children: [
Container(
- child: Image.asset(
- 'assets/images/logo_HMG.png'),
- margin: EdgeInsets.all(
- SizeConfig.imageSizeMultiplier * 4),
+ width: double.infinity,
+ padding: EdgeInsets.only(top: 12),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ SvgPicture.asset("assets/images/new/logo.svg"),
+ IconButton(
+ icon: Icon(Icons.clear),
+ onPressed: () {
+ Navigator.pop(context);
+ },
+ )
+ ],
+ ),
),
(user != null && projectProvider.isLogin)
? Padding(
padding: EdgeInsets.all(15),
- child: Column(
- mainAxisAlignment:
- MainAxisAlignment.start,
+ child: Column(mainAxisAlignment: MainAxisAlignment.start, children: [
+ Row(
children: [
- Row(
- children: [
- Padding(
- padding:
- EdgeInsets.only(
- right: 5),
- child: Icon(
- Icons.account_circle,
- color:
- Color(0xFF40ACC9),
- )),
- AppText(
- user.firstName +
- ' ' +
- user.lastName,
+ Padding(
+ padding: EdgeInsets.only(right: 5),
+ child: Icon(
+ Icons.account_circle,
color: Color(0xFF40ACC9),
- )
- ],
+ )),
+ AppText(
+ user.firstName + ' ' + user.lastName,
+ color: Color(0xFF40ACC9),
+ )
+ ],
+ ),
+ Row(children: [
+ Padding(
+ padding: EdgeInsets.only(left: 30, top: 5),
+ child: Column(
+ children: [
+ AppText(
+ TranslationBase.of(context).fileno + ": " + user.patientID.toString(),
+ color: Color(0xFF40ACC9),
+ fontSize: SizeConfig.textMultiplier * 1.5,
+ ),
+ AppText(
+ user.bloodGroup != null ? 'Blood Group: ' + user.bloodGroup : '',
+ fontSize: SizeConfig.textMultiplier * 1.5,
+ ),
+ ],
+ ))
+ ])
+ ]))
+ : Container(
+ width: double.infinity,
+ margin: EdgeInsets.only(top: 12),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ Text(
+ TranslationBase.of(context).cantSeeProfile,
+ style: TextStyle(
+ color: Colors.black,
+ fontWeight: FontWeight.bold,
+ fontSize: 18,
),
- Row(children: [
- Padding(
- padding: EdgeInsets.only(
- left: 30, top: 5),
- child: Column(
- children: [
- AppText(
- TranslationBase.of(
- context)
- .fileno +
- ": " +
- user.patientID
- .toString(),
- color: Color(
- 0xFF40ACC9),
- fontSize: SizeConfig
- .textMultiplier *
- 1.5,
- ),
- AppText(
- user.bloodGroup !=
- null
- ? 'Blood Group: ' +
- user.bloodGroup
- : '',
- fontSize: SizeConfig
- .textMultiplier *
- 1.5,
- ),
- ],
- ))
- ])
- ]))
- : SizedBox(),
+ ),
+ Text(
+ TranslationBase.of(context).loginRegisterNow,
+ style: TextStyle(color: Colors.black, fontSize: 14),
+ ),
+ ],
+ ),
+ ),
],
),
),
@@ -161,11 +167,9 @@ class _AppDrawerState extends State {
InkWell(
child: DrawerItem(
TranslationBase.of(context).arabicChange,
- Padding(
- child:
- Image.asset('assets/images/lang.png'),
- padding: EdgeInsets.all(3)),
+ Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.all(3)),
isImageIcon: true,
+ bottomLine: false,
),
onTap: () {
sharedPref.setBool(IS_ROBOT_INIT, null);
@@ -180,22 +184,13 @@ class _AppDrawerState extends State {
? Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
- (user.isFamily == null ||
- user.isFamily == false) &&
- projectProvider.havePrivilege(2)
+ (user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2)
? InkWell(
child: DrawerItem(
- TranslationBase.of(context)
- .family,
+ TranslationBase.of(context).family,
Icons.group,
- textColor: Theme.of(context)
- .textTheme
- .bodyText1
- .color,
- iconColor: Theme.of(context)
- .textTheme
- .bodyText1
- .color,
+ textColor: Theme.of(context).textTheme.bodyText1.color,
+ iconColor: Theme.of(context).textTheme.bodyText1.color,
bottomLine: false,
sideArrow: true,
),
@@ -209,21 +204,13 @@ class _AppDrawerState extends State {
: SizedBox(),
FutureBuilder(
future: getFamilyFiles(), // async work
- builder: (BuildContext context,
- AsyncSnapshot<
- GetAllSharedRecordsByStatusResponse>
- snapshot) {
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
switch (snapshot.connectionState) {
case ConnectionState.waiting:
- return Padding(
- padding: EdgeInsets.all(10),
- child: Text(''));
+ return Padding(padding: EdgeInsets.all(10), child: Text(''));
default:
if (snapshot.hasError)
- return Padding(
- padding: EdgeInsets.all(10),
- child:
- Text(snapshot.error));
+ return Padding(padding: EdgeInsets.all(10), child: Text(snapshot.error));
else
return Container(
decoration: BoxDecoration(
@@ -238,31 +225,20 @@ class _AppDrawerState extends State {
children: [
user.isFamily == true
? Container(
- padding: EdgeInsets
- .only(
- bottom:
- 5),
+ padding: EdgeInsets.only(bottom: 5),
child: InkWell(
onTap: () {
- switchUser(
- mainUser,
- context);
+ switchUser(mainUser, context);
},
child: Row(
- crossAxisAlignment:
- CrossAxisAlignment
- .start,
- children: <
- Widget>[
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
Expanded(
- child:
- Icon(Icons.person),
+ child: Icon(Icons.person),
),
Expanded(
- flex:
- 7,
- child:
- Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+ flex: 7,
+ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color),
AppText(
TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(),
@@ -273,32 +249,18 @@ class _AppDrawerState extends State {
)))
: SizedBox(),
Column(
- mainAxisAlignment:
- MainAxisAlignment
- .start,
- mainAxisSize:
- MainAxisSize
- .min,
- children: snapshot
- .data
- .getAllSharedRecordsByStatusList
- .map(
- (result) {
- return result
- .status ==
- 3
+ mainAxisAlignment: MainAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: snapshot.data.getAllSharedRecordsByStatusList.map((result) {
+ return result.status == 3
? Container(
- padding: EdgeInsets.only(
- bottom:
- 5),
+ padding: EdgeInsets.only(bottom: 5),
child: InkWell(
onTap: () {
- switchUser(result,
- context);
+ switchUser(result, context);
},
child: Row(
- crossAxisAlignment:
- CrossAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Icon(Icons.person, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
@@ -309,7 +271,8 @@ class _AppDrawerState extends State {
padding: EdgeInsets.only(left: 5, right: 5),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
- AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
+ AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(),
+ color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
]))),
],
)))
@@ -324,23 +287,17 @@ class _AppDrawerState extends State {
child: Stack(
children: [
DrawerItem(
- TranslationBase.of(context)
- .notification,
+ TranslationBase.of(context).notification,
Icons.notifications,
count: notificationCount != null
? new Container(
- padding:
- EdgeInsets.all(4),
+ padding: EdgeInsets.all(4),
margin: EdgeInsets.all(2),
- decoration:
- new BoxDecoration(
+ decoration: new BoxDecoration(
color: Colors.red,
- borderRadius:
- BorderRadius
- .circular(20),
+ borderRadius: BorderRadius.circular(20),
),
- constraints:
- BoxConstraints(
+ constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
@@ -348,14 +305,9 @@ class _AppDrawerState extends State {
notificationCount,
style: new TextStyle(
color: Colors.white,
- fontSize:
- projectProvider
- .isArabic
- ? 8
- : 9,
+ fontSize: projectProvider.isArabic ? 8 : 9,
),
- textAlign:
- TextAlign.center,
+ textAlign: TextAlign.center,
),
// ),
)
@@ -366,18 +318,12 @@ class _AppDrawerState extends State {
onTap: () {
//NotificationsPage
Navigator.of(context).pop();
- Navigator.push(
- context,
- FadePage(
- page: NotificationsPage()));
+ Navigator.push(context, FadePage(page: NotificationsPage()));
},
),
if (projectProvider.havePrivilege(3))
InkWell(
- child: DrawerItem(
- TranslationBase.of(context)
- .appsetting,
- Icons.settings_input_composite),
+ child: DrawerItem(TranslationBase.of(context).appsetting, Icons.settings_input_composite),
onTap: () {
Navigator.of(context).pushNamed(
SETTINGS,
@@ -385,23 +331,21 @@ class _AppDrawerState extends State {
},
),
InkWell(
- child: DrawerItem(
- TranslationBase.of(context).rateApp,
- Icons.star),
+ child: DrawerItem(TranslationBase.of(context).rateApp, Icons.star),
onTap: () {
if (Platform.isIOS) {
- launch(
- "https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978");
+ launch("https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978");
} else {
- launch(
- "https://play.google.com/store/apps/details?id=com.ejada.hmg&hl=en");
+ launch("https://play.google.com/store/apps/details?id=com.ejada.hmg&hl=en");
}
},
),
InkWell(
child: DrawerItem(
- TranslationBase.of(context).logout,
- Icons.lock_open),
+ TranslationBase.of(context).logout,
+ SvgPicture.asset("assets/images/new/logout.svg"),
+ isImageIcon: true,
+ ),
onTap: () {
logout();
},
@@ -410,9 +354,11 @@ class _AppDrawerState extends State {
)
: InkWell(
child: DrawerItem(
- TranslationBase.of(context)
- .loginregister,
- Icons.lock_open),
+ TranslationBase.of(context).loginregister,
+ SvgPicture.asset("assets/images/new/logout.svg"),
+ isImageIcon: true,
+ bottomLine: false,
+ ),
onTap: () {
login();
},
@@ -432,46 +378,31 @@ class _AppDrawerState extends State {
],
),
),
- Expanded(
- flex: 1,
- child: Column(
- children: [
- Container(
- child: Align(
- alignment: FractionalOffset.bottomCenter,
- child: Container(
- child: Row(
- mainAxisAlignment:
- MainAxisAlignment.spaceEvenly,
- children: [
- Column(
- children: [
- Text(TranslationBase.of(context)
- .poweredBy),
- Image.asset(
- 'assets/images/cs_logo_container.png',
- width:
- SizeConfig.imageSizeMultiplier * 30,
- )
- ],
- ),
- Column(
- children: [
- Image.asset(
- 'assets/images/new-design/vidamobile.png',
- width:
- SizeConfig.imageSizeMultiplier * 25,
- )
- ],
- ),
- ],
- ),
- ),
- ),
- )
- ],
- ),
- )
+ mHeight(12),
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ TranslationBase.of(context).poweredBy,
+ style: TextStyle(
+ color: Color(0xFF989898),
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ mWidth(2),
+ Text(
+ "Cloud Solutions",
+ style: TextStyle(
+ color: Colors.black,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ mWidth(16),
+ SvgPicture.asset("assets/images/new/cloud_logo.svg"),
+ ],
+ ),
+ mHeight(12),
],
),
),
@@ -485,11 +416,9 @@ class _AppDrawerState extends State {
checkUserData() async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
- var data = AuthenticatedUser.fromJson(
- await this.sharedPref.getObject(USER_PROFILE));
+ var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
- var data2 = AuthenticatedUser.fromJson(
- await this.sharedPref.getObject(MAIN_USER));
+ var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER));
setState(() {
this.user = data;
@@ -528,8 +457,7 @@ class _AppDrawerState extends State {
if (user != null) {
if (await sharedPref.getObject(FAMILY_FILE) != null) {
// print(await sharedPref.getObject(FAMILY_FILE));
- return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(
- await sharedPref.getObject(FAMILY_FILE)));
+ return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE)));
} else {
return familyFileProvider.getSharedRecordByStatus();
}
@@ -538,11 +466,7 @@ class _AppDrawerState extends State {
switchUser(user, context) {
GifLoaderDialogUtils.showMyDialog(context);
- this
- .familyFileProvider
- .silentLoggin(user is AuthenticatedUser ? null : user,
- mainUser: user is AuthenticatedUser)
- .then((value) {
+ this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) {
GifLoaderDialogUtils.hideDialog(context);
loginAfter(value, context);
}).catchError((err) {
@@ -555,8 +479,7 @@ class _AppDrawerState extends State {
loginAfter(result, context) async {
Utils.hideProgressDialog();
- Provider.of(context, listen: false)
- .setPrivilege(privilegeList: result, isLoginChild: true);
+ Provider.of(context, listen: false).setPrivilege(privilegeList: result, isLoginChild: true);
result = CheckActivationCode.fromJson(result);
var familyFile = await sharedPref.getObject(FAMILY_FILE);
@@ -576,13 +499,10 @@ class _AppDrawerState extends State {
this.sharedPref.setString(TOKEN, result.authenticationTokenID);
// Navigator.of(context).pop();
await authenticatedUserObject.getUser(getUser: true);
- Provider.of(context, listen: false).user =
- authenticatedUserObject.user;
- Provider.of(context, listen: false)
- .setUser(authenticatedUserObject.user);
+ Provider.of(context, listen: false).user = authenticatedUserObject.user;
+ Provider.of(context, listen: false).setUser(authenticatedUserObject.user);
await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
- if (pharmacyModuleViewModel.error.isNotEmpty)
- await pharmacyModuleViewModel.createUser();
+ if (pharmacyModuleViewModel.error.isNotEmpty) await pharmacyModuleViewModel.createUser();
});
appointmentRateViewModel