|
|
|
|
@ -80,10 +80,15 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
|
|
|
|
|
Container(
|
|
|
|
|
|
|
|
|
|
child: Expanded(
|
|
|
|
|
child: Texts(projectViewModel.isArabic ? selectedAllergy
|
|
|
|
|
.selectedAllergy.nameAr : selectedAllergy
|
|
|
|
|
.selectedAllergy.nameEn.toUpperCase(),
|
|
|
|
|
child: Texts(
|
|
|
|
|
projectViewModel.isArabic
|
|
|
|
|
? selectedAllergy.selectedAllergy.nameAr
|
|
|
|
|
: selectedAllergy.selectedAllergy.nameEn
|
|
|
|
|
.toUpperCase(),
|
|
|
|
|
variant: "bodyText",
|
|
|
|
|
textDecoration: selectedAllergy.isChecked
|
|
|
|
|
? null
|
|
|
|
|
: TextDecoration.lineThrough,
|
|
|
|
|
bold: true,
|
|
|
|
|
color: Colors.black),
|
|
|
|
|
),
|
|
|
|
|
@ -95,17 +100,21 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
|
|
|
|
|
.selectedAllergySeverity.nameEn
|
|
|
|
|
.toUpperCase(),
|
|
|
|
|
variant: "bodyText",
|
|
|
|
|
textDecoration: selectedAllergy.isChecked
|
|
|
|
|
? null
|
|
|
|
|
: TextDecoration.lineThrough,
|
|
|
|
|
bold: true,
|
|
|
|
|
color: AppGlobal.appPrimaryColor),
|
|
|
|
|
InkWell(
|
|
|
|
|
child: Icon(
|
|
|
|
|
FontAwesomeIcons.trash,
|
|
|
|
|
color: Colors.grey,
|
|
|
|
|
size: 20,
|
|
|
|
|
),
|
|
|
|
|
onTap: () => removeAllergy(selectedAllergy),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
if(selectedAllergy.isChecked)
|
|
|
|
|
InkWell(
|
|
|
|
|
child: Icon(
|
|
|
|
|
FontAwesomeIcons.trash,
|
|
|
|
|
color: Colors.grey,
|
|
|
|
|
size: 20,
|
|
|
|
|
),
|
|
|
|
|
onTap: () => removeAllergy(selectedAllergy),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 10,
|
|
|
|
|
@ -119,13 +128,22 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
removeAllergy(MySelectedAllergy mySelectedAllergy) {
|
|
|
|
|
Iterable<MySelectedAllergy> allergy =
|
|
|
|
|
widget.myAllergiesList.where((element) => mySelectedAllergy == element);
|
|
|
|
|
List<MySelectedAllergy> allergy =
|
|
|
|
|
// ignore: missing_return
|
|
|
|
|
widget.myAllergiesList.where((element) =>
|
|
|
|
|
mySelectedAllergy.selectedAllergySeverity.id ==
|
|
|
|
|
element.selectedAllergySeverity.id &&
|
|
|
|
|
mySelectedAllergy.selectedAllergy.id == element.selectedAllergy.id
|
|
|
|
|
).toList();
|
|
|
|
|
|
|
|
|
|
if (allergy.length > 0)
|
|
|
|
|
if (allergy.length > 0) {
|
|
|
|
|
setState(() {
|
|
|
|
|
widget.myAllergiesList.remove(allergy.first);
|
|
|
|
|
allergy[0].isChecked = false;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
print(allergy);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
openAllergiesList(BuildContext context) {
|
|
|
|
|
@ -137,14 +155,29 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
|
|
|
|
|
return AddAllergies(
|
|
|
|
|
addAllergiesFun: (MySelectedAllergy mySelectedAllergy) {
|
|
|
|
|
setState(() {
|
|
|
|
|
if (!widget.myAllergiesList.contains(mySelectedAllergy)) {
|
|
|
|
|
List<MySelectedAllergy> allergy =
|
|
|
|
|
// ignore: missing_return
|
|
|
|
|
widget.myAllergiesList.where((element) =>
|
|
|
|
|
mySelectedAllergy.selectedAllergy.id ==
|
|
|
|
|
element.selectedAllergy.id
|
|
|
|
|
).toList();
|
|
|
|
|
if (allergy.isEmpty) {
|
|
|
|
|
widget.myAllergiesList.add(mySelectedAllergy);
|
|
|
|
|
Navigator.of(context).pop();
|
|
|
|
|
} else {
|
|
|
|
|
helpers.showErrorToast(TranslationBase
|
|
|
|
|
.of(context)
|
|
|
|
|
.itemExist);
|
|
|
|
|
allergy.first.selectedAllergy =
|
|
|
|
|
mySelectedAllergy.selectedAllergy;
|
|
|
|
|
allergy.first.selectedAllergySeverity =
|
|
|
|
|
mySelectedAllergy.selectedAllergySeverity;
|
|
|
|
|
allergy.first.remark = mySelectedAllergy.remark;
|
|
|
|
|
allergy.first.isChecked = mySelectedAllergy.isChecked;
|
|
|
|
|
|
|
|
|
|
// helpers.showErrorToast(TranslationBase
|
|
|
|
|
// .of(context)
|
|
|
|
|
// .itemExist);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Navigator.of(context).pop();
|
|
|
|
|
});
|
|
|
|
|
},);
|
|
|
|
|
});
|
|
|
|
|
@ -353,9 +386,10 @@ class _AddAllergiesState extends State<AddAllergies> {
|
|
|
|
|
title: "Add".toUpperCase(),
|
|
|
|
|
onPressed: () {
|
|
|
|
|
MySelectedAllergy mySelectedAllergy = new MySelectedAllergy(
|
|
|
|
|
remark: remarkController.text,
|
|
|
|
|
selectedAllergy: _selectedAllergy,
|
|
|
|
|
selectedAllergySeverity: _selectedAllergySeverity);
|
|
|
|
|
remark: remarkController.text,
|
|
|
|
|
selectedAllergy: _selectedAllergy,
|
|
|
|
|
isChecked: true,
|
|
|
|
|
selectedAllergySeverity: _selectedAllergySeverity,);
|
|
|
|
|
widget.addAllergiesFun(mySelectedAllergy);
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
|