From e16d91a1b8ef29e0829a47028127d0ca211488bf Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 5 May 2021 12:49:26 +0300 Subject: [PATCH 1/4] add prescription form changes --- .../prescription/add_prescription_form.dart | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index fd7c09cf..27a9c53f 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -385,7 +385,8 @@ class _PrescriptionFormWidgetState extends State { true; visbiltySearch = false; _selectedMedication = - model.allMedicationList[index]; + model.allMedicationList[ + index]; uom = _selectedMedication .uom; }, @@ -405,8 +406,11 @@ class _PrescriptionFormWidgetState extends State { child: Container( child: Column( children: [ - - AppText(_selectedMedication?.description??"",bold: true,), + AppText( + _selectedMedication?.description ?? + "", + bold: true, + ), Container( child: Row( children: [ @@ -431,12 +435,15 @@ class _PrescriptionFormWidgetState extends State { SizedBox( height: spaceBetweenTextFileds), Container( - height: screenSize.height * 0.070, + height: screenSize.height * 0.076, width: double.infinity, child: Row( children: [ Container( - width: MediaQuery.of(context).size.width * 0.35, + width: MediaQuery.of(context) + .size + .width * + 0.35, child: TextFields( inputFormatters: [ LengthLimitingTextInputFormatter( @@ -445,7 +452,12 @@ class _PrescriptionFormWidgetState extends State { // .digitsOnly ], hintText: - TranslationBase.of(context).strength, + TranslationBase.of( + context) + .strength, + fontWeight: FontWeight.w500, + fontSize: 14.0, + borderWidth: 0.2, controller: strengthController, keyboardType: TextInputType @@ -509,7 +521,7 @@ class _PrescriptionFormWidgetState extends State { width: MediaQuery.of(context) .size .width * - 0.450, + 0.560, child: InkWell( onTap: model.itemMedicineListUnit != @@ -556,11 +568,20 @@ class _PrescriptionFormWidgetState extends State { : null, child: TextField( decoration: - textFieldSelectorDecoration('Select', - - model.itemMedicineListUnit.length == 1 - ? units = model.itemMedicineListUnit[0]['description'] - : units != null ? units['description'].toString() : null, + textFieldSelectorDecoration( + 'Select', + model.itemMedicineListUnit + .length == + 1 + ? units = model + .itemMedicineListUnit[0] + [ + 'description'] + : units != + null + ? units['description'] + .toString() + : null, true), enabled: false), ), From c17d3d63e02af511bd857b50dcc3f3389ba4913e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 5 May 2021 13:36:35 +0300 Subject: [PATCH 2/4] hot fix --- lib/screens/prescription/add_prescription_form.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 27a9c53f..22e91415 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -435,7 +435,7 @@ class _PrescriptionFormWidgetState extends State { SizedBox( height: spaceBetweenTextFileds), Container( - height: screenSize.height * 0.076, + height: screenSize.height * 0.062, width: double.infinity, child: Row( children: [ From ca11da36b3a4bc3da4c813a10413959163e2a241 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 5 May 2021 14:17:59 +0300 Subject: [PATCH 3/4] hot fix --- lib/screens/prescription/add_prescription_form.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 22e91415..9fcd20cc 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -435,7 +435,11 @@ class _PrescriptionFormWidgetState extends State { SizedBox( height: spaceBetweenTextFileds), Container( - height: screenSize.height * 0.062, + //height: screenSize.height * 0.062, + height: MediaQuery.of(context) + .size + .height * + 0.06, width: double.infinity, child: Row( children: [ From ed8da38bc9dde5aa30d749c52b599c0a598f5409 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 5 May 2021 15:04:41 +0300 Subject: [PATCH 4/4] hot fix --- lib/screens/prescription/add_prescription_form.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 9fcd20cc..91536aeb 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -444,6 +444,10 @@ class _PrescriptionFormWidgetState extends State { child: Row( children: [ Container( + height: MediaQuery.of(context) + .size + .height * + 0.06, width: MediaQuery.of(context) .size .width * @@ -521,6 +525,10 @@ class _PrescriptionFormWidgetState extends State { width: 10.0, ), Container( + height: MediaQuery.of(context) + .size + .height * + 0.06, color: Colors.white, width: MediaQuery.of(context) .size