From d26cbb36a9fdd46915a5a928cabc0fb0b2f2efbf Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 24 Jun 2026 15:03:17 +0300 Subject: [PATCH] rollout sheet fixes. --- .../create_medical_gas_request_page.dart | 1 + .../medical_gas_inspection_detail_page.dart | 8 ++------ .../models/medical_gas_supplier_model.dart | 2 +- .../update_delivery_notes_page.dart | 6 +++--- .../recurrent_wo/components/task_info_widget.dart | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) 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 88813f58..03b577a9 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 @@ -237,6 +237,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 45f2e604..73d24c57 100644 --- a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart +++ b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart @@ -371,9 +371,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 9446e975..20147948 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,7 +88,7 @@ class _RecurrentTaskInfoWidgetState extends State { '${context.translation.room}: ${widget.model!.room?.name ?? "-"}'.bodyText2(context).custom(color: AppColor.neutral120), ], '${context.translation.assignedEmployee}: ${widget.model!.engineer?.userName ?? ""}'.bodyText2(context).custom(color: AppColor.neutral120), - '${context.translation.scheduledDate}: ${widget.model!.scheduleDate!.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120), + '${context.translation.scheduledDate}: ${widget.model!.scheduleDate!.toServiceRequestDetailsFormat}'.bodyText2(context).custom(color: AppColor.neutral120), ], ).toShadowContainer(context), 12.height,