Merge branch 'fix-issues' into 'development'

bug fixing

See merge request Cloud_Solution/doctor_app_flutter!302
merge-requests/304/merge
Mohammad Aljammal 5 years ago
commit bf747d5427

@ -543,11 +543,9 @@ 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) {
return Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: indicationList != null onTap: indicationList != null
@ -557,13 +555,12 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
list: indicationList, list: indicationList,
attributeName: 'name', attributeName: 'name',
attributeValueId: 'id', attributeValueId: 'id',
okText: TranslationBase.of( okText:
context) TranslationBase.of(context)
.ok, .ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
indication = indication = selectedValue;
selectedValue;
}); });
}, },
); );
@ -578,9 +575,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
} }
: null, : null,
child: TextField( child: TextField(
decoration: decoration: textFieldSelectorDecoration(
textFieldSelectorDecoration( model.patientAssessmentList[0]
element.icdCode10ID .icdCode10ID
.toString(), .toString(),
indication != null indication != null
? indication['name'] ? indication['name']
@ -590,9 +587,57 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
readOnly: 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