merge-requests/330/head
hussam al-habibeh 5 years ago
parent dc941b709f
commit bfe73ebe1d

@ -167,4 +167,13 @@ class MedicineViewModel extends BaseViewModel {
} }
return null; return null;
} }
dynamic getLookupByIdFilter(List<dynamic> list, String id) {
for (int i = 0; i < list.length; i++) {
if (list[i]['parameterCode'].toString() == id) {
return list[i];
}
}
return null;
}
} }

@ -99,6 +99,6 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
await getProcedure(mrn: mrn); //await getProcedure(mrn: mrn);
} }
} }

@ -79,6 +79,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
strengthController.text = widget.doseStreangth;
remarksController.text = widget.remarks; remarksController.text = widget.remarks;
indicationList = List(); indicationList = List();
@ -121,14 +122,16 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
await model.getMedicationRoute(); await model.getMedicationRoute();
await model.getMedicationFrequency(); await model.getMedicationFrequency();
await model.getMedicationDoseTime(); await model.getMedicationDoseTime();
await model.getItem(itemID: widget.drugId);
//await model.getMedicationIndications(); //await model.getMedicationIndications();
route = model.getLookupById(model.medicationRouteList, widget.route); route = model.getLookupByIdFilter(
model.itemMedicineListRoute, widget.route);
doseTime = doseTime =
model.getLookupById(model.medicationDoseTimeList, widget.dose); model.getLookupByIdFilter(model.itemMedicineList, widget.dose);
updatedDuration = model.getLookupById( updatedDuration = model.getLookupById(
model.medicationDurationList, widget.duration); model.medicationDurationList, widget.duration);
units = model.getLookupById( units = model.getLookupByIdFilter(
model.medicationStrengthList, widget.doseUnit); model.itemMedicineListUnit, widget.doseUnit);
frequencyUpdate = model.getLookupById( frequencyUpdate = model.getLookupById(
model.medicationFrequencyList, widget.frequency); model.medicationFrequencyList, widget.frequency);
}, },
@ -298,7 +301,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
0.3700, 0.3700,
child: InkWell( child: InkWell(
onTap: onTap:
model.medicationStrengthList != model.itemMedicineListUnit !=
null null
? () { ? () {
Helpers.hideKeyboard( Helpers.hideKeyboard(
@ -307,11 +310,11 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
dialog = dialog =
ListSelectDialog( ListSelectDialog(
list: model list: model
.medicationStrengthList, .itemMedicineListUnit,
attributeName: attributeName:
'nameEn', 'description',
attributeValueId: attributeValueId:
'id', 'parameterCode',
okText: okText:
TranslationBase.of( TranslationBase.of(
context) context)
@ -341,7 +344,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
textFieldSelectorDecoration( textFieldSelectorDecoration(
'UNIT Type', 'UNIT Type',
units != null units != null
? units['nameEn'] ? units[
'description']
: null, : null,
true), true),
enabled: false, enabled: false,
@ -359,15 +363,17 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
MediaQuery.of(context).size.height * MediaQuery.of(context).size.height *
0.070, 0.070,
child: InkWell( child: InkWell(
onTap: model.medicationRouteList != null onTap: model.itemMedicineListRoute !=
null
? () { ? () {
Helpers.hideKeyboard(context); Helpers.hideKeyboard(context);
ListSelectDialog dialog = ListSelectDialog dialog =
ListSelectDialog( ListSelectDialog(
list: list: model
model.medicationRouteList, .itemMedicineListRoute,
attributeName: 'nameEn', attributeName: 'description',
attributeValueId: 'id', attributeValueId:
'parameterCode',
okText: TranslationBase.of( okText: TranslationBase.of(
context) context)
.ok, .ok,
@ -395,7 +401,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
textFieldSelectorDecoration( textFieldSelectorDecoration(
'Route', 'Route',
route != null route != null
? route['nameEn'] ? route['description']
: null, : null,
true), true),
enabled: false, enabled: false,
@ -410,16 +416,15 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
MediaQuery.of(context).size.height * MediaQuery.of(context).size.height *
0.070, 0.070,
child: InkWell( child: InkWell(
onTap: model.medicationDoseTimeList != onTap: model.itemMedicineList != null
null
? () { ? () {
Helpers.hideKeyboard(context); Helpers.hideKeyboard(context);
ListSelectDialog dialog = ListSelectDialog dialog =
ListSelectDialog( ListSelectDialog(
list: model list: model.itemMedicineList,
.medicationDoseTimeList, attributeName: 'description',
attributeName: 'nameEn', attributeValueId:
attributeValueId: 'id', 'parameterCode',
okText: TranslationBase.of( okText: TranslationBase.of(
context) context)
.ok, .ok,
@ -445,7 +450,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
TranslationBase.of(context) TranslationBase.of(context)
.doseTime, .doseTime,
doseTime != null doseTime != null
? doseTime['nameEn'] ? doseTime['description']
: null, : null,
true), true),
enabled: false, enabled: false,
@ -735,7 +740,8 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
: widget : widget
.doseStreangth, .doseStreangth,
newUnit: units != null newUnit: units != null
? units['id'].toString() ? units['parameterCode']
.toString()
: widget.doseUnit, : widget.doseUnit,
doseUnit: widget.doseUnit, doseUnit: widget.doseUnit,
doseStreangth: doseStreangth:
@ -747,24 +753,27 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
routeId: widget.route, routeId: widget.route,
patient: widget.patient, patient: widget.patient,
model: widget.model, model: widget.model,
newDuration: updatedDuration != newDuration:
null updatedDuration != null
? updatedDuration['id'] ? updatedDuration['id']
.toString() .toString()
: widget.duration, : widget.duration,
drugId: widget.drugId, drugId: widget.drugId,
remarks: remarks: remarksController
remarksController.text, .text,
route: route != null route: route != null
? route['id'].toString() ? route[
: widget.route, 'parameterCode']
frequency: frequencyUpdate !=
null
? frequencyUpdate['id']
.toString() .toString()
: widget.frequency, : widget.route,
frequency:
frequencyUpdate !=
null
? frequencyUpdate['id']
.toString()
: widget.frequency,
dose: doseTime != null dose: doseTime != null
? doseTime['id'] ? doseTime['parameterCode']
.toString() .toString()
: widget.dose, : widget.dose,
enteredRemarks: enteredRemarks:

@ -41,6 +41,9 @@ class EntityListCheckboxSearchWidget extends StatefulWidget {
class _EntityListCheckboxSearchWidgetState class _EntityListCheckboxSearchWidgetState
extends State<EntityListCheckboxSearchWidget> { extends State<EntityListCheckboxSearchWidget> {
int selectedType = 1; int selectedType = 1;
int typeUrgent;
int typeRegular;
setSelectedType(int val) { setSelectedType(int val) {
setState(() { setState(() {
selectedType = val; selectedType = val;
@ -136,6 +139,7 @@ class _EntityListCheckboxSearchWidgetState
historyInfo.type = historyInfo.type =
setSelectedType(value) setSelectedType(value)
.toString(); .toString();
historyInfo.type = historyInfo.type =
value.toString(); value.toString();
}, },
@ -149,6 +153,7 @@ class _EntityListCheckboxSearchWidgetState
historyInfo.type = historyInfo.type =
setSelectedType(value) setSelectedType(value)
.toString(); .toString();
historyInfo.type = historyInfo.type =
value.toString(); value.toString();
}, },

@ -324,17 +324,11 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
controls.add( controls.add(
Controls(code: "ordertype", controlValue: '1'), Controls(code: "ordertype", controlValue: '1'),
); );
});
entityList.isNotEmpty controlsProcedure.procedure = element.procedureId;
? entityList.forEach((element) { controlsProcedure.category = element.categoryID;
controlsProcedure.procedure = element.procedureId; controlsProcedure.controls = controls;
controlsProcedure.category = "0" + element.categoryID; });
controlsProcedure.controls = controls;
})
: controlsProcedure.procedure = procedureId;
controlsProcedure.category = categorieId;
controlsProcedure.controls = controls;
// controlsProcedure.add(ProcedureDetail( // controlsProcedure.add(ProcedureDetail(
// category: categorieId, procedure: procedureId, controls: controls)); // category: categorieId, procedure: procedureId, controls: controls));
updateProcedureReqModel.procedureDetail = controlsProcedure; updateProcedureReqModel.procedureDetail = controlsProcedure;

@ -29,7 +29,7 @@ class DrAppToastMsg {
icon: ICON.CLOSE, icon: ICON.CLOSE,
fontSize: 16, fontSize: 16,
imageSize: 35, imageSize: 35,
timeInSeconds: 9000, timeInSeconds: 912,
textColor: Colors.white); textColor: Colors.white);
} }

Loading…
Cancel
Save