bug fixing

merge-requests/302/head
hussam al-habibeh 5 years ago
parent 5bde14813a
commit 3d60813146

@ -543,56 +543,101 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
),
),
SizedBox(height: spaceBetweenTextFileds),
//model.patientAssessmentList.forEach((element) { }).
Column(
children: model.patientAssessmentList
.map((element) {
return Container(
height: screenSize.height * 0.070,
child: InkWell(
onTap: indicationList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: indicationList,
attributeName: 'name',
attributeValueId: 'id',
okText: TranslationBase.of(
context)
.ok,
okFunction: (selectedValue) {
setState(() {
indication =
selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration:
textFieldSelectorDecoration(
element.icdCode10ID
.toString(),
indication != null
? indication['name']
: null,
true),
enabled: true,
readOnly: true,
),
if (model.patientAssessmentList.isNotEmpty)
Container(
height: screenSize.height * 0.070,
child: InkWell(
onTap: indicationList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: indicationList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context)
.ok,
okFunction: (selectedValue) {
setState(() {
indication = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
model.patientAssessmentList[0]
.icdCode10ID
.toString(),
indication != null
? indication['name']
: null,
true),
enabled: true,
readOnly: true,
),
);
}).toList(),
),
),
),
//model.patientAssessmentList.forEach((element) { }).
// Column(
// children: model.patientAssessmentList
// .map((element) {
// return Container(
// height: screenSize.height * 0.070,
// child: InkWell(
// onTap: indicationList != null
// ? () {
// ListSelectDialog dialog =
// ListSelectDialog(
// list: indicationList,
// attributeName: 'name',
// attributeValueId: 'id',
// okText: TranslationBase.of(
// context)
// .ok,
// okFunction: (selectedValue) {
// setState(() {
// indication =
// selectedValue;
// });
// },
// );
// showDialog(
// barrierDismissible: false,
// context: context,
// builder:
// (BuildContext context) {
// return dialog;
// },
// );
// }
// : null,
// child: TextField(
// decoration:
// textFieldSelectorDecoration(
// element.icdCode10ID
// .toString(),
// indication != null
// ? indication['name']
// : null,
// true),
// enabled: true,
// readOnly: true,
// ),
// ),
// );
// }).toList(),
// ),
SizedBox(height: spaceBetweenTextFileds),
Container(

@ -221,7 +221,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
setSelectedType(value);
},
),
Text(TranslationBase.of(context).regular),
Text('routine'),
Radio(
activeColor: Color(0xFFB9382C),
groupValue: selectedType,

@ -259,11 +259,11 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
),
Expanded(
child: Container(
height: MediaQuery.of(
context)
.size
.height *
0.21,
// height: MediaQuery.of(
// context)
// .size
// .height *
// 0.21,
width: MediaQuery.of(
context)
.size
@ -312,7 +312,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
AppText(
model.procedureList[0].entityList[index].orderType ==
1
? 'Regular'
? 'Routine'
: 'Urgent',
fontSize:
13.0,

@ -212,7 +212,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
setSelectedType(value);
},
),
Text(TranslationBase.of(context).regular),
Text('routine'),
],
),
),

Loading…
Cancel
Save