From 57aea2ba4fa4cc45604c97482b7b8d1aefe78b4b Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 16 Feb 2021 15:44:47 +0200 Subject: [PATCH] pharmacy remarks --- lib/core/viewModel/medicine_view_model.dart | 4 ++-- lib/screens/prescription/add_prescription_form.dart | 2 +- lib/screens/prescription/prescription_screen.dart | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index ecb0a48a..272c5228 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -43,11 +43,11 @@ class MedicineViewModel extends BaseViewModel { Future getItem({int itemID}) async { //hasError = false; //_insuranceCardService.clearInsuranceCard(); - setState(ViewState.Busy); + setState(ViewState.BusyLocal); await _prescriptionService.getItem(itemID: itemID); if (_prescriptionService.hasError) { error = _prescriptionService.error; - setState(ViewState.Error); + setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); } diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 68d4e633..881dc2de 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -201,7 +201,7 @@ class _PrescriptionFormWidgetState extends State { await model.getMedicationDoseTime(); //await model.getMedicationIndications(); await model.getPatientAssessment(getAssessmentReqModel); - //await model.getItem(); + await model.getItem(); }, builder: ( BuildContext context, diff --git a/lib/screens/prescription/prescription_screen.dart b/lib/screens/prescription/prescription_screen.dart index f7012f1d..3e62d6e0 100644 --- a/lib/screens/prescription/prescription_screen.dart +++ b/lib/screens/prescription/prescription_screen.dart @@ -383,12 +383,9 @@ class _NewPrescriptionScreenState extends State { ), Expanded( child: AppText( - "", // commening below code because there is an error coming in the model please fix it before pushing it - // model.prescriptionList[0].entityList[index].pharmacistRemarks == null - // ? "" - // : model.prescriptionList[0].entityList[index].pharmacistRemarks, - fontSize: - 15.0), + // commening below code because there is an error coming in the model please fix it before pushing it + model.prescriptionList[0].entityList[index].pharmacistRemarks == null ? "" : model.prescriptionList[0].entityList[index].pharmacistRemarks, + fontSize: 15.0), ) ], ),