merge-update-with-lab-changes
haroon amjad 4 years ago
parent d1fcdcc898
commit 75423e5501

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

@ -28,7 +28,7 @@ class PrescriptionDeliveryService extends BaseService {
body['AppointmentNo'] = appointmentNo.toString(); body['AppointmentNo'] = appointmentNo.toString();
// body['CreatedBy'] = createdBy; // body['CreatedBy'] = createdBy;
body['DischargeID'] = dischargeID.toString(); body['DischargeID'] = dischargeID.toString();
await baseAppClient.post(ADD_PRESCRIPTION_ORDER_RC, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(ADD_PRESCRIPTION_ORDER_RC, isRCService: true, onSuccess: (dynamic response, int statusCode) {
var asd = ""; var asd = "";
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

@ -55,7 +55,7 @@ class PrescriptionsService extends BaseService {
prescriptionsOrderListRC.clear(); prescriptionsOrderListRC.clear();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['ID'] = orderID; body['ID'] = orderID;
await baseAppClient.post(GET_ALL_PRESCRIPTION_INFO_RC + "?PatientId=" + patientID.toString(), onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_ALL_PRESCRIPTION_INFO_RC + "?PatientId=" + patientID.toString(), isRCService: true, onSuccess: (dynamic response, int statusCode) {
response['response']['report'].forEach((prescriptionsOrder) { response['response']['report'].forEach((prescriptionsOrder) {
prescriptionsOrderListRC.add(PrescriptionInfoRCModel.fromJson(prescriptionsOrder)); prescriptionsOrderListRC.add(PrescriptionInfoRCModel.fromJson(prescriptionsOrder));
}); });
@ -69,7 +69,7 @@ class PrescriptionsService extends BaseService {
prescriptionsOrderList.clear(); prescriptionsOrderList.clear();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
// body['isDentalAllowedBackend'] = false; // body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_ALL_PRESCRIPTION_ORDERS_RC, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_ALL_PRESCRIPTION_ORDERS_RC, isRCService: true, onSuccess: (dynamic response, int statusCode) {
response['response'].forEach((prescriptionsOrder) { response['response'].forEach((prescriptionsOrder) {
prescriptionsOrderList.add(GetCMCAllOrdersResponseModel.fromJson(prescriptionsOrder)); prescriptionsOrderList.add(GetCMCAllOrdersResponseModel.fromJson(prescriptionsOrder));
}); });

@ -248,6 +248,9 @@ class OrderPreviewService extends BaseService {
case 4: case 4:
return "INSTALLMENT"; return "INSTALLMENT";
break; break;
case 5:
return "ApplePay";
break;
default: default:
return ""; return "";
} }

@ -147,9 +147,9 @@ class PrescriptionsViewModel extends BaseViewModel {
} }
} }
getPrescriptionReportDetailsRC() async { getPrescriptionReportDetailsRC(int orderID, dynamic patientID) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _prescriptionsService.getPrescriptionsInfoRC(4, 2001273); await _prescriptionsService.getPrescriptionsInfoRC(orderID, patientID);
if (_prescriptionsService.hasError) { if (_prescriptionsService.hasError) {
error = _prescriptionsService.error; error = _prescriptionsService.error;
setState(ViewState.Error); setState(ViewState.Error);

@ -156,6 +156,8 @@ class OrderPreviewViewModel extends BaseViewModel {
case 4: case 4:
return "${assetFile}installment.png"; return "${assetFile}installment.png";
break; break;
case 5:
return "${assetFile}applePay.png";
default: default:
return ""; return "";
} }

@ -21,7 +21,7 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<PrescriptionsViewModel>( return BaseView<PrescriptionsViewModel>(
onModelReady: (model) => model.getPrescriptionReportDetailsRC(), onModelReady: (model) => model.getPrescriptionReportDetailsRC(prescriptionsOrder.iD, projectViewModel.user.patientID),
builder: (_, model, widget) { builder: (_, model, widget) {
int status = prescriptionsOrder.statusId; int status = prescriptionsOrder.statusId;
String _statusDisp = prescriptionsOrder.statusText; String _statusDisp = prescriptionsOrder.statusText;

@ -253,7 +253,7 @@ class productTile extends StatelessWidget {
: Container(), : Container(),
// this.isOrderDetails == true && model.order[0].orderStatusId == 30? // this.isOrderDetails == true && model.order[0].orderStatusId == 30?
if (status == 30 && this.isOrderDetails == true) if (status == 30 || status == 997 && this.isOrderDetails == true)
Expanded( Expanded(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,

@ -48,6 +48,7 @@ class PickupLocationFromMap extends StatelessWidget {
autocompleteLanguage: projectViewModel.currentLanguage, autocompleteLanguage: projectViewModel.currentLanguage,
enableMapTypeButton: true, enableMapTypeButton: true,
selectInitialPosition: true, selectInitialPosition: true,
region: "SA",
onPlacePicked: (PickResult result) { onPlacePicked: (PickResult result) {
print(result.adrAddress); print(result.adrAddress);
onPick(result); onPick(result);

Loading…
Cancel
Save