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