fix issues

merge-requests/452/head
Elham Rababah 5 years ago
parent ff2c31ee35
commit c1adb9eeff

@ -304,7 +304,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
isExpanded: isAllergiesExpand, isExpanded: isAllergiesExpand,
), ),
SizedBox( SizedBox(
height:MediaQuery.of(context).size.height * 0.2, height:MediaQuery.of(context).size.height * 0.16,
), ),
], ],
), ),
@ -324,13 +324,13 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.height * 0.15, .height * 0.1,
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 15, height: 10,
), ),
Container(child: FractionallySizedBox( Container(child: FractionallySizedBox(
widthFactor: .80, widthFactor: .80,
@ -351,7 +351,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
), ),
),), ),),
SizedBox( SizedBox(
height: 15, height: 5,
), ),
], ],
),), ),),

@ -68,8 +68,6 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
// baseViewModel: model, // baseViewModel: model,
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false, isShowAppBar: false,
// appBarTitle: TranslationBase.of(context).healthRecordInformation,
// TODO mousa removed the singleChildScrollView
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

@ -87,220 +87,164 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
SizedBox( SizedBox(
height: 10, height: 10,
), ),
FractionallySizedBox( Expanded(
widthFactor: 0.9, child: FractionallySizedBox(
child: Container( widthFactor: 0.9,
height: MediaQuery.of(context).size.height * 0.60, child: Container(
child: ListView.builder( height: MediaQuery.of(context).size.height * 0.60,
itemCount: items.length, child: ListView.builder(
itemBuilder: (context, index) { itemCount: items.length,
bool isSelected = widget.isServiceSelected( itemBuilder: (context, index) {
items[index]); bool isSelected = widget.isServiceSelected(
MySelectedAllergy mySelectedAllergy;
if (isSelected) {
mySelectedAllergy = widget
.getServiceSelectedAllergy(
items[index]); items[index]);
} MySelectedAllergy mySelectedAllergy;
TextEditingController remarkController = TextEditingController( if (isSelected) {
text: isSelected ? mySelectedAllergy mySelectedAllergy = widget
.remark : null); .getServiceSelectedAllergy(
TextEditingController severityController = TextEditingController( items[index]);
text: isSelected ? mySelectedAllergy }
.selectedAllergySeverity != null TextEditingController remarkController = TextEditingController(
? projectViewModel text: isSelected ? mySelectedAllergy
.isArabic .remark : null);
? mySelectedAllergy TextEditingController severityController = TextEditingController(
.selectedAllergySeverity text: isSelected ? mySelectedAllergy
.nameAr .selectedAllergySeverity != null
: mySelectedAllergy ? projectViewModel
.selectedAllergySeverity .isArabic
.nameEn ? mySelectedAllergy
: null : null); .selectedAllergySeverity
return Column( .nameAr
children: [ : mySelectedAllergy
InkWell( .selectedAllergySeverity
onTap: () { .nameEn
setState(() { : null : null);
if (widget.isServiceSelected( return Column(
items[index])) { children: [
widget InkWell(
.removeAllergy( onTap: () {
items[index]); setState(() {
} else { if (widget.isServiceSelected(
// TODO add Allergy items[index])) {
widget
.removeAllergy(
items[index]);
} else {
// TODO add Allergy
MySelectedAllergy MySelectedAllergy
mySelectedAllergy = mySelectedAllergy =
new MySelectedAllergy( new MySelectedAllergy(
selectedAllergy: selectedAllergy:
items[index], items[index],
selectedAllergySeverity: selectedAllergySeverity:
_selectedAllergySeverity, _selectedAllergySeverity,
remark: null, remark: null,
isChecked: true); isChecked: true);
widget.addAllergy( widget.addAllergy(
mySelectedAllergy); mySelectedAllergy);
} }
}); });
}, },
child: Column( child: Column(
children: [ children: [
Row( Row(
children: [ children: [
Checkbox( Checkbox(
value: widget value: widget
.isServiceSelected( .isServiceSelected(
items[index]), items[index]),
activeColor: activeColor:
Colors.red[800], Colors.red[800],
onChanged: (bool newValue) { onChanged: (bool newValue) {
// setState(() { // setState(() {
// if (widget // if (widget
// .isServiceSelected(items[index])) { // .isServiceSelected(items[index])) {
// widget.removeHistory(items[index]); // widget.removeHistory(items[index]);
// } else { // } else {
// widget.addHistory(items[index]); // widget.addHistory(items[index]);
// } // }
// }); // });
}), }),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets padding: const EdgeInsets
.symmetric( .symmetric(
horizontal: 10, horizontal: 10,
vertical: 0), vertical: 0),
child: AppText( child: AppText(
projectViewModel.isArabic projectViewModel.isArabic
? items[index] ? items[index]
.nameAr != .nameAr !=
"" ""
? items[index] ? items[index]
.nameAr .nameAr
: items[index] : items[index]
.nameEn .nameEn
: items[index].nameEn, : items[index].nameEn,
color: Color(0xFF575757), color: Color(0xFF575757),
fontSize: 16, fontSize: 16,
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
),
), ),
), ),
), ],
],
),
if(widget
.isServiceSelected(
items[index]))
Column(children: [
TextFields(
onTapTextFields: widget.model
.allergySeverityList !=
null
? () {
MasterKeyDailog dialog =
MasterKeyDailog(
list: widget.model
.allergySeverityList,
okText:
TranslationBase.of(
context)
.ok,
okFunction:
(selectedValue) {
setState(() {
mySelectedAllergy
.selectedAllergySeverity =
selectedValue;
});
},
);
showDialog(
barrierDismissible:
false,
context: context,
builder: (BuildContext
context) {
return dialog;
},
);
}
: null,
hasLabelText:
mySelectedAllergy
.selectedAllergySeverity !=
null
? true
: false,
showLabelText: true,
hintText:
TranslationBase
.of(context)
.selectSeverity,
fontSize: 13.5,
readOnly: true,
// hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 2,
minLines: 1,
controller: severityController,
validator: (value) {
if (value == null)
return TranslationBase
.of(
context)
.emptyMessage;
else
return null;
}),
SizedBox(
height: 5,
), ),
if(isSubmitted && if(widget
mySelectedAllergy .isServiceSelected(
.selectedAllergySeverity == null) items[index]))
Row( Column(children: [
TextFields(
children: [ onTapTextFields: widget.model
CustomValidationError(), .allergySeverityList !=
], null
mainAxisAlignment: MainAxisAlignment.start, ? () {
), MasterKeyDailog dialog =
MasterKeyDailog(
SizedBox( list: widget.model
height: 10, .allergySeverityList,
), okText:
Container( TranslationBase.of(
margin: EdgeInsets.only( context)
left: 0, right: 0, top: 15), .ok,
child: TextFields( okFunction:
(selectedValue) {
setState(() {
mySelectedAllergy
.selectedAllergySeverity =
selectedValue;
});
},
);
showDialog(
barrierDismissible:
false,
context: context,
builder: (BuildContext
context) {
return dialog;
},
);
}
: null,
hasLabelText: hasLabelText:
remarkController.text != mySelectedAllergy
'' .selectedAllergySeverity !=
null
? true ? true
: false, : false,
showLabelText: true, showLabelText: true,
hintText: TranslationBase hintText:
.of( TranslationBase
context) .of(context)
.remarks, .selectSeverity,
fontSize: 13.5, fontSize: 13.5,
readOnly: true,
// hintColor: Colors.black, // hintColor: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
maxLines: 25, maxLines: 2,
minLines: 10, minLines: 1,
initialValue: isSelected controller: severityController,
? mySelectedAllergy
.remark : '',
// controller: remarkControlle
onChanged: (value) {
if (isSelected) {
mySelectedAllergy
.remark = value;
};
},
validator: (value) { validator: (value) {
if (value == null) if (value == null)
return TranslationBase return TranslationBase
@ -310,18 +254,76 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
else else
return null; return null;
}), }),
), SizedBox(
SizedBox( height: 5,
height: 10, ),
), if(isSubmitted &&
],) mySelectedAllergy
], .selectedAllergySeverity == null)
Row(
children: [
CustomValidationError(),
],
mainAxisAlignment: MainAxisAlignment.start,
),
SizedBox(
height: 10,
),
Container(
margin: EdgeInsets.only(
left: 0, right: 0, top: 15),
child: TextFields(
hasLabelText:
remarkController.text !=
''
? true
: false,
showLabelText: true,
hintText: TranslationBase
.of(
context)
.remarks,
fontSize: 13.5,
// hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 25,
minLines: 10,
initialValue: isSelected
? mySelectedAllergy
.remark : '',
// controller: remarkControlle
onChanged: (value) {
if (isSelected) {
mySelectedAllergy
.remark = value;
};
},
validator: (value) {
if (value == null)
return TranslationBase
.of(
context)
.emptyMessage;
else
return null;
}),
),
SizedBox(
height: 10,
),
],)
],
),
), ),
), // DividerWithSpacesAround(),
// DividerWithSpacesAround(), ],
], );
); },
}, ),
), ),
), ),
), ),

Loading…
Cancel
Save