Merge branch 'prescription_changes' into 'development'

add prescription form changes

See merge request Cloud_Solution/doctor_app_flutter!647
merge-requests/649/merge
Mohammad Aljammal 5 years ago
commit 00d6a3cead

@ -385,7 +385,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
true;
visbiltySearch = false;
_selectedMedication =
model.allMedicationList[index];
model.allMedicationList[
index];
uom = _selectedMedication
.uom;
},
@ -405,8 +406,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
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<PrescriptionFormWidget> {
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<PrescriptionFormWidget> {
// .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<PrescriptionFormWidget> {
width: MediaQuery.of(context)
.size
.width *
0.450,
0.560,
child: InkWell(
onTap:
model.itemMedicineListUnit !=
@ -556,11 +568,20 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
: 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),
),

Loading…
Cancel
Save