From 211990518f2b68a6e536b86e76b56d3ee5051c84 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Tue, 18 Jan 2022 13:29:12 +0200 Subject: [PATCH] Editing the accept_or_reject_req_model --- .../profile/intervention_medication_view_model.dart | 4 +++- .../accept_or_reject_req_model.dart | 7 ++++++- .../intervention_medication_history_screen.dart | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/core/viewModel/profile/intervention_medication_view_model.dart b/lib/core/viewModel/profile/intervention_medication_view_model.dart index 45f78e95..4e8fb097 100644 --- a/lib/core/viewModel/profile/intervention_medication_view_model.dart +++ b/lib/core/viewModel/profile/intervention_medication_view_model.dart @@ -98,6 +98,7 @@ class InterventionMedicationViewModel extends BaseViewModel { int admissionNo, int prescriptionNo, int orderNo, + int interventionStatus, }) async { AcceptOrRejectReqModel acceptOrRejectReqModel = AcceptOrRejectReqModel( projectID: 15, //projectId, @@ -108,7 +109,8 @@ class InterventionMedicationViewModel extends BaseViewModel { accessLevel: 4, lineItemNo: 1, remarks: remarks, - memberID: 2804 //memberId, + memberID: 2804, //memberId, + interventionStatus: interventionStatus, ); hasError = false; setState(ViewState.BusyLocal); diff --git a/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart b/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart index 07ef3f99..b3660d59 100644 --- a/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart +++ b/lib/screens/patients/profile/pharmacy-intervention-model/accept_or_reject_req_model.dart @@ -10,6 +10,7 @@ class AcceptOrRejectReqModel { int languageID; int lineItemNo; bool patientOutSA; + int interventionStatus; AcceptOrRejectReqModel( {this.patientID, @@ -22,7 +23,9 @@ class AcceptOrRejectReqModel { this.accessLevel, this.languageID, this.lineItemNo, - this.patientOutSA}); + this.patientOutSA, + this.interventionStatus, + }); AcceptOrRejectReqModel.fromJson(Map json) { patientID = json['PatientID']; @@ -36,6 +39,7 @@ class AcceptOrRejectReqModel { languageID = json['LanguageID']; lineItemNo = json['LineItemNo']; patientOutSA = json['PatientOutSA']; + interventionStatus = json['InterventionStatus']; } Map toJson() { @@ -51,6 +55,7 @@ class AcceptOrRejectReqModel { data['LanguageID'] = this.languageID; data['LineItemNo'] = this.lineItemNo; data['PatientOutSA'] = this.patientOutSA; + data['InterventionStatus'] = this.interventionStatus; return data; } } \ No newline at end of file diff --git a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart index 971f5a67..89b555b4 100644 --- a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart +++ b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart @@ -226,12 +226,13 @@ class _InterventionMedicationHistoryScreenState extends State