improvement.

# Conflicts:
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart

lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart

@@ -236,6 +236,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
                   itemCount: medicalGasInfo!.attributeInfo!.length,
                   shrinkWrap: true,
                   physics: const NeverScrollableScrollPhysics(),
+                  padding: EdgeInsets.zero,
                   itemBuilder: (context, index) {
                     AttributeInfo model = medicalGasInfo!.attributeInfo![index];
                     return AppTextFormField(

lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart

@@ -123,10 +123,7 @@ class _MedicalGasInspectionDetailPageState extends State<MedicalGasInspectionDet
                                   }
                                   return;
                                 }
-                                bool? isRefresh = await Navigator.of(context).push(MaterialPageRoute(
+                                bool? isRefresh = await Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateMedicalGasRequestPage(dataModel: model)));
-                                    builder: (_) => CreateMedicalGasRequestPage(
-                                          dataModel: model,
-                                        )));
                                 if (isRefresh == true) {
                                   _loadData();
                                 }

lib/modules/medical_gas_inspection/models/medical_gas_supplier_model.dart

@@ -49,7 +49,7 @@ class AttributeInfo {
   AttributeInfo.fromJson(Map<String, dynamic> json) {
     id = json['id'];
     medicalGasAttributeId = json['medicalGasAttributeId'];
-    requestedQuantity = json['requestedQuantity'];
+    requestedQuantity = json['value'] ?? json['requestedQuantity'];
     value = json['value'];
     itemName = json['itemName'];
     oracleName = json['oracleName'];

lib/modules/medical_gas_inspection/update_delivery_notes_page.dart

@@ -370,9 +370,9 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
             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;
         },

lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart

@@ -88,8 +88,8 @@ class _RecurrentTaskInfoWidgetState extends State<RecurrentTaskInfoWidget> {
               '${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.assignedEmployee, value: widget.model!.engineer?.userName ?? ""),
-            InfoTextWidget(label: context.translation.scheduledDate, value: widget.model!.scheduleDate!.toMonthYearFormat),
+            InfoTextWidget(label: context.translation.scheduledDate, value: widget.model!.scheduleDate!.toServiceRequestDetailsFormat),
           ],
         ).toShadowContainer(context),
         12.height,

lib/modules/traf_module/traf_request_item_view.dart

@@ -43,7 +43,6 @@ class TrafRequestItemView extends StatelessWidget {
               InfoDateWidget(requestData!.transactionDate ?? ""),
             ],
           ),
-          8.height,
           InfoHeaderWidget(requestData?.typeTransaction ?? "Assessment of Need & Technology"),
           InfoTextWidget(label: context.translation.requestType, value: requestData?.requestTypeName),
           InfoTextWidget(label: "Request No", value: requestData?.requestNo, showArrow: true),
@@ -74,7 +73,6 @@ class TrafRequestItemView extends StatelessWidget {
             InfoDateWidget(requestDetails!.date ?? ""),
           ],
         ),
-        8.height,
         InfoHeaderWidget(requestDetails?.nameOfType ?? "Assessment of Need & Technology"),
         InfoTextWidget(label: context.translation.requestType, value: requestDetails!.requestType),
         InfoTextWidget(label: "Request No", value: requestDetails!.requestNo),

lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart

@@ -42,7 +42,6 @@ class RecurrentWoItemView extends StatelessWidget {
               InfoDateWidget(requestData!.transactionDate ?? ""),
             ],
           ),
-          8.height,
           InfoHeaderWidget(requestData?.typeTransaction ?? context.translation.recurrentWo),
           InfoTextWidget(label: context.translation.taskNo, value: requestData!.requestNo),
           InfoTextWidget(label: context.translation.taskNo, value: requestData!.requestNo),
@@ -79,7 +78,6 @@ class RecurrentWoItemView extends StatelessWidget {
               InfoDateWidget(requestDetails!.date ?? ""),
             ],
           ),
-          8.height,
           InfoHeaderWidget(requestDetails?.nameOfType ?? context.translation.recurrentWo),
           InfoTextWidget(
             label: context.translation.taskNo,