Merge pull request 'hot fixes' (#234) from changes into master

Reviewed-on: #234
master
khansultan1 16 hours ago
commit bc97bded62

@ -39,7 +39,6 @@
<uses-permission <uses-permission
android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"
tools:node="remove" /> tools:node="remove" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" />
<!-- Gallery/Photo permissions for Android 13+ (API 33+) --> <!-- Gallery/Photo permissions for Android 13+ (API 33+) -->
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
@ -52,7 +51,7 @@
<uses-permission <uses-permission
android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
tools:node="remove" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> tools:node="remove" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" /> <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 KiB

@ -69,7 +69,7 @@
"date": "التاريخ", "date": "التاريخ",
"time": "الوقت", "time": "الوقت",
"pendingPayment": "معلق للدفع", "pendingPayment": "معلق للدفع",
"payNow": "ادفع الآن", "payNow": "الدفع",
"viewQR": "عرض رمز الاستجابة السريعة", "viewQR": "عرض رمز الاستجابة السريعة",
"instruction": "تعليمات", "instruction": "تعليمات",
"livecare": "لايف كير", "livecare": "لايف كير",
@ -173,9 +173,9 @@
"emailSentError": "خطأ في إرسال البريد الإلكتروني", "emailSentError": "خطأ في إرسال البريد الإلكتروني",
"close": "إغلاق", "close": "إغلاق",
"closeIt": "أغلق", "closeIt": "أغلق",
"booked": "محجوز", "booked": "تم الحجز",
"confirmed": "مؤكد", "confirmed": "مؤكد",
"arrived": "وصل", "arrived": " تم الوصول",
"payNowBookSuccess": "ادفع الآن عبر تطبيق الحبيب", "payNowBookSuccess": "ادفع الآن عبر تطبيق الحبيب",
"payNowBookSuccesstext1": "ادفع الآن باستخدام خدمة الدفع عبر الإنترنت من بوابات الدفع الآمنة", "payNowBookSuccesstext1": "ادفع الآن باستخدام خدمة الدفع عبر الإنترنت من بوابات الدفع الآمنة",
"payNowBookSuccesstext2": "يمكنك أيضًا الدفع لاحقًا عبر الدفع الإلكتروني أو في المستشفى.", "payNowBookSuccesstext2": "يمكنك أيضًا الدفع لاحقًا عبر الدفع الإلكتروني أو في المستشفى.",
@ -276,7 +276,7 @@
"parkingDescription": "خدمة المواقف هي لك لمسح موقع السيارة حتى تتمكن من العثور عليها بسهولة عند مغادرتك. انقر على زر (مسح الموقف) لحفظ موقع الموقف، ثم سيظهر زر (عرض موقفي) لإظهار الطريق إلى الموقف. إذا كنت ترغب في إعادة مسح موقف السيارة QR فقط انقر على (مسح بياناتي).", "parkingDescription": "خدمة المواقف هي لك لمسح موقع السيارة حتى تتمكن من العثور عليها بسهولة عند مغادرتك. انقر على زر (مسح الموقف) لحفظ موقع الموقف، ثم سيظهر زر (عرض موقفي) لإظهار الطريق إلى الموقف. إذا كنت ترغب في إعادة مسح موقف السيارة QR فقط انقر على (مسح بياناتي).",
"appointments": "المواعيد", "appointments": "المواعيد",
"all2": "الكل", "all2": "الكل",
"checkinOption": "تسجيل الوصول", "checkinOption": "تسجيل الحضور",
"readBarcode": "قراءة الكود", "readBarcode": "قراءة الكود",
"showMyPark": "عرض الموقف", "showMyPark": "عرض الموقف",
"clearMyData": "امسح البيانات", "clearMyData": "امسح البيانات",
@ -298,7 +298,7 @@
"radiology": "الأشعة", "radiology": "الأشعة",
"radiologySubtitle": "النتيجة", "radiologySubtitle": "النتيجة",
"lab": "المختبر", "lab": "المختبر",
"labSubtitle": "النتائج", "labSubtitle": "نتائج",
"medicines": "الأدوية", "medicines": "الأدوية",
"medicinesSubtitle": "الوصفات", "medicinesSubtitle": "الوصفات",
"vitalSigns": "علامات حيوية", "vitalSigns": "علامات حيوية",
@ -314,9 +314,11 @@
"myMedicalSubtitle": "الأدوية", "myMedicalSubtitle": "الأدوية",
"myDoctor": "أطبائي", "myDoctor": "أطبائي",
"myDoctorSubtitle": "القائمة", "myDoctorSubtitle": "القائمة",
"myDoctorSubtitle2": "قائمة",
"eye": "العين", "eye": "العين",
"eyeSubtitle": "القياس", "eyeSubtitle": "القياس",
"insurance": "التأمين", "insurance": "التأمين",
"insurance2": "تأمين",
"insuranceSubtitle": "البطاقة", "insuranceSubtitle": "البطاقة",
"updateInsurance": "تحديث", "updateInsurance": "تحديث",
"updateInsuranceSubtitle": "التأمين", "updateInsuranceSubtitle": "التأمين",
@ -331,6 +333,7 @@
"monthly": "شهري", "monthly": "شهري",
"monthlySubtitle": "التقرير", "monthlySubtitle": "التقرير",
"sick": "مريض", "sick": "مريض",
"sick2": "المريضة",
"sickSubtitle": "الإجازات", "sickSubtitle": "الإجازات",
"myBalance": "رصيدي", "myBalance": "رصيدي",
"myBalanceSubtitle": "الرصيد", "myBalanceSubtitle": "الرصيد",
@ -493,9 +496,11 @@
"refferalTitle": "إحالة إلكترونية", "refferalTitle": "إحالة إلكترونية",
"refferalSubTitle": "الخدمة", "refferalSubTitle": "الخدمة",
"healthCare": "الرعاية الصحية", "healthCare": "الرعاية الصحية",
"emergency": "حالة طوارئ", "emergency": "طوارئ",
"emergency2": "الطوارئ",
"erservices": "خدمات الطوارئ", "erservices": "خدمات الطوارئ",
"services2": "الخدمات", "services2": "الخدمات",
"services3": "خدمات",
"cantSeeProfile": "لرؤية ملفك الطبي، يرجى تسجيل الدخول أو التسجيل الآن", "cantSeeProfile": "لرؤية ملفك الطبي، يرجى تسجيل الدخول أو التسجيل الآن",
"loginRegisterNow": "تسجيل الدخول أو التسجيل الآن", "loginRegisterNow": "تسجيل الدخول أو التسجيل الآن",
"hmgPharmacy": "صيدلية الحبيب", "hmgPharmacy": "صيدلية الحبيب",
@ -768,6 +773,7 @@
"erConsultation": "تتيح لك هذه الخدمة إجراء استشارة افتراضية عبر الإنترنت عبر مكالمة فيديو مباشرة مع الطبيب من أي مكان وفي أي وقت.", "erConsultation": "تتيح لك هذه الخدمة إجراء استشارة افتراضية عبر الإنترنت عبر مكالمة فيديو مباشرة مع الطبيب من أي مكان وفي أي وقت.",
"myInvoice": "القائمة", "myInvoice": "القائمة",
"invoiceList": "فواتيري", "invoiceList": "فواتيري",
"invoiceList2": "فواتيري",
"allInvoices": "كل الفواتير", "allInvoices": "كل الفواتير",
"hospitals": "المستشفيات", "hospitals": "المستشفيات",
"clinics": "العيادات", "clinics": "العيادات",
@ -891,7 +897,7 @@
"to": "إلى", "to": "إلى",
"startDate": "تاريخ البدء", "startDate": "تاريخ البدء",
"endDate": "تاريخ الانتهاء", "endDate": "تاريخ الانتهاء",
"walkin": "زيارة بدون موعد", "walkin": "بدون موعد",
"laserClinic": "عيادة الليزر", "laserClinic": "عيادة الليزر",
"continueString": "يكمل", "continueString": "يكمل",
"covid_info": "تجري مستشفيات د. سليمان الحبيب فحص فيروس كورونا المستجد وتصدر شهادات السفر على مدار الساعة، طوال أيام الأسبوع، وبسرعة ودقة عالية. يمكن للراغبين في الاستفادة من هذه الخدمة زيارة أحد فروع مستشفيات د. سليمان الحبيب وإجراء فحص كورونا خلال بضع دقائق والحصول على النتائج خلال عدة ساعات خدمة فحص فيروس كورونا Covid 19 بتقنية PCR للكشف عن الفيروس وفقاً لأعلى المعايير العالمية وبأحدث أجهزة RT-PCR عالية الدقة (GeneXpert الأمريكي وغيره)، وهي طرق معتمدة من قبل هيئة الغذاء والدواء وكذلك من قبل المركز السعودي للوقاية من الأمراض المُعدية", "covid_info": "تجري مستشفيات د. سليمان الحبيب فحص فيروس كورونا المستجد وتصدر شهادات السفر على مدار الساعة، طوال أيام الأسبوع، وبسرعة ودقة عالية. يمكن للراغبين في الاستفادة من هذه الخدمة زيارة أحد فروع مستشفيات د. سليمان الحبيب وإجراء فحص كورونا خلال بضع دقائق والحصول على النتائج خلال عدة ساعات خدمة فحص فيروس كورونا Covid 19 بتقنية PCR للكشف عن الفيروس وفقاً لأعلى المعايير العالمية وبأحدث أجهزة RT-PCR عالية الدقة (GeneXpert الأمريكي وغيره)، وهي طرق معتمدة من قبل هيئة الغذاء والدواء وكذلك من قبل المركز السعودي للوقاية من الأمراض المُعدية",
@ -934,7 +940,7 @@
"immediateConsultation": "استشارة فورية", "immediateConsultation": "استشارة فورية",
"scheduledConsultation": "استشارة مجدولة", "scheduledConsultation": "استشارة مجدولة",
"pharmaLiveCare": "لايف كير الصيدلية", "pharmaLiveCare": "لايف كير الصيدلية",
"notSureHelpMeChooseClinic": "غير متأكد؟ ساعدني في اختيار عيادة!", "notSureHelpMeChooseClinic": "هل تريد مساعدة في اختيار العياة؟",
"mentionYourSymptomsAndFindDoctors": "اذكر أعراضك واعثر على قائمة الأطباء وفقاً لذلك", "mentionYourSymptomsAndFindDoctors": "اذكر أعراضك واعثر على قائمة الأطباء وفقاً لذلك",
"immediateService": "خدمة فورية", "immediateService": "خدمة فورية",
"noNeedToWaitGetMedicalConsultation": "لا حاجة للانتظار، ستحصل على استشارة طبية فورية عبر مكالمة فيديو", "noNeedToWaitGetMedicalConsultation": "لا حاجة للانتظار، ستحصل على استشارة طبية فورية عبر مكالمة فيديو",
@ -998,7 +1004,7 @@
"processingCheckIn": "جاري معالجة تسجيل الحضور...", "processingCheckIn": "جاري معالجة تسجيل الحضور...",
"bookingWaitingAppointment": "جاري حجز موعد الانتظار، يرجى الانتظار...", "bookingWaitingAppointment": "جاري حجز موعد الانتظار، يرجى الانتظار...",
"enterValidIDorIqama": "يرجى إدخال رقم هوية وطنية أو رقم ملف صالح", "enterValidIDorIqama": "يرجى إدخال رقم هوية وطنية أو رقم ملف صالح",
"selectAppointment": "حدد الموعد", "selectAppointment": "اختر الموعد",
"rebookSameDoctor": "أعد الحجز مع نفس الطبيب", "rebookSameDoctor": "أعد الحجز مع نفس الطبيب",
"queueing": "قائمة الانتظار", "queueing": "قائمة الانتظار",
"inQueue": "في قائمة الانتظار", "inQueue": "في قائمة الانتظار",
@ -1294,7 +1300,7 @@
"rebook": "إعادة الحجز", "rebook": "إعادة الحجز",
"noOphthalmologyAppointments": "لم يتم العثور على أي مواعيد في قسم طب العيون...", "noOphthalmologyAppointments": "لم يتم العثور على أي مواعيد في قسم طب العيون...",
"noVitalSignsRecordedYet": "لا توجد علامات حيوية مسجلة بعد", "noVitalSignsRecordedYet": "لا توجد علامات حيوية مسجلة بعد",
"appointmentsAndVisits": "المواعيد والزيارات", "appointmentsAndVisits": "المواعيد",
"labAndRadiology": "المختبر والأشعة", "labAndRadiology": "المختبر والأشعة",
"activeMedicationsAndPrescriptions": "الوصفات الطبية", "activeMedicationsAndPrescriptions": "الوصفات الطبية",
"allPrescriptions": "جميع الوصفات", "allPrescriptions": "جميع الوصفات",
@ -1470,6 +1476,7 @@
"distanceDescription": "المسافة المقطوعة على مدار اليوم", "distanceDescription": "المسافة المقطوعة على مدار اليوم",
"overview": "نظرة عامة", "overview": "نظرة عامة",
"details": "التفاصيل", "details": "التفاصيل",
"details2": "تفاصيل",
"healthy": "صحي", "healthy": "صحي",
"warning": "تحذير", "warning": "تحذير",
"vitalSignDetails": "تفاصيل العلامات الحيوية", "vitalSignDetails": "تفاصيل العلامات الحيوية",

@ -69,7 +69,7 @@
"date": "Date", "date": "Date",
"time": "Time", "time": "Time",
"pendingPayment": "Pending for payment", "pendingPayment": "Pending for payment",
"payNow": "Pay Now", "payNow": "Payment",
"viewQR": "View QR Code", "viewQR": "View QR Code",
"instruction": "Instructions", "instruction": "Instructions",
"livecare": "LiveCare", "livecare": "LiveCare",
@ -311,6 +311,7 @@
"myMedicalSubtitle": "Medications", "myMedicalSubtitle": "Medications",
"myDoctor": "My Doctors", "myDoctor": "My Doctors",
"myDoctorSubtitle": "List", "myDoctorSubtitle": "List",
"myDoctorSubtitle2": "List",
"eye": "Eye", "eye": "Eye",
"eyeSubtitle": "Measurement", "eyeSubtitle": "Measurement",
"insurance": "Insurance", "insurance": "Insurance",
@ -328,6 +329,7 @@
"monthly": "Monthly", "monthly": "Monthly",
"monthlySubtitle": "Report", "monthlySubtitle": "Report",
"sick": "Sick", "sick": "Sick",
"sick2": "Sick",
"sickSubtitle": "Leaves", "sickSubtitle": "Leaves",
"myBalance": "My Balance", "myBalance": "My Balance",
"myBalanceSubtitle": "Credit", "myBalanceSubtitle": "Credit",
@ -485,8 +487,10 @@
"refferalSubTitle": "Service", "refferalSubTitle": "Service",
"healthCare": "Health Care", "healthCare": "Health Care",
"emergency": "Emergency", "emergency": "Emergency",
"emergency2": "Emergency",
"erservices": "Emergency", "erservices": "Emergency",
"services2": "Services", "services2": "Services",
"services3": "Services",
"cantSeeProfile": "To view your medical profile, please log in or register now", "cantSeeProfile": "To view your medical profile, please log in or register now",
"loginRegisterNow": "Login or Register Now", "loginRegisterNow": "Login or Register Now",
"hmgPharmacy": "HMG Pharmacy", "hmgPharmacy": "HMG Pharmacy",
@ -758,6 +762,7 @@
"erConsultation": "This service allows you to make an online virtual consultation via video call directly with the doctor from anywhere at any time.", "erConsultation": "This service allows you to make an online virtual consultation via video call directly with the doctor from anywhere at any time.",
"myInvoice": "List", "myInvoice": "List",
"invoiceList": "My Invoice", "invoiceList": "My Invoice",
"invoiceList2": "My Invoice",
"allInvoices": "All Invoices", "allInvoices": "All Invoices",
"hospitals": "Hospitals", "hospitals": "Hospitals",
"clinics": "Clinics", "clinics": "Clinics",
@ -1460,6 +1465,7 @@
"distanceDescription": "Distance covered throughout the day", "distanceDescription": "Distance covered throughout the day",
"overview": "Overview", "overview": "Overview",
"details": "Details", "details": "Details",
"details2": "Details",
"healthy": "Healthy", "healthy": "Healthy",
"warning": "Warning", "warning": "Warning",
"vitalSignDetails": "Vital Sign Details", "vitalSignDetails": "Vital Sign Details",

@ -205,6 +205,9 @@ class ApiConsts {
static String updateDiabeticResult = 'Services/Patients.svc/REST/Patient_UpdateDiabtecResult'; static String updateDiabeticResult = 'Services/Patients.svc/REST/Patient_UpdateDiabtecResult';
static String deactivateDiabeticStatus = 'Services/Patients.svc/REST/Patient_DeactivateDiabeticStatus'; static String deactivateDiabeticStatus = 'Services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
static String sendAverageBloodSugarReport = 'Services/Notifications.svc/REST/SendAverageBloodSugarReport'; static String sendAverageBloodSugarReport = 'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
static String averageBloodSugarReportDownload = 'Services/Notifications.svc/REST/SendAverageBloodSugarReportDownload';
static String averageWeightReportDownload = 'Services/Notifications.svc/REST/SendAverageBodyWeightReportDownload';
static String averageBloodPressureReportDownload = 'Services/Notifications.svc/REST/SendAverageBloodPressureReportDownload';
// Blood Pressure // Blood Pressure
static String getBloodPressureResultAverage = 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage'; static String getBloodPressureResultAverage = 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';

@ -402,6 +402,11 @@ class AppAssets {
static const String bmiFullBody = '$pngBasePath/bmi_image_1.png'; static const String bmiFullBody = '$pngBasePath/bmi_image_1.png';
static const String bmiFullBodyFemale = '$pngBasePath/female_bmi.png'; static const String bmiFullBodyFemale = '$pngBasePath/female_bmi.png';
static const String defaultMEP = '$pngBasePath/default_MEP.png'; static const String defaultMEP = '$pngBasePath/default_MEP.png';
static const String ambulance_section = '$pngBasePath/ambulance_section.png';
static const String rrt_section = '$pngBasePath/rrt_section.png';
} }
class AppAnimations { class AppAnimations {

@ -820,6 +820,28 @@ class Utils {
// return Image.asset(icon, width: width, height: height, fit: fit, ); // return Image.asset(icon, width: width, height: height, fit: fit, );
} }
static Widget buildImgWithAssetsWithBorderRadius({
required String icon,
Color? iconColor,
bool isDisabled = false,
double? width,
double? height,
BoxFit fit = BoxFit.cover,
double? border,
double? borderRadius,
}) {
final iconH = height ?? 24.h;
final iconW = width ?? 24.w;
return Container(
width: iconW, height: iconH,
decoration: BoxDecoration(
border: border != null ? Border.all(color: AppColors.whiteColor, width: border) : null,
borderRadius: borderRadius != null ? BorderRadius.circular(borderRadius ?? 12.r) : null,
image: DecorationImage(image: AssetImage(icon,), fit: fit)
),
);
}
/// Widget to build an SVG from network /// Widget to build an SVG from network
static Widget buildImgWithNetwork({ static Widget buildImgWithNetwork({
required String url, required String url,

@ -274,7 +274,6 @@ class EmergencyServicesViewModel extends ChangeNotifier {
void navigateTOAmbulancePage() { void navigateTOAmbulancePage() {
placeValueInController(); placeValueInController();
getProjects();
flushData(); flushData();
selectedFacility = FacilitySelection.ALL; selectedFacility = FacilitySelection.ALL;
@ -282,6 +281,7 @@ class EmergencyServicesViewModel extends ChangeNotifier {
locationUtils!.getLocation( locationUtils!.getLocation(
isShowConfirmDialog: true, isShowConfirmDialog: true,
onSuccess: (position) { onSuccess: (position) {
getProjects();
updateBottomSheetState(BottomSheetType.FIXED); updateBottomSheetState(BottomSheetType.FIXED);
navServices.push( navServices.push(
CustomPageRoute(page: CallAmbulancePage(), direction: AxisDirection.down), CustomPageRoute(page: CallAmbulancePage(), direction: AxisDirection.down),
@ -310,17 +310,21 @@ class EmergencyServicesViewModel extends ChangeNotifier {
} }
void updateBottomSheetState(BottomSheetType sheetType) { void updateBottomSheetState(BottomSheetType sheetType) {
if (sheetType == BottomSheetType.EXPANDED && selectedHospital == null) { // if (sheetType == BottomSheetType.EXPANDED && selectedHospital == null) {
dialogService.showErrorBottomSheet(message: LocaleKeys.selectHospital.tr()); // dialogService.showErrorBottomSheet(message: LocaleKeys.selectHospital.tr());
return; // return;
} // }
bottomSheetType = sheetType; bottomSheetType = sheetType;
if (sheetType == BottomSheetType.EXPANDED) { // if (sheetType == BottomSheetType.FIXED) {
clearAppointmentData(); // clearAppointmentData();
} // }
notifyListeners(); notifyListeners();
} }
void showError(String message) {
dialogService.showErrorBottomSheet(message: message);
}
void setIsGMSAvailable(bool value) { void setIsGMSAvailable(bool value) {
notifyListeners(); notifyListeners();
} }
@ -732,6 +736,10 @@ class EmergencyServicesViewModel extends ChangeNotifier {
} }
FutureOr<void> submitAmbulanceRequest(GeocodeResult? result, PlaceDetails? place, PlacePrediction? placePrediction) async { FutureOr<void> submitAmbulanceRequest(GeocodeResult? result, PlaceDetails? place, PlacePrediction? placePrediction) async {
if (false == haveAnAppointment && null == selectedHospital) {
dialogService.showErrorBottomSheet(message: LocaleKeys.selectHospital.tr());
return;
}
PatientER_RC request = createRequest(result, place, placePrediction); PatientER_RC request = createRequest(result, place, placePrediction);
navServices.push(CustomPageRoute(page: RequestingServicesPage())); navServices.push(CustomPageRoute(page: RequestingServicesPage()));
@ -802,19 +810,19 @@ class EmergencyServicesViewModel extends ChangeNotifier {
request.patientERTransportationMethod = selectedTransportOption; request.patientERTransportationMethod = selectedTransportOption;
transportationDetails.pickupUrgency = 1; transportationDetails.pickupUrgency = 1;
switch (callingPlace) { switch (callingPlace) {
case AmbulanceCallingPlace.FROM_HOSPITAL: case AmbulanceCallingPlace.TO_HOSPITAL:
transportationDetails.dropoffLatitude = selectedHospital!.latitude; transportationDetails.dropoffLatitude = selectedHospital?.latitude;
transportationDetails.dropoffLongitude = selectedHospital!.longitude; transportationDetails.dropoffLongitude = selectedHospital?.longitude;
transportationDetails.dropoffLocationName = selectedHospital!.name; transportationDetails.dropoffLocationName = selectedHospital?.name;
transportationDetails.pickupLatitude = ((result?.geometry.location.lat) ?? place?.lat)?.toStringAsFixed(6); transportationDetails.pickupLatitude = ((result?.geometry.location.lat) ?? place?.lat)?.toStringAsFixed(6);
transportationDetails.pickupLongitude = ((result?.geometry.location.lng) ?? place?.lng)?.toStringAsFixed(6); transportationDetails.pickupLongitude = ((result?.geometry.location.lng) ?? place?.lng)?.toStringAsFixed(6);
transportationDetails.pickupLocationName = result?.formattedAddress ?? placePrediction?.description; transportationDetails.pickupLocationName = result?.formattedAddress ?? placePrediction?.description;
transportationDetails.direction = 1; transportationDetails.direction = 1;
break; break;
case AmbulanceCallingPlace.TO_HOSPITAL: case AmbulanceCallingPlace.FROM_HOSPITAL:
transportationDetails.pickupLatitude = selectedHospital!.latitude; transportationDetails.pickupLatitude = selectedHospital?.latitude;
transportationDetails.pickupLongitude = selectedHospital!.longitude; transportationDetails.pickupLongitude = selectedHospital?.longitude;
transportationDetails.pickupLocationName = selectedHospital!.name; transportationDetails.pickupLocationName = selectedHospital?.name;
transportationDetails.dropoffLatitude = ((result?.geometry.location.lat) ?? place?.lat)?.toStringAsFixed(6); transportationDetails.dropoffLatitude = ((result?.geometry.location.lat) ?? place?.lat)?.toStringAsFixed(6);
transportationDetails.dropoffLongitude = ((result?.geometry.location.lng) ?? place?.lng)?.toStringAsFixed(6); transportationDetails.dropoffLongitude = ((result?.geometry.location.lng) ?? place?.lng)?.toStringAsFixed(6);
transportationDetails.dropoffLocationName = result?.formattedAddress ?? placePrediction?.description; transportationDetails.dropoffLocationName = result?.formattedAddress ?? placePrediction?.description;

@ -15,6 +15,9 @@ abstract class HealthTrackersRepo {
/// Get blood sugar results (week, month, year). /// Get blood sugar results (week, month, year).
Future<Either<Failure, GenericApiModel<dynamic>>> getDiabeticResults(); Future<Either<Failure, GenericApiModel<dynamic>>> getDiabeticResults();
Future<Either<Failure, GenericApiModel<String>>> downloadBloodSugarReport();
Future<Either<Failure, GenericApiModel<String>>> downloadWeightReport();
Future<Either<Failure, GenericApiModel<String>>> downloadBloodPressureReport();
/// Add new blood sugar result. /// Add new blood sugar result.
Future<Either<Failure, GenericApiModel<dynamic>>> addDiabeticResult({ Future<Either<Failure, GenericApiModel<dynamic>>> addDiabeticResult({
@ -211,6 +214,114 @@ class HealthTrackersRepoImp implements HealthTrackersRepo {
} }
} }
@override
Future<Either<Failure, GenericApiModel<String>>> downloadBloodSugarReport() async {
try {
GenericApiModel<String>? apiResponse;
Failure? failure;
await apiClient.post(
ApiConsts.averageBloodSugarReportDownload,
body: {},
onFailure: (error, statusCode, {messageStatus, failureType}) {
failure = failureType;
},
onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
try {
dynamic pdf = response['ReportPDFContent'];
apiResponse = GenericApiModel<String>(
messageStatus: messageStatus,
statusCode: statusCode,
errorMessage: errorMessage,
data: pdf,
);
} catch (e) {
failure = DataParsingFailure(e.toString());
}
},
);
if (failure != null) return Left(failure!);
if (apiResponse == null) return Left(ServerFailure("Unknown error"));
return Right(apiResponse!);
} catch (e) {
return Left(UnknownFailure(e.toString()));
}
}
@override
Future<Either<Failure, GenericApiModel<String>>> downloadWeightReport() async {
try {
GenericApiModel<String>? apiResponse;
Failure? failure;
await apiClient.post(
ApiConsts.averageWeightReportDownload,
body: {},
onFailure: (error, statusCode, {messageStatus, failureType}) {
failure = failureType;
},
onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
try {
dynamic pdf = response['ReportPDFContent'];
apiResponse = GenericApiModel<String>(
messageStatus: messageStatus,
statusCode: statusCode,
errorMessage: errorMessage,
data: pdf,
);
} catch (e) {
failure = DataParsingFailure(e.toString());
}
},
);
if (failure != null) return Left(failure!);
if (apiResponse == null) return Left(ServerFailure("Unknown error"));
return Right(apiResponse!);
} catch (e) {
return Left(UnknownFailure(e.toString()));
}
}
@override
Future<Either<Failure, GenericApiModel<String>>> downloadBloodPressureReport() async {
try {
GenericApiModel<String>? apiResponse;
Failure? failure;
await apiClient.post(
ApiConsts.averageBloodPressureReportDownload,
body: {},
onFailure: (error, statusCode, {messageStatus, failureType}) {
failure = failureType;
},
onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
try {
dynamic pdf = response['ReportPDFContent'];
apiResponse = GenericApiModel<String>(
messageStatus: messageStatus,
statusCode: statusCode,
errorMessage: errorMessage,
data: pdf,
);
} catch (e) {
failure = DataParsingFailure(e.toString());
}
},
);
if (failure != null) return Left(failure!);
if (apiResponse == null) return Left(ServerFailure("Unknown error"));
return Right(apiResponse!);
} catch (e) {
return Left(UnknownFailure(e.toString()));
}
}
@override @override
Future<Either<Failure, GenericApiModel<dynamic>>> addDiabeticResult({ Future<Either<Failure, GenericApiModel<dynamic>>> addDiabeticResult({
required String bloodSugarDateChart, required String bloodSugarDateChart,

@ -1,6 +1,8 @@
import 'dart:developer'; import 'dart:developer';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:hmg_patient_app_new/core/enums.dart';
import 'package:hmg_patient_app_new/features/health_trackers/health_trackers_repo.dart'; import 'package:hmg_patient_app_new/features/health_trackers/health_trackers_repo.dart';
import 'package:hmg_patient_app_new/features/health_trackers/models/blood_pressure/blood_pressure_result.dart'; import 'package:hmg_patient_app_new/features/health_trackers/models/blood_pressure/blood_pressure_result.dart';
import 'package:hmg_patient_app_new/features/health_trackers/models/blood_pressure/month_blood_pressure_result_average.dart'; import 'package:hmg_patient_app_new/features/health_trackers/models/blood_pressure/month_blood_pressure_result_average.dart';
@ -14,7 +16,9 @@ import 'package:hmg_patient_app_new/features/health_trackers/models/weight/month
import 'package:hmg_patient_app_new/features/health_trackers/models/weight/week_weight_measurement_result_average.dart'; import 'package:hmg_patient_app_new/features/health_trackers/models/weight/week_weight_measurement_result_average.dart';
import 'package:hmg_patient_app_new/features/health_trackers/models/weight/weight_measurement_result.dart'; import 'package:hmg_patient_app_new/features/health_trackers/models/weight/weight_measurement_result.dart';
import 'package:hmg_patient_app_new/features/health_trackers/models/weight/year_weight_measurement_result_average.dart'; import 'package:hmg_patient_app_new/features/health_trackers/models/weight/year_weight_measurement_result_average.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/services/error_handler_service.dart'; import 'package:hmg_patient_app_new/services/error_handler_service.dart';
import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
class HealthTrackersViewModel extends ChangeNotifier { class HealthTrackersViewModel extends ChangeNotifier {
HealthTrackersRepo healthTrackersRepo; HealthTrackersRepo healthTrackersRepo;
@ -425,6 +429,91 @@ class HealthTrackersViewModel extends ChangeNotifier {
} }
} }
Future<bool> downloadBloodSugerReport({
Function(String)? onSuccess,
}) async {
LoaderBottomSheet.showLoader(loadingText: LocaleKeys.generatingReport.tr());
try {
final result = await healthTrackersRepo.downloadBloodSugarReport();
LoaderBottomSheet.hideLoader();
bool success = false;
result.fold(
(failure) {
errorHandlerService.handleError(failure: failure);
},
(apiModel) {
success = true;
if (onSuccess != null) onSuccess(apiModel.data??"");
},
);
notifyListeners();
return success;
} catch (e) {
log('Error in sendWeightReportByEmail: $e');
return false;
}
}
Future<bool> downloadBloodPressureReport({
Function(String)? onSuccess,
}) async {
LoaderBottomSheet.showLoader(loadingText: LocaleKeys.generatingReport.tr());
try {
final result = await healthTrackersRepo.downloadBloodPressureReport();
LoaderBottomSheet.hideLoader();
bool success = false;
result.fold(
(failure) {
errorHandlerService.handleError(failure: failure);
},
(apiModel) {
success = true;
if (onSuccess != null) onSuccess(apiModel.data??"");
},
);
notifyListeners();
return success;
} catch (e) {
log('Error in sendWeightReportByEmail: $e');
return false;
}
}
Future<bool> downloadWeightReport({
Function(String)? onSuccess,
}) async {
LoaderBottomSheet.showLoader(loadingText: LocaleKeys.generatingReport.tr());
try {
final result = await healthTrackersRepo.downloadWeightReport();
LoaderBottomSheet.hideLoader();
bool success = false;
result.fold(
(failure) {
errorHandlerService.handleError(failure: failure);
},
(apiModel) {
success = true;
if (onSuccess != null) onSuccess(apiModel.data??"");
},
);
notifyListeners();
return success;
} catch (e) {
log('Error in sendWeightReportByEmail: $e');
return false;
}
}
// ==================== BLOOD PRESSURE TRACKING METHODS ==================== // ==================== BLOOD PRESSURE TRACKING METHODS ====================
/// Fetch blood pressure averages and results /// Fetch blood pressure averages and results
@ -1118,4 +1207,30 @@ class HealthTrackersViewModel extends ChangeNotifier {
diastolicController.dispose(); diastolicController.dispose();
super.dispose(); super.dispose();
} }
Future<void> downloadReport(HealthTrackerTypeEnum trackerType, {required Function(dynamic report) onSuccess}) async {
switch (trackerType) {
case HealthTrackerTypeEnum.bloodSugar:
await downloadBloodSugerReport(
onSuccess : (value){
onSuccess(value);
}
);
break;
case HealthTrackerTypeEnum.bloodPressure:
await downloadBloodPressureReport(
onSuccess : (value){
onSuccess(value);
}
);
break;
case HealthTrackerTypeEnum.weightTracker:
await downloadWeightReport(
onSuccess : (value){
onSuccess(value);
}
);
break;
}
}
} }

@ -39,6 +39,7 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
MyAppointmentsViewModel myAppointmentsViewModel; MyAppointmentsViewModel myAppointmentsViewModel;
List<GetLiveCareClinicListResponseModel> immediateLiveCareClinicsList = []; List<GetLiveCareClinicListResponseModel> immediateLiveCareClinicsList = [];
List<GetLiveCareClinicListResponseModel> mainLiveCareClinicList = [];
bool isImmediateLiveCareClinicsLoading = false; bool isImmediateLiveCareClinicsLoading = false;
int liveCareSelectedCallType = 0; // 1- Video, 2- Audio, 3- Phone int liveCareSelectedCallType = 0; // 1- Video, 2- Audio, 3- Phone
late GetLiveCareClinicListResponseModel immediateLiveCareSelectedClinic; late GetLiveCareClinicListResponseModel immediateLiveCareSelectedClinic;
@ -61,6 +62,7 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
initImmediateLiveCare() { initImmediateLiveCare() {
_appState = getIt<AppState>(); _appState = getIt<AppState>();
immediateLiveCareClinicsList = []; immediateLiveCareClinicsList = [];
mainLiveCareClinicList = [];
isImmediateLiveCareClinicsLoading = true; isImmediateLiveCareClinicsLoading = true;
liveCareSelectedCallType = 0; // 1- Video, 2- Audio, 3- Phone liveCareSelectedCallType = 0; // 1- Video, 2- Audio, 3- Phone
immediateLiveCareSelectedClinic = GetLiveCareClinicListResponseModel(); immediateLiveCareSelectedClinic = GetLiveCareClinicListResponseModel();
@ -90,9 +92,11 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
if (apiResponse.messageStatus == 2) { if (apiResponse.messageStatus == 2) {
// dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {}); // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
} else if (apiResponse.messageStatus == 1) { } else if (apiResponse.messageStatus == 1) {
immediateLiveCareClinicsList = apiResponse.data!; mainLiveCareClinicList = apiResponse.data!;
immediateLiveCareClinicsList.sort((a, b) => b.isOnline!.compareTo(a.isOnline!)); mainLiveCareClinicList.sort((a, b) => b.isOnline!.compareTo(a.isOnline!));
immediateLiveCareClinicsList.clear();
immediateLiveCareClinicsList.addAll(mainLiveCareClinicList);
isImmediateLiveCareClinicsLoading = false; isImmediateLiveCareClinicsLoading = false;
notifyListeners(); notifyListeners();
@ -103,6 +107,18 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
}, },
); );
} }
void filterClinic(String query){
if(query.isEmpty){
immediateLiveCareClinicsList.clear();
immediateLiveCareClinicsList.addAll(mainLiveCareClinicList);
}else{
// bool isArabic = getIt.get<AppState>().isArabic();
immediateLiveCareClinicsList = mainLiveCareClinicList.where((clinic) => clinic.serviceName!.toLowerCase().contains(query.toLowerCase()) || clinic.serviceNameN!.toLowerCase().contains(query.toLowerCase()
)).toList();
}
notifyListeners();
}
Future<void> getLiveCareImmediateAppointmentFees({Function(dynamic)? onSuccess, Function(String)? onError}) async { Future<void> getLiveCareImmediateAppointmentFees({Function(dynamic)? onSuccess, Function(String)? onError}) async {
final result = final result =

@ -315,9 +315,11 @@ abstract class LocaleKeys {
static const myMedicalSubtitle = 'myMedicalSubtitle'; static const myMedicalSubtitle = 'myMedicalSubtitle';
static const myDoctor = 'myDoctor'; static const myDoctor = 'myDoctor';
static const myDoctorSubtitle = 'myDoctorSubtitle'; static const myDoctorSubtitle = 'myDoctorSubtitle';
static const myDoctorSubtitle2 = 'myDoctorSubtitle2';
static const eye = 'eye'; static const eye = 'eye';
static const eyeSubtitle = 'eyeSubtitle'; static const eyeSubtitle = 'eyeSubtitle';
static const insurance = 'insurance'; static const insurance = 'insurance';
static const insurance2 = 'insurance2';
static const insuranceSubtitle = 'insuranceSubtitle'; static const insuranceSubtitle = 'insuranceSubtitle';
static const updateInsurance = 'updateInsurance'; static const updateInsurance = 'updateInsurance';
static const updateInsuranceSubtitle = 'updateInsuranceSubtitle'; static const updateInsuranceSubtitle = 'updateInsuranceSubtitle';
@ -332,6 +334,7 @@ abstract class LocaleKeys {
static const monthly = 'monthly'; static const monthly = 'monthly';
static const monthlySubtitle = 'monthlySubtitle'; static const monthlySubtitle = 'monthlySubtitle';
static const sick = 'sick'; static const sick = 'sick';
static const sick2 = 'sick2';
static const sickSubtitle = 'sickSubtitle'; static const sickSubtitle = 'sickSubtitle';
static const myBalance = 'myBalance'; static const myBalance = 'myBalance';
static const myBalanceSubtitle = 'myBalanceSubtitle'; static const myBalanceSubtitle = 'myBalanceSubtitle';
@ -495,8 +498,10 @@ abstract class LocaleKeys {
static const refferalSubTitle = 'refferalSubTitle'; static const refferalSubTitle = 'refferalSubTitle';
static const healthCare = 'healthCare'; static const healthCare = 'healthCare';
static const emergency = 'emergency'; static const emergency = 'emergency';
static const emergency2 = 'emergency2';
static const erservices = 'erservices'; static const erservices = 'erservices';
static const services2 = 'services2'; static const services2 = 'services2';
static const services3 = 'services3';
static const cantSeeProfile = 'cantSeeProfile'; static const cantSeeProfile = 'cantSeeProfile';
static const loginRegisterNow = 'loginRegisterNow'; static const loginRegisterNow = 'loginRegisterNow';
static const hmgPharmacy = 'hmgPharmacy'; static const hmgPharmacy = 'hmgPharmacy';
@ -767,6 +772,7 @@ abstract class LocaleKeys {
static const erConsultation = 'erConsultation'; static const erConsultation = 'erConsultation';
static const myInvoice = 'myInvoice'; static const myInvoice = 'myInvoice';
static const invoiceList = 'invoiceList'; static const invoiceList = 'invoiceList';
static const invoiceList2 = 'invoiceList2';
static const allInvoices = 'allInvoices'; static const allInvoices = 'allInvoices';
static const hospitals = 'hospitals'; static const hospitals = 'hospitals';
static const clinics = 'clinics'; static const clinics = 'clinics';
@ -1465,6 +1471,7 @@ abstract class LocaleKeys {
static const distanceDescription = 'distanceDescription'; static const distanceDescription = 'distanceDescription';
static const overview = 'overview'; static const overview = 'overview';
static const details = 'details'; static const details = 'details';
static const details2 = 'details2';
static const healthy = 'healthy'; static const healthy = 'healthy';
static const warning = 'warning'; static const warning = 'warning';
static const vitalSignDetails = 'vitalSignDetails'; static const vitalSignDetails = 'vitalSignDetails';

@ -3,6 +3,7 @@ import 'dart:async';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/app_state.dart';
import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
@ -22,6 +23,7 @@ import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/widge
import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:hmg_patient_app_new/widgets/input_widget.dart';
import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -68,6 +70,34 @@ class _SelectImmediateLiveCareClinicPageState extends State<SelectImmediateLiveC
child: Consumer<ImmediateLiveCareViewModel>(builder: (context, immediateLiveCareVM, child) { child: Consumer<ImmediateLiveCareViewModel>(builder: (context, immediateLiveCareVM, child) {
return Column( return Column(
children: [ children: [
TextInputWidget(
labelText: LocaleKeys.search.tr(context: context),
hintText: LocaleKeys.clinicName.tr(context: context),
controller: searchEditingController,
isEnable: true,
prefix: null,
autoFocus: false,
isBorderAllowed: false,
keyboardType: TextInputType.text,
focusNode: textFocusNode,
suffix: searchEditingController.text.isNotEmpty
? GestureDetector(
onTap: () {
searchEditingController.clear();
immediateLiveCareVM.filterClinic("");
textFocusNode.unfocus();
},
child: Utils.buildSvgWithAssets(icon: AppAssets.close_bottom_sheet_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown),
)
: null,
onChange: (value) {
immediateLiveCareVM.filterClinic(value!);
},
padding: EdgeInsets.symmetric(
vertical: ResponsiveExtension(10).h,
horizontal: ResponsiveExtension(15).h,
),
),
ListView.separated( ListView.separated(
padding: EdgeInsets.only(top: 16.h), padding: EdgeInsets.only(top: 16.h),
shrinkWrap: true, shrinkWrap: true,

@ -53,8 +53,8 @@ class CallAmbulancePage extends StatelessWidget {
ExpandableBottomSheet( ExpandableBottomSheet(
bottomSheetType: context.watch<EmergencyServicesViewModel>().bottomSheetType, bottomSheetType: context.watch<EmergencyServicesViewModel>().bottomSheetType,
children: { children: {
BottomSheetType.EXPANDED: ExpanedBottomSheet(context), BottomSheetType.EXPANDED: ExpandedBottomSheet(context),
BottomSheetType.FIXED: FixedBottomSheet(context), BottomSheetType.FIXED: pickUpDetailAndAppointementSection(context),
}, },
), ),
], ],
@ -92,7 +92,7 @@ class CallAmbulancePage extends StatelessWidget {
); );
} }
Widget FixedBottomSheet(BuildContext context) { Widget ExpandedBottomSheet(BuildContext context) {
return GestureDetector( return GestureDetector(
onVerticalDragUpdate: (details) { onVerticalDragUpdate: (details) {
// if(details.delta.dy<0){ // if(details.delta.dy<0){
@ -172,7 +172,11 @@ class CallAmbulancePage extends StatelessWidget {
CustomButton( CustomButton(
text: LocaleKeys.selectDetails.tr(context: context), text: LocaleKeys.selectDetails.tr(context: context),
onPressed: () { onPressed: () {
context.read<EmergencyServicesViewModel>().updateBottomSheetState(BottomSheetType.EXPANDED); LocationViewModel locationViewModel = context.read<LocationViewModel>();
GeocodeResponse? response = locationViewModel.geocodeResponse;
PlaceDetails? placeDetails = locationViewModel.placeDetails;
PlacePrediction? placePrediction = locationViewModel.selectedPrediction;
context.read<EmergencyServicesViewModel>().submitAmbulanceRequest(response?.results.first, placeDetails, placePrediction);
}) })
], ],
).paddingOnly(top: 24.h, bottom: 32.h, left: 24.h, right: 24.h), ).paddingOnly(top: 24.h, bottom: 32.h, left: 24.h, right: 24.h),
@ -185,7 +189,7 @@ class CallAmbulancePage extends StatelessWidget {
); );
} }
Widget ExpanedBottomSheet(BuildContext context) { Widget pickUpDetailAndAppointementSection(BuildContext context) {
return GestureDetector( return GestureDetector(
onVerticalDragUpdate: (details) { onVerticalDragUpdate: (details) {
if (details.delta.dy > 0) { if (details.delta.dy > 0) {
@ -324,28 +328,34 @@ class CallAmbulancePage extends StatelessWidget {
) )
], ],
), ),
if(AmbulanceCallingPlace.TO_HOSPITAL == context.read<EmergencyServicesViewModel>().callingPlace)
Row(
children: [
hospitalAndPickUpItemContent(
title: LocaleKeys.appointment.tr(context: context),
subTitle: LocaleKeys.haveAnyAppointment.tr(context: context),
leadingIcon: AppAssets.appointment_calendar_icon,
),
CustomSwitch(
value: context.watch<EmergencyServicesViewModel>().haveAnAppointment,
onChanged: (value) async {
// if (value) {
// openAppointmentList(context);
// }
await context.read<EmergencyServicesViewModel>().updateAppointment(value);
if (context.read<EmergencyServicesViewModel>().appointments?.isNotEmpty == true) {
openAppointmentList(context);
}
},
)
],
),
Row(
children: [ // Visibility(
hospitalAndPickUpItemContent( // visible: ,
title: LocaleKeys.appointment.tr(context: context), // child:
subTitle: LocaleKeys.haveAnyAppointment.tr(context: context), // ),
leadingIcon: AppAssets.appointment_calendar_icon,
),
CustomSwitch(
value: context.watch<EmergencyServicesViewModel>().haveAnAppointment,
onChanged: (value) async {
// if (value) {
// openAppointmentList(context);
// }
await context.read<EmergencyServicesViewModel>().updateAppointment(value);
if (context.read<EmergencyServicesViewModel>().appointments?.isNotEmpty == true) {
openAppointmentList(context);
}
},
)
],
),
], ],
).paddingAll(16.h), ).paddingAll(16.h),
); );
@ -460,12 +470,8 @@ class CallAmbulancePage extends StatelessWidget {
CustomButton( CustomButton(
text: LocaleKeys.submitRequest.tr(context: context), text: LocaleKeys.submitRequest.tr(context: context),
onPressed: () { onPressed: () {
LocationViewModel locationViewModel = context.read<LocationViewModel>(); context.read<EmergencyServicesViewModel>().updateBottomSheetState(BottomSheetType.EXPANDED);
GeocodeResponse? response = locationViewModel.geocodeResponse; })
PlaceDetails? placeDetails = locationViewModel.placeDetails;
PlacePrediction? placePrediction = locationViewModel.selectedPrediction;
context.read<EmergencyServicesViewModel>().submitAmbulanceRequest(response?.results.first, placeDetails, placePrediction);
})
], ],
).paddingOnly(top: 24.h, bottom: 12.h, left: 24.h, right: 24.h), ).paddingOnly(top: 24.h, bottom: 12.h, left: 24.h, right: 24.h),
), ),
@ -582,21 +588,24 @@ class CallAmbulancePage extends StatelessWidget {
} }
hospitalField(BuildContext context) { hospitalField(BuildContext context) {
return DecoratedBox( return Visibility(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.h), visible: false == context.watch<EmergencyServicesViewModel>().haveAnAppointment,
child: Row( child: DecoratedBox(
children: [ decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.h),
hospitalAndPickUpItemContent( child: Row(
title: LocaleKeys.selectHospital.tr(context: context), children: [
subTitle: context.read<EmergencyServicesViewModel>().getSelectedHospitalName() ?? LocaleKeys.selectHospital.tr(context: context), hospitalAndPickUpItemContent(
leadingIcon: AppAssets.hospital, title: LocaleKeys.selectHospital.tr(context: context),
), subTitle: context.read<EmergencyServicesViewModel>().getSelectedHospitalName() ?? LocaleKeys.selectHospital.tr(context: context),
Utils.buildSvgWithAssets(icon: AppAssets.down_cheveron, width: 24.h, height: 24.h).paddingAll(16.h) leadingIcon: AppAssets.hospital,
], ),
).onPress(() { Utils.buildSvgWithAssets(icon: AppAssets.down_cheveron, width: 24.h, height: 24.h).paddingAll(16.h)
showHospitalBottomSheet(context); ],
}).paddingSymmetrical( ).onPress(() {
10.w, 12.h), showHospitalBottomSheet(context);
}).paddingSymmetrical(
10.w, 12.h),
),
); );
} }

@ -73,7 +73,10 @@ class TrackingScreen extends StatelessWidget {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
animationSection(), Padding(
padding: EdgeInsetsDirectional.only(top:16.h,start: 16.w,end: 16.w ),
child: animationSection(context),
),
Column( Column(
spacing: 16.h, spacing: 16.h,
children: [orderStatus(context), orderTrackingId(context), contactSection()], children: [orderStatus(context), orderTrackingId(context), contactSection()],
@ -83,12 +86,12 @@ class TrackingScreen extends StatelessWidget {
); );
} }
animationSection() { animationSection(BuildContext context) {
switch (state) { switch (state) {
case OrderTrackingState.waitingForCall: case OrderTrackingState.waitingForCall:
case OrderTrackingState.dispactched: case OrderTrackingState.dispactched:
case OrderTrackingState.returning: case OrderTrackingState.returning:
return Lottie.asset(AppAnimations.ambulance, repeat: true, reverse: false, width: 260.h, height: 200.h); return showImage(order != null ? AppAssets.ambulance_section : AppAssets.rrt_section, context);
case OrderTrackingState.ended: case OrderTrackingState.ended:
return Lottie.asset(AppAnimations.checkmark, repeat: true, width: 260.h, height: 200.h); return Lottie.asset(AppAnimations.checkmark, repeat: true, width: 260.h, height: 200.h);
case OrderTrackingState.failed: case OrderTrackingState.failed:
@ -489,6 +492,18 @@ class TrackingScreen extends StatelessWidget {
); );
} }
showImage(String imageUrl, BuildContext context) {
return Utils.buildImgWithAssetsWithBorderRadius(
icon: imageUrl,
iconColor: Colors.transparent,
width: MediaQuery.sizeOf(context).width,
height: 380.h,
borderRadius: 24.r,
border: 1.r/// did this as the function that is being called is wrongly coupled with the border radius and border, and in some cases like the ambulance and rrt section we don't need any
/// border or border radius
);
}
// Widget rrtOrderData() { // Widget rrtOrderData() {
// return Row( // return Row(
// spacing: 8.h, // spacing: 8.h,

@ -27,6 +27,7 @@ import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:hmg_patient_app_new/widgets/graph/custom_graph.dart'; import 'package:hmg_patient_app_new/widgets/graph/custom_graph.dart';
import 'package:hmg_patient_app_new/widgets/input_widget.dart'; import 'package:hmg_patient_app_new/widgets/input_widget.dart';
import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
import 'package:open_filex/open_filex.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:shimmer/shimmer.dart'; import 'package:shimmer/shimmer.dart';
@ -1250,7 +1251,32 @@ class _HealthTrackerDetailPageState extends State<HealthTrackerDetailPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.bgScaffoldColor, backgroundColor: AppColors.bgScaffoldColor,
body: CollapsingListView( body: CollapsingListView(
sendEmail: () async => onSendEmailPressed(context), downloadReport: () async {
await context.read<HealthTrackersViewModel>().downloadReport(widget.trackerType,
onSuccess: (report) async {
if (report.isEmpty) {}
String path = await Utils.createFileFromString(report, "pdf");
try {
OpenFilex.open(path);
} catch (ex) {
showCommonBottomSheetWithoutHeight(
context,
child: Utils.getErrorWidget(loadingText: "Cannot open file"),
callBackFunc: () {},
isFullScreen: false,
isCloseButtonVisible: true,
);
}
});
// .downloadBloodSugerReport();
},
title: _getPageTitle(), title: _getPageTitle(),
bottomChild: Consumer<HealthTrackersViewModel>( bottomChild: Consumer<HealthTrackersViewModel>(
builder: (context, viewModel, child) { builder: (context, viewModel, child) {

@ -71,12 +71,12 @@ class LandingPageData {
), ),
]; ];
static List<ServiceCardData> get getLoggedInServiceCardsList => [ List<ServiceCardData> get getLoggedInServiceCardsList => [
ServiceCardData( ServiceCardData(
serviceName: "emergency", serviceName: "emergency",
icon: AppAssets.emergency_services_icon, icon: AppAssets.emergency_services_icon,
title: LocaleKeys.emergency, title: getIt.get<AppState>().isArabic()?LocaleKeys.services3 :LocaleKeys.emergency2,
subtitle: LocaleKeys.services2, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.emergency2:LocaleKeys.services3,
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
iconColor: Colors.white, iconColor: Colors.white,
textColor: Colors.white, textColor: Colors.white,
@ -85,8 +85,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "lab_results", serviceName: "lab_results",
icon: AppAssets.home_lab_result_icon, icon: AppAssets.home_lab_result_icon,
title: LocaleKeys.lab, title: getIt.get<AppState>().isArabic()?LocaleKeys.labSubtitle:LocaleKeys.lab,
subtitle: LocaleKeys.labSubtitle, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.lab:LocaleKeys.labSubtitle ,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
@ -95,8 +95,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "radiology_results", serviceName: "radiology_results",
icon: AppAssets.my_radiology_icon, icon: AppAssets.my_radiology_icon,
title: LocaleKeys.radiology, title: getIt.get<AppState>().isArabic()?LocaleKeys.labSubtitle:LocaleKeys.radiology,
subtitle: LocaleKeys.radiologySubtitle, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.radiology:LocaleKeys.labSubtitle ,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
@ -105,8 +105,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "prescriptions", serviceName: "prescriptions",
icon: AppAssets.my_prescription_icon, icon: AppAssets.my_prescription_icon,
title: LocaleKeys.medicinesSubtitle, title: getIt.get<AppState>().isArabic()?LocaleKeys.details2:LocaleKeys.medicinesSubtitle,
subtitle: LocaleKeys.details, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.medicinesSubtitle:LocaleKeys.details2,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
@ -115,8 +115,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "insurance_update", serviceName: "insurance_update",
icon: AppAssets.insurance_update_icon, icon: AppAssets.insurance_update_icon,
title: LocaleKeys.insurance, title: getIt.get<AppState>().isArabic()?LocaleKeys.details2: LocaleKeys.insurance2,
subtitle: LocaleKeys.details, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.insurance2: LocaleKeys.details2,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
@ -135,8 +135,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "sick_leaves", serviceName: "sick_leaves",
icon: AppAssets.my_sick_leave_icon, icon: AppAssets.my_sick_leave_icon,
title: LocaleKeys.sick, title: getIt.get<AppState>().isArabic()?LocaleKeys.sickSubtitle:LocaleKeys.sick2,
subtitle: LocaleKeys.sickSubtitle, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.sick2:LocaleKeys.sickSubtitle,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
@ -145,8 +145,8 @@ class LandingPageData {
ServiceCardData( ServiceCardData(
serviceName: "my_invoice", serviceName: "my_invoice",
icon: AppAssets.invoiceListIcon, icon: AppAssets.invoiceListIcon,
title: LocaleKeys.invoiceList, title: getIt.get<AppState>().isArabic()?LocaleKeys.myDoctorSubtitle2:LocaleKeys.invoiceList2,
subtitle: LocaleKeys.myDoctorSubtitle, subtitle: getIt.get<AppState>().isArabic()?LocaleKeys.invoiceList2:LocaleKeys.myDoctorSubtitle2,
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,

@ -696,7 +696,7 @@ class _LandingPageState extends State<LandingPage> {
.width / 2.5 - 10), .width / 2.5 - 10),
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getLoggedInServiceCardsList.length, itemCount: LandingPageData().getLoggedInServiceCardsList.length,
shrinkWrap: true, shrinkWrap: true,
controller: _horizontalScrollController, controller: _horizontalScrollController,
padding: EdgeInsets.only(left: 0.h, right: 0.h, top: 16.h, bottom: 12.h), padding: EdgeInsets.only(left: 0.h, right: 0.h, top: 16.h, bottom: 12.h),
@ -708,14 +708,14 @@ class _LandingPageState extends State<LandingPage> {
horizontalOffset: 100.0, horizontalOffset: 100.0,
child: FadeInAnimation( child: FadeInAnimation(
child: SmallServiceCard( child: SmallServiceCard(
icon: LandingPageData.getLoggedInServiceCardsList[index].icon, icon: LandingPageData().getLoggedInServiceCardsList[index].icon,
title: LandingPageData.getLoggedInServiceCardsList[index].title, title: LandingPageData().getLoggedInServiceCardsList[index].title,
subtitle: LandingPageData.getLoggedInServiceCardsList[index].subtitle, subtitle: LandingPageData().getLoggedInServiceCardsList[index].subtitle,
iconColor: LandingPageData.getLoggedInServiceCardsList[index].iconColor!, iconColor: LandingPageData().getLoggedInServiceCardsList[index].iconColor!,
textColor: LandingPageData.getLoggedInServiceCardsList[index].textColor, textColor: LandingPageData().getLoggedInServiceCardsList[index].textColor,
backgroundColor: LandingPageData.getLoggedInServiceCardsList[index].backgroundColor, backgroundColor: LandingPageData().getLoggedInServiceCardsList[index].backgroundColor,
isBold: LandingPageData.getLoggedInServiceCardsList[index].isBold, isBold: LandingPageData().getLoggedInServiceCardsList[index].isBold,
serviceName: LandingPageData.getLoggedInServiceCardsList[index].serviceName, serviceName: LandingPageData().getLoggedInServiceCardsList[index].serviceName,
), ),
), ),
), ),

@ -91,35 +91,41 @@ class LabOrderResultItem extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Visibility( Flexible(
visible: tests?.checkIfGraphShouldBeDisplayed() == true, flex: 2,
child: Column( child: Visibility(
spacing: 6.h, visible: tests?.checkIfGraphShouldBeDisplayed() == true,
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ spacing: 6.h,
severityText.tr().toText10(isBold: true, color: AppColors.greyTextColor), crossAxisAlignment: CrossAxisAlignment.start,
Utils.buildSvgWithAssets(icon: AppAssets.lab_result_indicator, width: 21, height: 23, iconColor: iconColor), children: [
], severityText.tr().toText10(isBold: true, color: AppColors.greyTextColor),
Utils.buildSvgWithAssets(icon: AppAssets.lab_result_indicator, width: 21, height: 23, iconColor: iconColor),
],
),
), ),
), ),
Visibility( Flexible(
visible: tests?.checkIfGraphShouldBeDisplayed() == true, flex:2,
child: CustomButton( child: Visibility(
icon: AppAssets.view_report_icon, visible: tests?.checkIfGraphShouldBeDisplayed() == true,
iconColor: AppColors.infoColor, child: CustomButton(
iconSize: 16.h, icon: AppAssets.view_report_icon,
text: LocaleKeys.viewReport.tr(context: context), iconColor: AppColors.infoColor,
onPressed: () { iconSize: 16.h,
onTap(); text: LocaleKeys.viewReport.tr(context: context),
}, onPressed: () {
backgroundColor: AppColors.infoColor.withAlpha(20), onTap();
borderColor: AppColors.infoColor.withAlpha(0), },
textColor: AppColors.infoColor, backgroundColor: AppColors.infoColor.withAlpha(20),
fontSize: 14, borderColor: AppColors.infoColor.withAlpha(0),
fontWeight: FontWeight.w600, textColor: AppColors.infoColor,
borderRadius: 12, fontSize: 14,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), fontWeight: FontWeight.w600,
height: 40.h, borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h,
),
), ),
), ),
], ],

@ -27,7 +27,7 @@ class BottomNavigation extends StatelessWidget {
BottomNavItem( BottomNavItem(
icon: AppAssets.bookAppoBottom, icon: AppAssets.bookAppoBottom,
fillIcon: AppAssets.bookAppoBottom, fillIcon: AppAssets.bookAppoBottom,
label: LocaleKeys.appointment.tr(context: context), label: LocaleKeys.appointments.tr(context: context),
iconSize: 32, isSpecial: true), iconSize: 32, isSpecial: true),
appState.isAuthenticated appState.isAuthenticated
// ? BottomNavItem(icon: AppAssets.toDoBottom, label: LocaleKeys.todoList.tr(context: context)) // ? BottomNavItem(icon: AppAssets.toDoBottom, label: LocaleKeys.todoList.tr(context: context))
@ -80,7 +80,7 @@ class BottomNavigation extends StatelessWidget {
), ),
// const SizedBox(height: 10), // const SizedBox(height: 10),
SizedBox(height: item.isSpecial ? 0 : 8.h), SizedBox(height: item.isSpecial ? 0 : 8.h),
item.label.toText11(isBold: true), item.label.toText10(isBold: true),
// SizedBox(height: item.isSpecial ? 5 : 0) // SizedBox(height: item.isSpecial ? 5 : 0)
], ],
), ),

@ -86,7 +86,8 @@ class CustomButton extends StatelessWidget {
), ),
if (text.isNotEmpty && icon != null) if (text.isNotEmpty && icon != null)
Flexible( Flexible(
child: Text( child:
Text(
text, text,
overflow: textOverflow ?? TextOverflow.ellipsis, overflow: textOverflow ?? TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,

@ -26,12 +26,7 @@ class OrderTrackingWidget extends StatelessWidget {
Widget? getBarAndDot(OrderTrackingState? state, BuildContext context, Widget? getBarAndDot(OrderTrackingState? state, BuildContext context,
double width) { double width) {
print("the parent padding value is $parentPaddingValue");
print("the parent padding value is ${(parentPaddingValue+24)}");
print("the width - (parentPaddingValue+24) ${(width - (parentPaddingValue+24))}");
double widthOfOneState = (width/4) - (parentPaddingValue+8.h); double widthOfOneState = (width/4) - (parentPaddingValue+8.h);
print("te width of one state is $widthOfOneState");
print("the value of${width/4}");
if(state == null) { if(state == null) {
return Row( return Row(
children: List.generate(4, (index) { children: List.generate(4, (index) {

Loading…
Cancel
Save