Merge branch 'refs/heads/main_production_ai_enhancement_rollout_changes' into ui_ux_rollout_merge

# Conflicts:
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart
ui_ux_rollout_merge
Sikander Saleem 5 days ago
commit dc49e0dc6c

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

@ -123,10 +123,7 @@ class _MedicalGasInspectionDetailPageState extends State<MedicalGasInspectionDet
} }
return; 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) { if (isRefresh == true) {
_loadData(); _loadData();
} }

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

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

@ -88,8 +88,8 @@ class _RecurrentTaskInfoWidgetState extends State<RecurrentTaskInfoWidget> {
'${context.translation.floor}: ${widget.model!.floor?.name ?? "-"}'.bodyText2(context).custom(color: AppColor.neutral120), '${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), '${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), ).toShadowContainer(context),
12.height, 12.height,

Loading…
Cancel
Save