Compare commits

..

No commits in common. '5b5010113b5dd5047eb14bd54e7dcc1a49b3f2e9' and 'fbc7aeeacd01df0cde3b59db5c2be8136416838a' have entirely different histories.

@ -236,7 +236,6 @@ 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,7 +123,10 @@ class _MedicalGasInspectionDetailPageState extends State<MedicalGasInspectionDet
} }
return; return;
} }
bool? isRefresh = await Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateMedicalGasRequestPage(dataModel: model))); bool? isRefresh = await Navigator.of(context).push(MaterialPageRoute(
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['value'] ?? json['requestedQuantity']; requestedQuantity = 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!.toServiceRequestDetailsFormat), InfoTextWidget(label: context.translation.scheduledDate, value: widget.model!.scheduleDate!.toMonthYearFormat),
], ],
).toShadowContainer(context), ).toShadowContainer(context),
12.height, 12.height,

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

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

Loading…
Cancel
Save