validation added for forms

design_3.0_demo_module
WaseemAbbasi22 3 months ago
parent 20b362142c
commit 1df25cc9dd

@ -45,6 +45,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
MedicalGasFormModel _medicalGasFormModel = MedicalGasFormModel(); MedicalGasFormModel _medicalGasFormModel = MedicalGasFormModel();
MedicalGasSupplierModel? medicalGasInfo; MedicalGasSupplierModel? medicalGasInfo;
late MedicalGasInspectionProvider medicalGasInspectionProvider; late MedicalGasInspectionProvider medicalGasInspectionProvider;
late SiteProvider siteProvider;
bool isGasInfoLoading = false; bool isGasInfoLoading = false;
@override @override
@ -52,10 +53,14 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
super.initState(); super.initState();
// Provider.of<MedicalGasSupplierProvider>(context, listen: false).reset(); // Provider.of<MedicalGasSupplierProvider>(context, listen: false).reset();
medicalGasInspectionProvider = Provider.of<MedicalGasInspectionProvider>(context, listen: false); medicalGasInspectionProvider = Provider.of<MedicalGasInspectionProvider>(context, listen: false);
siteProvider = Provider.of<SiteProvider>(context, listen: false);
_populateFormData(); _populateFormData();
} }
_populateFormData() { _populateFormData() {
if (siteProvider.items.isEmpty) {
siteProvider.reset();
}
if (widget.dataModel != null) { if (widget.dataModel != null) {
MedicalGasDataModel dataModel = widget.dataModel!; MedicalGasDataModel dataModel = widget.dataModel!;
_medicalGasFormModel = MedicalGasFormModel( _medicalGasFormModel = MedicalGasFormModel(
@ -97,7 +102,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
context: context, context: context,
title: "Order Type", title: "Order Type",
validator: (value) { validator: (value) {
if (value == null) return "Mandatory"; if (value == null) return "Please select order type";
return null; return null;
}, },
initialValue: _medicalGasFormModel.orderType, initialValue: _medicalGasFormModel.orderType,
@ -113,7 +118,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
context: context, context: context,
title: "Item Type", title: "Item Type",
validator: (value) { validator: (value) {
if (value == null) return "Mandatory"; if (value == null) return "Please select item type";
return null; return null;
}, },
initialValue: _medicalGasFormModel.itemType, initialValue: _medicalGasFormModel.itemType,
@ -238,25 +243,25 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
labelText: model.itemName, labelText: model.itemName,
hintText: 'Enter Quantity'.addTranslation, hintText: 'Enter Quantity'.addTranslation,
backgroundColor: AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
initialValue: model.requestedQuantity != null ? model.requestedQuantity.toString() : '', initialValue: model.requestedQuantity != null ? model.requestedQuantity?.toStringAsFixed(0) : '',
// initialValue: model.value != null ? model.value.toString() : '', // initialValue: model.value != null ? model.value.toString() : '',
textAlign: TextAlign.center, textAlign: TextAlign.center,
validator: (value) { // validator: (value) {
if (value == null || value.trim().isEmpty) { // if (value == null || value.trim().isEmpty) {
return "This field is required"; // return "This field is required";
} // }
//
final intVal = int.tryParse(value); // final intVal = int.tryParse(value);
if (intVal == null) { // if (intVal == null) {
return "Enter a valid number"; // return "Enter a valid number";
} // }
//
if (intVal <= 0) { // if (intVal <= 0) {
return "Value must be greater than 0"; // return "Value must be greater than 0";
} // }
//
return null; // return null;
}, // },
textInputType: TextInputType.number, textInputType: TextInputType.number,
labelStyle: AppTextStyles.textFieldLabelStyle, labelStyle: AppTextStyles.textFieldLabelStyle,
showShadow: false, showShadow: false,

@ -36,6 +36,8 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
late MedicalGasInspectionProvider medicalGasInspectionProvider; late MedicalGasInspectionProvider medicalGasInspectionProvider;
bool pressureTestAcknowledgement = false; bool pressureTestAcknowledgement = false;
bool leakTestAcknowledgement = false; bool leakTestAcknowledgement = false;
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
// List<MedicalGasRequestDetailModel> selectedItemList = []; // List<MedicalGasRequestDetailModel> selectedItemList = [];
@ -56,7 +58,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
MedicalGasDataModel dataModel = widget.dataModel!; MedicalGasDataModel dataModel = widget.dataModel!;
formModel = DeliveryNotesFormModel( formModel = DeliveryNotesFormModel(
id: dataModel.id, id: dataModel.id,
deliveredItemList: dataModel.requestDetailDtos, deliveredItemList: dataModel.requestDetailDtos.where((item) => item.requestedQuantity! > 0).toList(),
isInspectedGasLeak: dataModel.isInspectedGasLeak, isInspectedGasLeak: dataModel.isInspectedGasLeak,
isPressureChecked: dataModel.isPressureChecked, isPressureChecked: dataModel.isPressureChecked,
deliveredDate: dataModel.deliveredDate, deliveredDate: dataModel.deliveredDate,
@ -79,6 +81,8 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
// }, // },
), ),
body: SafeArea( body: SafeArea(
child: Form(
key: _formKey,
child: Column( child: Column(
children: [ children: [
ListView( ListView(
@ -110,10 +114,10 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
AppTextFormField( AppTextFormField(
initialValue: formModel.deliveryNoteNumber, initialValue: formModel.deliveryNoteNumber,
labelText: "Delivery Notes", labelText: "Delivery Notes",
validator: (value) { // validator: (value) {
if ((value ?? "").isEmpty) return "Mandatory"; // if ((value ?? "").isEmpty) return "Delivery Notes Required";
return null; // return null;
}, // },
backgroundColor: AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)), labelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
floatingLabelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)), floatingLabelStyle: AppTextStyles.textFieldLabelStyle.copyWith(color: AppColor.textColor(context)),
@ -281,6 +285,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
), ),
], ],
), ),
),
)); ));
// .handlePopScope( // .handlePopScope(
// cxt: context, // cxt: context,
@ -290,6 +295,24 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
} }
void _update({required BuildContext context, bool isSubmitted = false}) async { void _update({required BuildContext context, bool isSubmitted = false}) async {
if (!_formKey.currentState!.validate()) return;
if (formModel.deliveredDate == null) {
'Delivered Date Required'.addTranslation.showToast;
return;
}
if (formModel.deliveryNoteNumber == null) {
'Delivery Notes Required'.addTranslation.showToast;
return;
}
if (formModel.isPressureChecked == null || formModel.isPressureChecked == false) {
'Please acknowledge cylinders are tested for pressure'.addTranslation.showToast;
return;
}
if (formModel.isInspectedGasLeak == null || formModel.isInspectedGasLeak == false) {
'Please acknowledge cylinders have been inspected for leak test'.addTranslation.showToast;
return;
}
_formKey.currentState?.save();
formModel.gasDeliveredQuantityDtos = []; formModel.gasDeliveredQuantityDtos = [];
formModel.isSubmitted = isSubmitted; formModel.isSubmitted = isSubmitted;
for (var item in formModel.deliveredItemList) { for (var item in formModel.deliveredItemList) {
@ -331,7 +354,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
color: context.isDark ? Colors.white : AppColor.white936, color: context.isDark ? Colors.white : AppColor.white936,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
'Req Qty ${model.requestedQuantity}'.bodyText2(context).custom( 'Req Qty ${model.requestedQuantity?.toStringAsFixed(0)}'.bodyText2(context).custom(
color: context.isDark ? Colors.white : AppColor.white936, color: context.isDark ? Colors.white : AppColor.white936,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -357,16 +380,32 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
return null; return null;
}, },
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(horizontal: 5.toScreenWidth), isDense: true,
contentPadding: EdgeInsets.symmetric(
horizontal: 5.toScreenWidth,
vertical: 6, // keeps normal height ~30
),
filled: true, filled: true,
fillColor: AppColor.fieldBgColor(context), fillColor: AppColor.fieldBgColor(context),
constraints: BoxConstraints(
maxHeight: 30.toScreenHeight,
),
border: border, border: border,
enabledBorder: border, enabledBorder: border,
focusedBorder: border, focusedBorder: border,
errorStyle: const TextStyle(
height: 1.2, // controls extra height when error appears
fontSize: 12,
),
), ),
// decoration: InputDecoration(
// contentPadding: EdgeInsets.symmetric(horizontal: 5.toScreenWidth),
// filled: true,
// fillColor: AppColor.fieldBgColor(context),
// constraints: BoxConstraints(
// maxHeight: 40.toScreenHeight,
// ),
// border: border,
// enabledBorder: border,
// focusedBorder: border,
// ),
onChanged: (value) { onChanged: (value) {
model.deliveredQuantity = int.tryParse(value); model.deliveredQuantity = int.tryParse(value);
}, },
@ -387,7 +426,7 @@ class _ItemRowLayout extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Expanded(child: left), // Items column Expanded(child: left), // Items column
SizedBox( SizedBox(

Loading…
Cancel
Save