From c4a6d9ad6f4bafd5ffb24dde83cb330d927d2fbb Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 4 May 2021 12:58:18 +0300 Subject: [PATCH] prescription changes --- .../prescription/add_prescription_form.dart | 28 +++++++++++++++---- pubspec.lock | 8 +++--- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 07bf9d81..09d9f29e 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -641,8 +641,14 @@ class _PrescriptionFormWidgetState extends State { context) .route, route != null - ? route[ - 'description'] + ? model.itemMedicineListRoute + .length == + 1 + ? model.itemMedicineListRoute[ + 0][ + 'description'] + : route[ + 'description'] : null, true), enabled: false, @@ -726,8 +732,14 @@ class _PrescriptionFormWidgetState extends State { context) .frequency, frequency != null - ? frequency[ - 'description'] + ? model.itemMedicineList + .length == + 1 + ? model.itemMedicineList[ + 0][ + 'description'] + : frequency[ + 'description'] : null, true), enabled: false, @@ -1382,8 +1394,12 @@ class _PrescriptionFormWidgetState extends State { doseTimeIn: doseTime['id'].toString(), model: widget.model, duration: duration['id'].toString(), - frequency: frequency['parameterCode'].toString(), - route: route['parameterCode'].toString(), + frequency: model.itemMedicineList.length == 1 + ? model.itemMedicineList[0]['parameterCode'] + : frequency['parameterCode'].toString(), + route: model.itemMedicineListRoute.length == 1 + ? model.itemMedicineListRoute[0]['parameterCode'] + : route['parameterCode'].toString(), drugId: _selectedMedication.itemId.toString(), strength: strengthController.text, indication: indicationController.text, diff --git a/pubspec.lock b/pubspec.lock index ee31002d..1a572a0a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -573,7 +573,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.2" + version: "0.6.3-nullsafety.1" json_annotation: dependency: transitive description: @@ -615,7 +615,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0-nullsafety.4" mime: dependency: transitive description: @@ -907,7 +907,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0-nullsafety.2" sticky_headers: dependency: "direct main" description: @@ -1098,5 +1098,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <2.11.0" + dart: ">=2.10.0 <=2.11.0-213.1.beta" flutter: ">=1.22.0 <2.0.0"