Merge branch 'development' into home-refactoring

merge-requests/648/head
mosazaid 5 years ago
commit 1bb299fef4

@ -385,7 +385,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
true; true;
visbiltySearch = false; visbiltySearch = false;
_selectedMedication = _selectedMedication =
model.allMedicationList[index]; model.allMedicationList[
index];
uom = _selectedMedication uom = _selectedMedication
.uom; .uom;
}, },
@ -405,8 +406,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
AppText(
AppText(_selectedMedication?.description??"",bold: true,), _selectedMedication?.description ??
"",
bold: true,
),
Container( Container(
child: Row( child: Row(
children: [ children: [
@ -431,12 +435,23 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
SizedBox( SizedBox(
height: spaceBetweenTextFileds), height: spaceBetweenTextFileds),
Container( Container(
height: screenSize.height * 0.070, //height: screenSize.height * 0.062,
height: MediaQuery.of(context)
.size
.height *
0.06,
width: double.infinity, width: double.infinity,
child: Row( child: Row(
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, height: MediaQuery.of(context)
.size
.height *
0.06,
width: MediaQuery.of(context)
.size
.width *
0.35,
child: TextFields( child: TextFields(
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter( LengthLimitingTextInputFormatter(
@ -445,7 +460,12 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
// .digitsOnly // .digitsOnly
], ],
hintText: hintText:
TranslationBase.of(context).strength, TranslationBase.of(
context)
.strength,
fontWeight: FontWeight.w500,
fontSize: 14.0,
borderWidth: 0.2,
controller: controller:
strengthController, strengthController,
keyboardType: TextInputType keyboardType: TextInputType
@ -505,11 +525,15 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
width: 10.0, width: 10.0,
), ),
Container( Container(
height: MediaQuery.of(context)
.size
.height *
0.06,
color: Colors.white, color: Colors.white,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.450, 0.560,
child: InkWell( child: InkWell(
onTap: onTap:
model.itemMedicineListUnit != model.itemMedicineListUnit !=
@ -556,11 +580,20 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
: null, : null,
child: TextField( child: TextField(
decoration: decoration:
textFieldSelectorDecoration('Select', textFieldSelectorDecoration(
'Select',
model.itemMedicineListUnit.length == 1 model.itemMedicineListUnit
? units = model.itemMedicineListUnit[0]['description'] .length ==
: units != null ? units['description'].toString() : null, 1
? units = model
.itemMedicineListUnit[0]
[
'description']
: units !=
null
? units['description']
.toString()
: null,
true), true),
enabled: false), enabled: false),
), ),

Loading…
Cancel
Save