From faf52803381b58f1cf835210c0a6fc1db11630d3 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 27 Aug 2024 12:31:16 +0300 Subject: [PATCH] fixes & updates --- lib/pages/BookAppointment/BookConfirm.dart | 15 +++++- lib/pages/login/confirm-login.dart | 1 + .../prescription_details_inp.dart | 38 +++++++------- .../prescription_details_page.dart | 38 +++++++------- .../prescription_items_page.dart | 50 +++++++++---------- 5 files changed, 78 insertions(+), 64 deletions(-) diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart index b2ccf085..c64a4750 100644 --- a/lib/pages/BookAppointment/BookConfirm.dart +++ b/lib/pages/BookAppointment/BookConfirm.dart @@ -337,7 +337,20 @@ class _BookConfirmState extends State { Future.delayed(Duration(milliseconds: 500), () { // checkPatientNphiesEligibility(docObject, res['AppointmentNo'], context); getToDoCount(); - getPatientShare(context, res['AppointmentNo'], docObject.clinicID!, docObject.projectID!, docObject); + // getPatientShare(context, res['AppointmentNo'], docObject.clinicID!, docObject.projectID!, docObject); + Navigator.push( + context, + FadePage( + page: BookReminderPage( + docObject: docObject, + patientShareResponse: new PatientShareResponse(), + appoDateFormatted: widget.appoDateFormatted, + appoTimeFormatted: widget.selectedTime, + dateTime: getDateTime(), + isCash: isCash, + ), + ), + ); }); widget.service.logDoctorFreeSlots(docObject.doctorID!, docObject.clinicID!, docObject.projectID!, decodedLogs, res['AppointmentNo'], context).then((res) { if (res['MessageStatus'] == 1) { diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 87980321..45e1a34a 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -916,6 +916,7 @@ class _ConfirmLogin extends State { page: LandingPage(), ), (r) => false); + insertIMEI(); // appointmentRateViewModel // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) // .then((value) => diff --git a/lib/pages/medical/prescriptions/prescription_details_inp.dart b/lib/pages/medical/prescriptions/prescription_details_inp.dart index b46690cf..b7ef0527 100644 --- a/lib/pages/medical/prescriptions/prescription_details_inp.dart +++ b/lib/pages/medical/prescriptions/prescription_details_inp.dart @@ -162,25 +162,25 @@ class PrescriptionDetailsPageINP extends StatelessWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context).availability, - () { - Navigator.push( - context, - FadePage( - page: PharmacyForPrescriptionsPage( - itemID: prescriptionReport!.itemID, - prescriptionReport: PrescriptionReport.fromJson(prescriptionReport!.toJson()), - ), - ), - ); - }, - iconData: Icons.location_on, - color: Color(0xff359846), - ), - ), - SizedBox(width: 10), + // Expanded( + // child: DefaultButton( + // TranslationBase.of(context).availability, + // () { + // Navigator.push( + // context, + // FadePage( + // page: PharmacyForPrescriptionsPage( + // itemID: prescriptionReport!.itemID, + // prescriptionReport: PrescriptionReport.fromJson(prescriptionReport!.toJson()), + // ), + // ), + // ); + // }, + // iconData: Icons.location_on, + // color: Color(0xff359846), + // ), + // ), + // SizedBox(width: 10), Expanded( child: DefaultButton( TranslationBase.of(context).addReminder, diff --git a/lib/pages/medical/prescriptions/prescription_details_page.dart b/lib/pages/medical/prescriptions/prescription_details_page.dart index 5e7f1cb4..52b9392c 100644 --- a/lib/pages/medical/prescriptions/prescription_details_page.dart +++ b/lib/pages/medical/prescriptions/prescription_details_page.dart @@ -185,25 +185,25 @@ class _PrescriptionDetailsPageState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context).availability, - () { - Navigator.push( - context, - FadePage( - page: PharmacyForPrescriptionsPage( - itemID: widget.prescriptionReport!.itemID, - prescriptionReport: widget.prescriptionReport, - ), - ), - ); - }, - iconData: Icons.location_on, - color: Color(0xff359846), - ), - ), - SizedBox(width: 10), + // Expanded( + // child: DefaultButton( + // TranslationBase.of(context).availability, + // () { + // Navigator.push( + // context, + // FadePage( + // page: PharmacyForPrescriptionsPage( + // itemID: widget.prescriptionReport!.itemID, + // prescriptionReport: widget.prescriptionReport, + // ), + // ), + // ); + // }, + // iconData: Icons.location_on, + // color: Color(0xff359846), + // ), + // ), + // SizedBox(width: 10), Expanded( child: DefaultButton( hasReminder ? TranslationBase.of(context).cancelReminder : TranslationBase.of(context).addReminder, diff --git a/lib/pages/medical/prescriptions/prescription_items_page.dart b/lib/pages/medical/prescriptions/prescription_items_page.dart index 58f1e7d6..2042db84 100644 --- a/lib/pages/medical/prescriptions/prescription_items_page.dart +++ b/lib/pages/medical/prescriptions/prescription_items_page.dart @@ -388,31 +388,31 @@ class PrescriptionItemsPage extends StatelessWidget { ), ), ), - Container( - color: Colors.white, - padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), - child: DefaultButton( - TranslationBase.of(context).resendOrder, - () { - if (model.isMedDeliveryAllowed == false) { - AppToast.showErrorToast(message: TranslationBase.of(context).prescriptionDeliveryError); - } else { - Navigator.push( - context, - FadePage( - page: PrescriptionDeliveryAddressPage( - prescriptions: prescriptions, - prescriptionReportList: model.prescriptionReportList, - prescriptionReportEnhList: model.prescriptionReportEnhList, - ), - ), - ); - } - }, - color: model.isMedDeliveryAllowed == false ? Color(0xff575757) : Color(0xff359846), - disabledColor: Color(0xff575757), - ), - ), + // Container( + // color: Colors.white, + // padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), + // child: DefaultButton( + // TranslationBase.of(context).resendOrder, + // () { + // if (model.isMedDeliveryAllowed == false) { + // AppToast.showErrorToast(message: TranslationBase.of(context).prescriptionDeliveryError); + // } else { + // Navigator.push( + // context, + // FadePage( + // page: PrescriptionDeliveryAddressPage( + // prescriptions: prescriptions, + // prescriptionReportList: model.prescriptionReportList, + // prescriptionReportEnhList: model.prescriptionReportEnhList, + // ), + // ), + // ); + // } + // }, + // color: model.isMedDeliveryAllowed == false ? Color(0xff575757) : Color(0xff359846), + // disabledColor: Color(0xff575757), + // ), + // ), ], ) : Container(),