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

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

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

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

Loading…
Cancel
Save