From b00b739e7928eb9b9d4b4a8b7c7713a657f53694 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 2 Mar 2021 13:55:15 +0200 Subject: [PATCH 1/3] categories that can update --- lib/screens/procedures/procedure_screen.dart | 7 ++++--- lib/screens/procedures/update-procedure.dart | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index f15e825d..92b286d8 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -460,18 +460,19 @@ class _ProcedureScreenState extends State { onTap: () { // model // .updateProcedure(); - if (model + if (model.procedureList[0].entityList[index].categoryID == 02 || + model .procedureList[ 0] .entityList[ index] .categoryID == - 02 || + 03 || model .procedureList[0] .entityList[index] .categoryID == - 03) { + 55) { updateProcedureForm( context, model: diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 6918d9a2..752bda5d 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -189,7 +189,10 @@ class _UpdateProcedureWidgetState extends State { 02 || selectedCategory[ 'categoryId'] == - 03 + 03 || + selectedCategory[ + 'categoryId'] == + 55 ? EntityListCheckboxSearchWidget( model: widget.model, masterList: widget From 46b5f2a5f3fa88a6182c01a59c716b6b2ee13035 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 2 Mar 2021 14:57:35 +0200 Subject: [PATCH 2/3] update procedure for agreed categories --- lib/core/viewModel/procedure_View_model.dart | 2 +- lib/screens/procedures/procedure_screen.dart | 6 ++++++ lib/screens/procedures/update-procedure.dart | 20 +++++++++++++------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 6af34f4d..199fa308 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -99,6 +99,6 @@ class ProcedureViewModel extends BaseViewModel { setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); - //await getProcedure(mrn: mrn); + await getProcedure(mrn: mrn); } } diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 92b286d8..c66b66a9 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -475,6 +475,12 @@ class _ProcedureScreenState extends State { 55) { updateProcedureForm( context, + limetNo: model + .procedureList[ + 0] + .entityList[ + index] + .lineItemNo, model: model, orderNo: model diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 752bda5d..f09157a2 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -23,6 +23,7 @@ import 'package:hexcolor/hexcolor.dart'; void updateProcedureForm(context, {String procedureName, int orderNo, + int limetNo, PatiantInformtion patient, String orderType, String procedureId, @@ -45,6 +46,7 @@ void updateProcedureForm(context, procedureId: procedureId, categoryId: categoreId, orderNo: orderNo, + limetNo: limetNo, ); }); } @@ -58,6 +60,7 @@ class UpdateProcedureWidget extends StatefulWidget { final String procedureId; final String categoryId; final int orderNo; + final int limetNo; UpdateProcedureWidget( {this.model, @@ -67,7 +70,8 @@ class UpdateProcedureWidget extends StatefulWidget { this.patient, this.procedureId, this.categoryId, - this.orderNo}); + this.orderNo, + this.limetNo}); @override _UpdateProcedureWidgetState createState() => _UpdateProcedureWidgetState(); } @@ -257,7 +261,7 @@ class _UpdateProcedureWidgetState extends State { setSelectedType(value); }, ), - Text(TranslationBase.of(context).urgent), + Text('routine'), Radio( activeColor: Color(0xFFB9382C), groupValue: selectedType, @@ -266,7 +270,7 @@ class _UpdateProcedureWidgetState extends State { setSelectedType(value); }, ), - Text('routine'), + Text(TranslationBase.of(context).urgent), ], ), ), @@ -311,6 +315,7 @@ class _UpdateProcedureWidgetState extends State { } Navigator.pop(context); updateProcedure( + limetNO: widget.limetNo, orderNo: widget.orderNo, orderType: selectedType.toString(), categorieId: widget.categoryId, @@ -340,6 +345,7 @@ class _UpdateProcedureWidgetState extends State { updateProcedure( {ProcedureViewModel model, String remarks, + int limetNO, int orderNo, String newProcedureId, String newCategorieId, @@ -357,7 +363,7 @@ class _UpdateProcedureWidgetState extends State { updateProcedureReqModel.episodeID = patient.episodeNo; updateProcedureReqModel.patientMRN = patient.patientMRN; - updateProcedureReqModel.lineItemNo = 1; + updateProcedureReqModel.lineItemNo = limetNO; updateProcedureReqModel.orderNo = orderNo; if (entityList.isNotEmpty) { @@ -370,7 +376,7 @@ class _UpdateProcedureWidgetState extends State { ); controlsProcedure.procedure = element.procedureId; - controlsProcedure.category = element.categoryID; + controlsProcedure.category = '0' + element.categoryID; controlsProcedure.controls = controls; }); } else { @@ -379,12 +385,12 @@ class _UpdateProcedureWidgetState extends State { code: "remarks", controlValue: remarks.isNotEmpty ? remarks : ""), ); controls.add( - Controls(code: "ordertype", controlValue: '0'), + Controls(code: "ordertype", controlValue: orderType), ); } controlsProcedure.procedure = procedureId; - controlsProcedure.category = categorieId; + controlsProcedure.category = '0' + categorieId; controlsProcedure.controls = controls; // controlsProcedure.add(ProcedureDetail( // category: categorieId, procedure: procedureId, controls: controls)); From 04114623600a99b8dbd8ce8fdccc96660a2f011b Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 2 Mar 2021 15:42:13 +0200 Subject: [PATCH 3/3] update procedure for agreed categorise --- lib/core/viewModel/procedure_View_model.dart | 2 +- lib/screens/procedures/update-procedure.dart | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 199fa308..6af34f4d 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -99,6 +99,6 @@ class ProcedureViewModel extends BaseViewModel { setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); - await getProcedure(mrn: mrn); + //await getProcedure(mrn: mrn); } } diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index f09157a2..312bdfe1 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -369,14 +369,16 @@ class _UpdateProcedureWidgetState extends State { if (entityList.isNotEmpty) { entityList.forEach((element) { controls.add( - Controls(code: "remarks", controlValue: element.remarks ?? remarks), + Controls(code: "remarks", controlValue: element.remarks ?? ''), ); controls.add( Controls(code: "ordertype", controlValue: '1'), ); controlsProcedure.procedure = element.procedureId; - controlsProcedure.category = '0' + element.categoryID; + controlsProcedure.category = int.parse(element.categoryID) > 9 + ? element.categoryID + : "0" + element.categoryID; controlsProcedure.controls = controls; }); } else { @@ -387,11 +389,12 @@ class _UpdateProcedureWidgetState extends State { controls.add( Controls(code: "ordertype", controlValue: orderType), ); - } - controlsProcedure.procedure = procedureId; - controlsProcedure.category = '0' + categorieId; - controlsProcedure.controls = controls; + controlsProcedure.procedure = procedureId; + controlsProcedure.category = '0' + categorieId; + + controlsProcedure.controls = controls; + } // controlsProcedure.add(ProcedureDetail( // category: categorieId, procedure: procedureId, controls: controls)); updateProcedureReqModel.procedureDetail = controlsProcedure; @@ -405,6 +408,7 @@ class _UpdateProcedureWidgetState extends State { model.getProcedure(mrn: patient.patientMRN); } else if (model.state == ViewState.Idle) { DrAppToastMsg.showSuccesToast('procedure has been updated'); + model.getProcedure(mrn: patient.patientMRN); } }