diff --git a/lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart b/lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart index c4c9042f..d5f8163c 100644 --- a/lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart +++ b/lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart @@ -236,6 +236,7 @@ class _CreateMedicalGasRequestPageState extends State CreateMedicalGasRequestPage( - dataModel: model, - ))); + bool? isRefresh = await Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateMedicalGasRequestPage(dataModel: model))); if (isRefresh == true) { _loadData(); } diff --git a/lib/modules/medical_gas_inspection/models/medical_gas_supplier_model.dart b/lib/modules/medical_gas_inspection/models/medical_gas_supplier_model.dart index 323fcfba..b6fa4b55 100644 --- a/lib/modules/medical_gas_inspection/models/medical_gas_supplier_model.dart +++ b/lib/modules/medical_gas_inspection/models/medical_gas_supplier_model.dart @@ -49,7 +49,7 @@ class AttributeInfo { AttributeInfo.fromJson(Map json) { id = json['id']; medicalGasAttributeId = json['medicalGasAttributeId']; - requestedQuantity = json['requestedQuantity']; + requestedQuantity = json['value'] ?? json['requestedQuantity']; value = json['value']; itemName = json['itemName']; oracleName = json['oracleName']; diff --git a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart index 1a0dfae5..f616d663 100644 --- a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart +++ b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart @@ -370,9 +370,9 @@ class _UpdateDeliveryNotesState extends State { return "Enter a valid number"; } - if (intVal <= 0) { - return "Value must be greater than 0"; - } + // if (intVal <= 0) { + // return "Value must be greater than 0"; + // } return null; }, diff --git a/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart b/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart index 7164d7b1..e76ca8bd 100644 --- a/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart +++ b/lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart @@ -88,8 +88,8 @@ class _RecurrentTaskInfoWidgetState extends State { '${context.translation.floor}: ${widget.model!.floor?.name ?? "-"}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.room}: ${widget.model!.room?.name ?? "-"}'.bodyText2(context).custom(color: AppColor.neutral120), ], - InfoTextWidget(label: context.translation.assignedEmployee, value: widget.model!.engineer!.userName ?? ""), - InfoTextWidget(label: context.translation.scheduledDate, value: widget.model!.scheduleDate!.toMonthYearFormat), + InfoTextWidget(label: context.translation.assignedEmployee, value: widget.model!.engineer?.userName ?? ""), + InfoTextWidget(label: context.translation.scheduledDate, value: widget.model!.scheduleDate!.toServiceRequestDetailsFormat), ], ).toShadowContainer(context), 12.height,