From c175139a29fe57855092009a2ef149789d3b6699 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 21 Dec 2021 14:53:56 +0300 Subject: [PATCH] pharmacy fixes --- .../service/PrescriptionDeliveryService.dart | 4 +-- .../PrescriptionDeliveryViewModel.dart | 4 +-- .../fragments/home_page_fragment2.dart | 27 ++++++++++--------- .../PrescriptionOrderOverveiw.dart | 1 + 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/core/service/PrescriptionDeliveryService.dart b/lib/core/service/PrescriptionDeliveryService.dart index 28e5bae4..16fcf1d0 100644 --- a/lib/core/service/PrescriptionDeliveryService.dart +++ b/lib/core/service/PrescriptionDeliveryService.dart @@ -20,7 +20,7 @@ class PrescriptionDeliveryService extends BaseService { }, body: body); } - Future insertDeliveryOrderRC({double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID}) async { + Future insertDeliveryOrderRC({double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID, int projectID}) async { hasError = false; Map body = Map(); body['latitude'] = latitude; @@ -28,8 +28,8 @@ class PrescriptionDeliveryService extends BaseService { body['AppointmentNo'] = appointmentNo.toString(); // body['CreatedBy'] = createdBy; body['DischargeID'] = dischargeID.toString(); + body['ProjectID'] = projectID.toString(); await baseAppClient.post(ADD_PRESCRIPTION_ORDER_RC, isRCService: true, onSuccess: (dynamic response, int statusCode) { - var asd = ""; }, onFailure: (String error, int statusCode) { hasError = true; print(error); diff --git a/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart b/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart index ada4da78..d4ceff00 100644 --- a/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart +++ b/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart @@ -27,12 +27,12 @@ class PrescriptionDeliveryViewModel extends BaseViewModel { await getCustomerAddresses(); } - Future insertDeliveryOrder({int lineItemNo, double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID}) async { + Future insertDeliveryOrder({int lineItemNo, double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID, int projectID}) async { setState(ViewState.BusyLocal); // await _prescriptionDeliveryService.insertDeliveryOrder( // lineItemNo: lineItemNo, latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID); await _prescriptionDeliveryService.insertDeliveryOrderRC( - latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID); + latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID, projectID: projectID); if (_prescriptionDeliveryService.hasError) { error = _prescriptionDeliveryService.error; setState(ViewState.ErrorLocal); diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 8fa20eaa..bbbf90fc 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -280,7 +280,8 @@ class _HomePageFragment2State extends State { child: InkWell( onTap: () { AuthenticatedUser user = projectViewModel.user; - if (projectViewModel.havePrivilege(82)) Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage(user))); + // if (projectViewModel.havePrivilege(82)) + Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage(user))); }, child: Stack( children: [ @@ -427,18 +428,18 @@ class _HomePageFragment2State extends State { ], ), ), - projectViewModel.havePrivilege(82) - ? Container() - : Container( - width: double.infinity, - height: double.infinity, - clipBehavior: Clip.antiAlias, - decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor.withOpacity(0.7), darkColor: CustomColors.lightGreyColor.withOpacity(0.7)), - child: Icon( - Icons.lock_outline, - size: 40, - ), - ) + // projectViewModel.havePrivilege(82) + // ? Container() + // : Container( + // width: double.infinity, + // height: double.infinity, + // clipBehavior: Clip.antiAlias, + // decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor.withOpacity(0.7), darkColor: CustomColors.lightGreyColor.withOpacity(0.7)), + // child: Icon( + // Icons.lock_outline, + // size: 40, + // ), + // ) ], ), ), diff --git a/lib/pages/medical/prescriptions/PrescriptionOrderOverveiw.dart b/lib/pages/medical/prescriptions/PrescriptionOrderOverveiw.dart index 8d601081..37fb937a 100644 --- a/lib/pages/medical/prescriptions/PrescriptionOrderOverveiw.dart +++ b/lib/pages/medical/prescriptions/PrescriptionOrderOverveiw.dart @@ -196,6 +196,7 @@ class PrescriptionOrderOverview extends StatelessWidget { latitude: latitude, appointmentNo: prescriptions.appointmentNo, dischargeID: prescriptions.dischargeNo, + projectID: prescriptions.projectID, createdBy: model.user.patientID) .then((value) { GifLoaderDialogUtils.hideDialog(context);