From 21c3686e05f0282e6d1ffe2ffc67f676b5c77c1d Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 31 Aug 2021 12:07:46 +0300 Subject: [PATCH] Ambulance request services revamping --- lib/config/config.dart | 5 + .../model/er/AmbulanceRequestOrdersModel.dart | 319 ++++++++++++++++++ lib/core/service/er/am_service.dart | 83 +++-- .../viewModels/er/am_request_view_model.dart | 24 +- .../AmbulanceRequestIndex.dart | 31 +- lib/pages/ErService/OrderLogPage.dart | 41 +-- 6 files changed, 436 insertions(+), 67 deletions(-) create mode 100644 lib/core/model/er/AmbulanceRequestOrdersModel.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 329d4218..9342551a 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -134,6 +134,11 @@ const INSERT_ER_INERT_PRES_ORDER = /// ER RRT const GET_ALL_RC_TRANSPORTATION = 'rc/api/Transportation/getalltransportation'; const GET_ALL_TRANSPORTATIONS_RC = 'rc/api/Transportation/getalltransportation'; + +const GET_ALL_TRANSPORTATIONS_ORDERS = 'rc/api/Transportation/get'; + +const CANCEL_AMBULANCE_REQUEST = "rc/api/Transportation/update"; + const GET_ALL_RRT_QUESTIONS = 'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions'; const GET_RRT_SERVICE_PRICE = diff --git a/lib/core/model/er/AmbulanceRequestOrdersModel.dart b/lib/core/model/er/AmbulanceRequestOrdersModel.dart new file mode 100644 index 00000000..6bcc02b0 --- /dev/null +++ b/lib/core/model/er/AmbulanceRequestOrdersModel.dart @@ -0,0 +1,319 @@ +class AmbulanceRequestOrdersModel { + String statusText; + int paymentStatus; + dynamic clientRequestid; + dynamic paymentStatusText; + dynamic projectName; + String nearestProjectName; + double paymentAmount; + WFOrder wFOrder; + String serviceText; + bool isSentForApproval; + int exaCartOrderId; + bool isTimer; + int timeSeconds; + int totalPendingSeconds; + int timeMinute; + int timeHour; + int timeTotalSeconds; + int timeTotalMinute; + int timeTotalHour; + dynamic approvalStatus; + bool isActive; + int clickButton; + dynamic orderHistory; + String pickupLocation; + String dropOffLocation; + String clinicName; + String doctorName; + String branch; + String time; + dynamic notes; + int id; + String patientId; + int patientOutSa; + bool isOutPatient; + int projectId; + int nearestProjectId; + dynamic longitude; + dynamic latitude; + dynamic appointmentNo; + dynamic dischargeId; + int statusId; + int serviceId; + int channel; + Orderpayment orderpayment; + dynamic orderselectedservice; + dynamic wforder; + dynamic orderapprovalobj; + String created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool isDeleted; + + AmbulanceRequestOrdersModel( + {this.statusText, + this.paymentStatus, + this.clientRequestid, + this.paymentStatusText, + this.projectName, + this.nearestProjectName, + this.paymentAmount, + this.wFOrder, + this.serviceText, + this.isSentForApproval, + this.exaCartOrderId, + this.isTimer, + this.timeSeconds, + this.totalPendingSeconds, + this.timeMinute, + this.timeHour, + this.timeTotalSeconds, + this.timeTotalMinute, + this.timeTotalHour, + this.approvalStatus, + this.isActive, + this.clickButton, + this.orderHistory, + this.pickupLocation, + this.dropOffLocation, + this.clinicName, + this.doctorName, + this.branch, + this.time, + this.notes, + this.id, + this.patientId, + this.patientOutSa, + this.isOutPatient, + this.projectId, + this.nearestProjectId, + this.longitude, + this.latitude, + this.appointmentNo, + this.dischargeId, + this.statusId, + this.serviceId, + this.channel, + this.orderpayment, + this.orderselectedservice, + this.wforder, + this.orderapprovalobj, + this.created, + this.createdBy, + this.modified, + this.modifiedBy, + this.isDeleted}); + + AmbulanceRequestOrdersModel.fromJson(Map json) { + statusText = json['statusText']; + paymentStatus = json['paymentStatus']; + clientRequestid = json['clientRequestid']; + paymentStatusText = json['paymentStatusText']; + projectName = json['projectName']; + nearestProjectName = json['nearestProjectName']; + paymentAmount = json['paymentAmount']; + wFOrder = json['wF_order'] != null ? new WFOrder.fromJson(json['wF_order']) : null; + serviceText = json['serviceText']; + isSentForApproval = json['isSentForApproval']; + exaCartOrderId = json['exaCart_OrderId']; + isTimer = json['isTimer']; + timeSeconds = json['timeSeconds']; + totalPendingSeconds = json['totalPendingSeconds']; + timeMinute = json['timeMinute']; + timeHour = json['timeHour']; + timeTotalSeconds = json['timeTotalSeconds']; + timeTotalMinute = json['timeTotalMinute']; + timeTotalHour = json['timeTotalHour']; + approvalStatus = json['approvalStatus']; + isActive = json['isActive']; + clickButton = json['clickButton']; + orderHistory = json['orderHistory']; + pickupLocation = json['pickupLocation']; + dropOffLocation = json['dropOffLocation']; + clinicName = json['clinicName']; + doctorName = json['doctorName']; + branch = json['branch']; + time = json['time']; + notes = json['notes']; + id = json['id']; + patientId = json['patientId']; + patientOutSa = json['patientOutSa']; + isOutPatient = json['isOutPatient']; + projectId = json['projectId']; + nearestProjectId = json['nearestProjectId']; + longitude = json['longitude']; + latitude = json['latitude']; + appointmentNo = json['appointmentNo']; + dischargeId = json['dischargeId']; + statusId = json['statusId']; + serviceId = json['serviceId']; + channel = json['channel']; + orderpayment = json['orderpayment'] != null ? new Orderpayment.fromJson(json['orderpayment']) : null; + orderselectedservice = json['orderselectedservice']; + wforder = json['wforder']; + orderapprovalobj = json['orderapprovalobj']; + created = json['created']; + createdBy = json['createdBy']; + modified = json['modified']; + modifiedBy = json['modifiedBy']; + isDeleted = json['isDeleted']; + } + + Map toJson() { + final Map data = new Map(); + data['statusText'] = this.statusText; + data['paymentStatus'] = this.paymentStatus; + data['clientRequestid'] = this.clientRequestid; + data['paymentStatusText'] = this.paymentStatusText; + data['projectName'] = this.projectName; + data['nearestProjectName'] = this.nearestProjectName; + data['paymentAmount'] = this.paymentAmount; + if (this.wFOrder != null) { + data['wF_order'] = this.wFOrder.toJson(); + } + data['serviceText'] = this.serviceText; + data['isSentForApproval'] = this.isSentForApproval; + data['exaCart_OrderId'] = this.exaCartOrderId; + data['isTimer'] = this.isTimer; + data['timeSeconds'] = this.timeSeconds; + data['totalPendingSeconds'] = this.totalPendingSeconds; + data['timeMinute'] = this.timeMinute; + data['timeHour'] = this.timeHour; + data['timeTotalSeconds'] = this.timeTotalSeconds; + data['timeTotalMinute'] = this.timeTotalMinute; + data['timeTotalHour'] = this.timeTotalHour; + data['approvalStatus'] = this.approvalStatus; + data['isActive'] = this.isActive; + data['clickButton'] = this.clickButton; + data['orderHistory'] = this.orderHistory; + data['pickupLocation'] = this.pickupLocation; + data['dropOffLocation'] = this.dropOffLocation; + data['clinicName'] = this.clinicName; + data['doctorName'] = this.doctorName; + data['branch'] = this.branch; + data['time'] = this.time; + data['notes'] = this.notes; + data['id'] = this.id; + data['patientId'] = this.patientId; + data['patientOutSa'] = this.patientOutSa; + data['isOutPatient'] = this.isOutPatient; + data['projectId'] = this.projectId; + data['nearestProjectId'] = this.nearestProjectId; + data['longitude'] = this.longitude; + data['latitude'] = this.latitude; + data['appointmentNo'] = this.appointmentNo; + data['dischargeId'] = this.dischargeId; + data['statusId'] = this.statusId; + data['serviceId'] = this.serviceId; + data['channel'] = this.channel; + if (this.orderpayment != null) { + data['orderpayment'] = this.orderpayment.toJson(); + } + data['orderselectedservice'] = this.orderselectedservice; + data['wforder'] = this.wforder; + data['orderapprovalobj'] = this.orderapprovalobj; + data['created'] = this.created; + data['createdBy'] = this.createdBy; + data['modified'] = this.modified; + data['modifiedBy'] = this.modifiedBy; + data['isDeleted'] = this.isDeleted; + return data; + } +} + +class WFOrder { + dynamic wfButtonsDTO; + int id; + int orderId; + int previousStep; + int nextStep; + int serviceId; + dynamic order; + String created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool isDeleted; + + WFOrder({this.wfButtonsDTO, this.id, this.orderId, this.previousStep, this.nextStep, this.serviceId, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted}); + + WFOrder.fromJson(Map json) { + wfButtonsDTO = json['wf_ButtonsDTO']; + id = json['id']; + orderId = json['orderId']; + previousStep = json['previousStep']; + nextStep = json['nextStep']; + serviceId = json['serviceId']; + order = json['order']; + created = json['created']; + createdBy = json['createdBy']; + modified = json['modified']; + modifiedBy = json['modifiedBy']; + isDeleted = json['isDeleted']; + } + + Map toJson() { + final Map data = new Map(); + data['wf_ButtonsDTO'] = this.wfButtonsDTO; + data['id'] = this.id; + data['orderId'] = this.orderId; + data['previousStep'] = this.previousStep; + data['nextStep'] = this.nextStep; + data['serviceId'] = this.serviceId; + data['order'] = this.order; + data['created'] = this.created; + data['createdBy'] = this.createdBy; + data['modified'] = this.modified; + data['modifiedBy'] = this.modifiedBy; + data['isDeleted'] = this.isDeleted; + return data; + } +} + +class Orderpayment { + int id; + int orderId; + dynamic clientRequestId; + double totalAmount; + int paymentStatus; + dynamic order; + String created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool isDeleted; + + Orderpayment({this.id, this.orderId, this.clientRequestId, this.totalAmount, this.paymentStatus, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted}); + + Orderpayment.fromJson(Map json) { + id = json['id']; + orderId = json['orderId']; + clientRequestId = json['clientRequestId']; + totalAmount = json['totalAmount']; + paymentStatus = json['paymentStatus']; + order = json['order']; + created = json['created']; + createdBy = json['createdBy']; + modified = json['modified']; + modifiedBy = json['modifiedBy']; + isDeleted = json['isDeleted']; + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['orderId'] = this.orderId; + data['clientRequestId'] = this.clientRequestId; + data['totalAmount'] = this.totalAmount; + data['paymentStatus'] = this.paymentStatus; + data['order'] = this.order; + data['created'] = this.created; + data['createdBy'] = this.createdBy; + data['modified'] = this.modified; + data['modifiedBy'] = this.modifiedBy; + data['isDeleted'] = this.isDeleted; + return data; + } +} diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 22db55a3..aff19df6 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -1,5 +1,6 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; +import 'package:diplomaticquarterapp/core/model/er/AmbulanceRequestOrdersModel.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart'; @@ -11,20 +12,23 @@ import '../base_service.dart'; class AmService extends BaseService { List amModelList = List(); List patientAllPresOrdersList = List(); + + List patientAmbulanceRequestOrdersList = List(); + bool hasPendingOrder = false; int pendingOrderID = 0; String pendingOrderStatus = ""; String pendingOrderStatusAR = ""; PickUpRequestPresOrder pickUpRequestPresOrder; + AmbulanceRequestOrdersModel pendingAmbulanceRequestOrder; + Future getAllTransportationOrders() async { hasError = false; Map body = Map(); body['isDentalAllowedBackend'] = false; body['IdentificationNo'] = user.patientIdentificationNo; - await baseAppClient.get( - GET_ALL_TRANSPORTATIONS_RC + "?patientID=" + user.patientID.toString(), - isExternal: false, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.get(GET_ALL_TRANSPORTATIONS_RC + "?patientID=" + user.patientID.toString(), isExternal: false, onSuccess: (dynamic response, int statusCode) { amModelList.clear(); response['data']['transportationservices'].forEach((item) { amModelList.add(PatientERTransportationMethod.fromJson(item)); @@ -33,24 +37,13 @@ class AmService extends BaseService { hasError = true; super.error = error; }); - // await baseAppClient.post(GET_AMBULANCE_REQUEST, - // onSuccess: (dynamic response, int statusCode) { - // amModelList.clear(); - // response['PatientER_RRT_GetAllTransportationMethodList'].forEach((item) { - // amModelList.add(PatientERTransportationMethod.fromJson(item)); - // }); - // }, onFailure: (String error, int statusCode) { - // hasError = true; - // super.error = error; - // }, body: body); } Future getPatientAllPresOrdersList() async { hasError = false; hasPendingOrder = false; pickUpRequestPresOrder = null; - await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, - onSuccess: (dynamic response, int statusCode) { + await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) { patientAllPresOrdersList.clear(); response['PatientER_GetPatientAllPresOrdersList'].forEach((item) { if (item['ServiceID'] == OrderService.AMBULANCE.getIdOrderService()) { @@ -70,15 +63,46 @@ class AmService extends BaseService { }, body: Map()); } + Future getPatientAllPresOrdersListRC(dynamic patientID) async { + hasError = false; + hasPendingOrder = false; + pickUpRequestPresOrder = null; + + Map body = Map(); + body['patientId'] = patientID.toString(); + body['PatientID'] = patientID.toString(); + + await baseAppClient.post(GET_ALL_TRANSPORTATIONS_ORDERS, onSuccess: (dynamic response, int statusCode) { + patientAmbulanceRequestOrdersList.clear(); + print(response['data'].length); + print(response['data'][0]); + response['data'].forEach((item) { + patientAmbulanceRequestOrdersList.add(AmbulanceRequestOrdersModel.fromJson(item)); + if (item['statusId'] == 1) { + hasPendingOrder = true; + pendingOrderID = item['orderpayment']['id']; + pendingOrderStatus = item['statusText']; + pendingOrderStatusAR = item['statusText']; + pendingAmbulanceRequestOrder = AmbulanceRequestOrdersModel.fromJson(item); + } + }); + print(patientAmbulanceRequestOrdersList.length); + print(hasPendingOrder); + print(pendingOrderID); + print(pendingOrderStatus); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + Future getOrderDetails() async { hasError = false; Map body = Map(); body['PresOrderID'] = pendingOrderID; body['isDentalAllowedBackend'] = false; - await baseAppClient.post(GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID, - onSuccess: (dynamic response, int statusCode) { - response['PatientER_RRT_GetPickUpRequestByPresOrderIDList'] - .forEach((item) { + await baseAppClient.post(GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID, onSuccess: (dynamic response, int statusCode) { + response['PatientER_RRT_GetPickUpRequestByPresOrderIDList'].forEach((item) { pickUpRequestPresOrder = PickUpRequestPresOrder.fromJson(item); }); }, onFailure: (String error, int statusCode) { @@ -95,9 +119,20 @@ class AmService extends BaseService { body['RejectionReason'] = ''; body['PresOrderStatus'] = OrderService.AMBULANCE.getIdOrderService(); body['isDentalAllowedBackend'] = false; - await baseAppClient.post(UPDATE_PRESS_ORDER, - onSuccess: (dynamic response, int statusCode) {}, - onFailure: (String error, int statusCode) { + await baseAppClient.post(UPDATE_PRESS_ORDER, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + Future updatePressOrderRC({@required int presOrderID, @required String patientID}) async { + hasError = false; + Map body = Map(); + body['Id'] = presOrderID; + body['StatusId'] = 6; + body['ClickButton'] = 14; + body['PatientID'] = patientID; + await baseAppClient.post(CANCEL_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; super.error = error; }, body: body); @@ -106,9 +141,7 @@ class AmService extends BaseService { Future insertERPressOrder({@required PatientER patientER}) async { hasError = false; - await baseAppClient.post(INSERT_TRANSPORTATION_ORDER_RC, - onSuccess: (dynamic response, int statusCode) {}, - onFailure: (String error, int statusCode) { + await baseAppClient.post(INSERT_TRANSPORTATION_ORDER_RC, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; super.error = error; }, body: patientER.toJson()); diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 5f6d40d5..d884c4e7 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/er/AmbulanceRequestOrdersModel.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart'; @@ -27,12 +28,17 @@ class AmRequestViewModel extends BaseViewModel { List get appoitmentAllHistoryResultList => _medicalService.appoitmentAllHistoryResultList; + List get patientAmbulanceRequestOrdersList => + _amService.patientAmbulanceRequestOrdersList; + List get hospitals => _hospitalService.hospitals; bool get hasPendingOrder =>_amService.hasPendingOrder; PickUpRequestPresOrder get pickUpRequestPresOrder =>_amService.pickUpRequestPresOrder; + AmbulanceRequestOrdersModel get pendingAmbulanceRequestOrder =>_amService.pendingAmbulanceRequestOrder; + Future getAppointmentHistory() async { setState(ViewState.BusyLocal); await _medicalService.getAppointmentHistory(isActiveAppointment: true); @@ -60,7 +66,18 @@ class AmRequestViewModel extends BaseViewModel { error = _hospitalService.error; setState(ViewState.Error); } else - getPatientAllPresOrdersList(); + // getPatientAllPresOrdersList(); + getPatientAllPresOrdersListRC(); + } + + Future getPatientAllPresOrdersListRC() async { + setState(ViewState.Busy); + await _amService.getPatientAllPresOrdersListRC(authenticatedUserObject.user.patientID); + if (_hospitalService.hasError) { + error = _hospitalService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); } Future getPatientAllPresOrdersList() async { @@ -87,12 +104,13 @@ class AmRequestViewModel extends BaseViewModel { Future updatePressOrder({@required int presOrderID}) async { setState(ViewState.Busy); - await _amService.updatePressOrder(presOrderID: presOrderID); + // await _amService.updatePressOrder(presOrderID: presOrderID); + await _amService.updatePressOrderRC(presOrderID: presOrderID, patientID: authenticatedUserObject.user.patientID.toString()); if (_amService.hasError) { error = _amService.error; setState(ViewState.Error); } else - getPatientAllPresOrdersList(); + getPatientAllPresOrdersListRC(); } Future insertERPressOrder({@required PatientER patientER}) async { diff --git a/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart index 22098d4f..5da78946 100644 --- a/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart @@ -46,7 +46,7 @@ class _AmbulanceRequestIndexPageState extends State { @override Widget build(BuildContext context) { return AppScaffold( - body: widget.amRequestViewModel.pickUpRequestPresOrder != null + body: widget.amRequestViewModel.pendingAmbulanceRequestOrder != null ? SingleChildScrollView( child: Column( children: [ @@ -64,36 +64,32 @@ class _AmbulanceRequestIndexPageState extends State { children: [ OrderLogItem( title: TranslationBase.of(context).reqId, - value: widget.amRequestViewModel.pickUpRequestPresOrder - .presOrderID + value: widget.amRequestViewModel.pendingAmbulanceRequestOrder + .statusId .toString(), ), OrderLogItem( title: TranslationBase.of(context).status, - value: widget.amRequestViewModel.pickUpRequestPresOrder.status ==0?TranslationBase.of(context).pending:'', + value: widget.amRequestViewModel.pendingAmbulanceRequestOrder.statusText, ), OrderLogItem( title: TranslationBase.of(context).pickupDate, - value: DateUtil.getDayMonthYearDateFormatted( - DateUtil.convertStringToDate(widget - .amRequestViewModel - .pickUpRequestPresOrder - .lastEditDate)), + value: getDate(widget.amRequestViewModel.pendingAmbulanceRequestOrder.created), ), OrderLogItem( title: TranslationBase.of(context).pickupLocation, - value: widget.amRequestViewModel.pickUpRequestPresOrder - .pickupLocationName, + value: widget.amRequestViewModel.pendingAmbulanceRequestOrder + .pickupLocation, ), OrderLogItem( title: TranslationBase.of(context).dropoffLocation, - value: widget.amRequestViewModel.pickUpRequestPresOrder - .dropoffLocationName, + value: widget.amRequestViewModel.pendingAmbulanceRequestOrder + .dropOffLocation, ), OrderLogItem( title: TranslationBase.of(context).transportMethod, value: widget - .amRequestViewModel.pickUpRequestPresOrder.title, + .amRequestViewModel.pendingAmbulanceRequestOrder.serviceText, ), Container( padding: EdgeInsets.all(10), @@ -112,7 +108,7 @@ class _AmbulanceRequestIndexPageState extends State { onTap: () { widget.amRequestViewModel.updatePressOrder( presOrderID: widget.amRequestViewModel - .pickUpRequestPresOrder.presOrderID); + .pendingAmbulanceRequestOrder.id); }, ), ) @@ -167,4 +163,9 @@ class _AmbulanceRequestIndexPageState extends State { ), ); } + + String getDate(String date) { + return date.split("T")[0]; + } + } diff --git a/lib/pages/ErService/OrderLogPage.dart b/lib/pages/ErService/OrderLogPage.dart index 7d2a4a5b..3d492c83 100644 --- a/lib/pages/ErService/OrderLogPage.dart +++ b/lib/pages/ErService/OrderLogPage.dart @@ -1,9 +1,6 @@ -import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; -import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/OrderLogItem.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -19,7 +16,7 @@ class OrderLogPage extends StatelessWidget { margin: EdgeInsets.all(10), padding: EdgeInsets.all(8), child: ListView.builder( - itemCount: amRequestViewModel.patientAllPresOrdersList.length, + itemCount: amRequestViewModel.patientAmbulanceRequestOrdersList.length, itemBuilder: (context, index) => Container( margin: EdgeInsets.all(8), decoration: BoxDecoration( @@ -31,49 +28,41 @@ class OrderLogPage extends StatelessWidget { children: [ OrderLogItem( title: TranslationBase.of(context).reqId, - value: amRequestViewModel.patientAllPresOrdersList[index].iD - .toString(), + value: amRequestViewModel.patientAmbulanceRequestOrdersList[index].id.toString(), ), OrderLogItem( title: TranslationBase.of(context).orderStatus, - value: amRequestViewModel - .patientAllPresOrdersList[index].description, + value: amRequestViewModel.patientAmbulanceRequestOrdersList[index].statusText, ), OrderLogItem( title: TranslationBase.of(context).pickupDate, - value: DateUtil.getDayMonthYearDateFormatted( - DateUtil.convertStringToDate(amRequestViewModel - .patientAllPresOrdersList[index].createdOn)), + value: getDate(amRequestViewModel.patientAmbulanceRequestOrdersList[index].created), ), OrderLogItem( title: TranslationBase.of(context).pickupLocation, - value: amRequestViewModel - .patientAllPresOrdersList[index].pickupLocationName, + value: amRequestViewModel.patientAmbulanceRequestOrdersList[index].pickupLocation, ), OrderLogItem( title: TranslationBase.of(context).dropoffLocation, - value: amRequestViewModel - .patientAllPresOrdersList[index].dropoffLocationName, + value: amRequestViewModel.patientAmbulanceRequestOrdersList[index].dropOffLocation, ), - if(amRequestViewModel.patientAllPresOrdersList[index].status==1) + if (amRequestViewModel.patientAmbulanceRequestOrdersList[index].statusId == 1) Container( padding: EdgeInsets.all(10), width: double.maxFinite, - margin: EdgeInsets.only(bottom: 4,left: 4,right: 4), + margin: EdgeInsets.only(bottom: 4, left: 4, right: 4), decoration: BoxDecoration( borderRadius: BorderRadius.only( - bottomRight: Radius.circular(12), - bottomLeft: Radius.circular(12), + bottomRight: Radius.circular(12), + bottomLeft: Radius.circular(12), ), - color: Colors.white - ), + color: Colors.white), child: SecondaryButton( - color: Colors.red[900], + color: Colors.red[900], textColor: Colors.white, label: TranslationBase.of(context).cancel, onTap: () { - amRequestViewModel.updatePressOrder(presOrderID:amRequestViewModel.pickUpRequestPresOrder.presOrderID ); - + amRequestViewModel.updatePressOrder(presOrderID: amRequestViewModel.pendingAmbulanceRequestOrder.id); }, ), ) @@ -83,4 +72,8 @@ class OrderLogPage extends StatelessWidget { ), ); } + + String getDate(String date) { + return date.split("T")[0]; + } }