improvements & fixes

main_design2.0
Sikander Saleem 2 years ago
parent 2c2e968c91
commit 6bb2b81ac3

@ -126,7 +126,13 @@ extension CapExtension on String {
String get allInCaps => toUpperCase();
String get capitalizeFirstOfEach => trim().isNotEmpty ? trim().toLowerCase().split(" ").map((str) => str.inCaps).join(" ") : "";
String get cleanupWhitespace => replaceAll(RegExp(r"\s+"), " ");
String get capitalizeFirstOfEach => trim().isNotEmpty
? trim().toLowerCase().split(" ").map((str) {
return str.trim()?.inCaps ?? "";
}).join(" ")
: "";
}
extension FilesExtension on String {

@ -262,7 +262,7 @@
"filter" : "تصنيف",
"pickAsset" : "إختر جهاز",
"firstAction" : "الإجراء الأول",
"priority" : "أولوية الوظيفة",
"priority" : "أولوية الطلب",
"equipmentStatus" : "حالة المعدات",
"jopStatus" : "حالة الوظيفة",
"attachImage" : "إرفاق صورة",

@ -267,7 +267,7 @@
"viewWorkOrder" : "View All Work Order",
"createWorkOrder" : "Create Work Order",
"serviceDetails": "Service Details",
"priority" : "Jop Priority",
"priority" : "Request Priority",
"equipmentStatus" : "Equipment Status",
"jopStatus" : "Jop Status",
"attachImage" : "Attach Image",

@ -30,6 +30,7 @@ class GasRefillModel {
this.department,
this.assignedEmployee,
this.status,
this.comment,
this.gazRefillDetails,
this.localEngineerSignature,
this.localNurseSignature,
@ -45,6 +46,7 @@ class GasRefillModel {
startTime = json['startTime'];
endDate = json['endDate'];
endTime = json['endTime'];
comment = json['comment'];
workingHours = json['workingHours'];
try {
final sd = DateTime.tryParse(startDate ?? "");
@ -95,6 +97,7 @@ class GasRefillModel {
Department department;
AssignedEmployee assignedEmployee;
Lookup status;
String comment;
List<GasRefillDetails> gazRefillDetails;
Uint8List localNurseSignature;
Uint8List localEngineerSignature;
@ -118,6 +121,7 @@ class GasRefillModel {
Department department,
AssignedEmployee assignedEmployee,
Lookup status,
String comment,
List<GasRefillDetails> gazRefillDetails,
TimerModel timer,
}) =>
@ -139,6 +143,7 @@ class GasRefillModel {
department: department ?? this.department,
assignedEmployee: assignedEmployee ?? this.assignedEmployee,
status: status ?? this.status,
comment: comment ?? this.comment,
gazRefillDetails: gazRefillDetails ?? this.gazRefillDetails,
timer: timer ?? this.timer,
);
@ -156,6 +161,7 @@ class GasRefillModel {
map['engSignature'] = engSignature;
map['nurseSignature'] = nurseSignature;
map['workingHours'] = workingHours;
map['comment'] = comment;
if (site != null) {
map['site'] = site.toJson(addBuildings: false);
}
@ -210,6 +216,7 @@ class GasRefillModel {
startDate = model.startDate;
endDate = model.endDate;
expectedDate = model.expectedDate;
comment = model.comment;
assignedEmployee = model.assignedEmployee;
localEngineerSignature = model.localEngineerSignature;
localNurseSignature = model.localNurseSignature;

@ -150,13 +150,13 @@ class ServiceRequest {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.priority}");
return false;
} else if (defectType == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.jopStatus}");
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}");
return false;
} else if (requestedThrough == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.status}");
return false;
} else if (type == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.costCodeName}");
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.requestType}");
return false;
}
return true;

@ -1,14 +0,0 @@
import 'package:flutter/material.dart';
class MyAssetsPage extends StatelessWidget {
const MyAssetsPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return const Scaffold(
body: Center(
child: Text("My Assets"),
),
);
}
}

@ -49,8 +49,8 @@ class AssetItemView extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
context.translation.deviceTransferRequest.heading5(context),
"${context.translation.from} : ${request.siteTransferFrom}".bodyText(context),
"${context.translation.to} : ${request.siteTransferTo}".bodyText(context),
"${context.translation.from} : ${request.siteTransferFrom?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
"${context.translation.to} : ${request.siteTransferTo?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
request.status.replaceAll("=", ":").bodyText(context),
],
),

@ -43,7 +43,7 @@ class GasRefillItemView extends StatelessWidget {
8.height,
context.translation.gasRefillRequest.heading5(context),
'${context.translation.gasType}: ${request.gasType}'.bodyText(context),
'${context.translation.site}: ${request.site}'.bodyText(context),
'${context.translation.site}: ${request.site?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
8.height,
Row(
mainAxisSize: MainAxisSize.min,

@ -43,7 +43,7 @@ class ServiceRequestItemView extends StatelessWidget {
),
8.height,
context.translation.serviceRequest.heading5(context),
'${context.translation.assetName}: ${request.assetName}'.bodyText(context),
'${context.translation.assetName}: ${request.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context),
'${context.translation.requestType}: ${request.requestType}'.bodyText(context),
'${context.translation.requestNo}: ${request.requestNo}'.bodyText(context),

@ -218,6 +218,15 @@ class _NewGasRefillRequestPageState extends State<NewGasRefillRequestPage> {
);
},
),
8.height,
AppTextFormField(
labelText: context.translation.comments,
textInputType: TextInputType.multiline,
alignLabelWithHint: true,
onSaved: (text) {
_gasModel.comment = text;
},
),
40.height,
],
),

@ -72,7 +72,8 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildTextWidget('${context.translation.assetName} : ${_model?.assetName ?? ""}'),
_buildTextWidget('${context.translation.requestNo} : ${_model.transferCode ?? ""}'),
_buildTextWidget('${context.translation.assetName} : ${_model?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? ""}'),
_buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber ?? ""}'),
_buildTextWidget('${context.translation.model} : ${_model?.modelName ?? ""}'),
_buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? ""}'),

@ -225,7 +225,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
8.height,
SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
context: context,
title: context.translation.jopStatus,
title: context.translation.equipmentStatus,
initialValue: _subWorkOrders.equipmentStatus,
onSelect: (value) {
_subWorkOrders.equipmentStatus = value;
@ -437,7 +437,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.reason}");
return false;
} else if (_subWorkOrders.equipmentStatus == null) {
Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.jopStatus}");
Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}");
return false;
} else if (_subWorkOrders.calllastSituation == null) {
Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.callLastSituation}");

@ -109,11 +109,16 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
8.height,
'${context.translation.gasRequest}: ${gasRefillModel.gazRefillDetails[0].gasType?.name}'.bodyText(context),
'${context.translation.cylinderSize}: ${gasRefillModel.gazRefillDetails[0].cylinderSize?.name}'.bodyText(context),
'${context.translation.site}: ${gasRefillModel.site?.name}'.bodyText(context),
'${context.translation.site}: ${gasRefillModel.site?.name?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
const Divider().defaultStyle(context),
'${context.translation.requestedQuantity}: ${gasRefillModel.gazRefillDetails[0]?.requestedQty ?? 0}'.bodyText(context),
'${context.translation.deliveredQuantity}: ${gasRefillModel.gazRefillDetails[0]?.deliverdQty ?? 0}'.bodyText(context),
8.height,
if (gasRefillModel.comment?.isEmpty ?? false) ...[
const Divider().defaultStyle(context),
gasRefillModel.comment.bodyText(context),
8.height,
]
],
).expanded,
Column(

@ -146,7 +146,7 @@ class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
8.height,
SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
context: context,
title: context.translation.jopStatus,
title: context.translation.equipmentStatus,
initialValue: _serviceRequest?.defectType,
onSelect: (value) {
_serviceRequest.defectType = value;
@ -165,7 +165,7 @@ class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _){
return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>(
context: context,
title: context.translation.costCodeName,
title: context.translation.requestType,
enabled: false,
initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: () => null),
// onSelect: (value) {

@ -86,7 +86,7 @@ class _ServiceRequestDetailsPageState extends State<ServiceRequestDetailsPage> {
],
),
8.height,
Text(serviceRequest.deviceEnName, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
Text(serviceRequest.deviceEnName?.cleanupWhitespace?.capitalizeFirstOfEach, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
8.height,
Text(
'${context.translation.assetNumber}: ${serviceRequest.device.assetNumber}',
@ -127,11 +127,11 @@ class _ServiceRequestDetailsPageState extends State<ServiceRequestDetailsPage> {
const Divider().defaultStyle(context),
8.height,
Text(
'${context.translation.manufacture}: ${serviceRequest.device.modelDefinition.manufacturerName}',
'${context.translation.manufacture}: ${serviceRequest.device.modelDefinition.manufacturerName?.cleanupWhitespace?.capitalizeFirstOfEach}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
),
Text(
'${context.translation.model}: ${serviceRequest.device.modelDefinition.modelName}',
'${context.translation.model}: ${serviceRequest.device.modelDefinition.modelName?.cleanupWhitespace?.capitalizeFirstOfEach}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
),
8.height,

@ -89,7 +89,7 @@ class _UpdateServiceRequestPageState extends State<UpdateServiceRequestPage> {
8.height,
SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
context: context,
title: context.translation.jopStatus,
title: context.translation.equipmentStatus,
initialValue: widget.serviceRequest?.defectType,
onSelect: (value) {
widget.serviceRequest.defectType = value;
@ -107,7 +107,7 @@ class _UpdateServiceRequestPageState extends State<UpdateServiceRequestPage> {
8.height,
SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>(
context: context,
title: context.translation.costCodeName,
title: context.translation.requestType,
initialValue: widget.serviceRequest?.type,
onSelect: (value) {
widget.serviceRequest.type = value;

@ -185,7 +185,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
8.height,
SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
context: context,
title: context.translation.jopStatus,
title: context.translation.equipmentStatus,
initialValue: _serviceReport.equipmentStatus,
onSelect: (value) {
_serviceReport.equipmentStatus = value;

@ -170,7 +170,7 @@ class _EditServiceReportState extends State<EditServiceReport> with TickerProvid
8.height,
SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
context: context,
title: context.translation.jopStatus,
title: context.translation.equipmentStatus,
initialValue: _serviceReport.equipmentStatus,
onSelect: (value) {
_serviceReport.equipmentStatus = value;

@ -57,7 +57,7 @@ class WorkOrderDetailsPage extends StatelessWidget {
Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
8.height,
Text(
'${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName}',
'${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
),
Text(

@ -67,7 +67,7 @@ class WorkOrderListPage extends StatelessWidget {
8.height,
Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)),
Text(
'${context.translation.assetName}: ${workOrders[index].callRequest.asset.modelDefinition.assetName}',
'${context.translation.assetName}: ${workOrders[index].callRequest.asset.modelDefinition.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
),
Text(

@ -96,7 +96,7 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
backgroundColor: AppColor.getRequestStatusColorByName(context, _assetProvider.assetById.commissioningStatus.name),
),
if (_assetProvider.assetById.commissioningStatus != null) 8.height,
(_assetProvider.assetById?.modelDefinition?.assetName ?? "-").heading5(context),
(_assetProvider.assetById?.modelDefinition?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-").heading5(context),
8.height,
Row(
crossAxisAlignment: CrossAxisAlignment.start,
@ -108,7 +108,7 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
"${context.translation.modelName}: ${_assetProvider.assetById.modelDefinition.modelName}".bodyText(context),
"${context.translation.supplier}: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}".bodyText(context),
"${context.translation.manufacture}: ${_assetProvider.assetById.modelDefinition.manufacturerName}".bodyText(context),
"${context.translation.location}: ${_assetProvider.assetById.site.custName}".bodyText(context),
"${context.translation.location}: ${_assetProvider.assetById.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
],
).expanded,
8.width,
@ -118,8 +118,8 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
/// TODO: theres no [ORACLE CODE] available to preview
// "${context.translation.oracleCode}: ${"-"}".bodyText(context),
"${context.translation.snNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}".bodyText(context),
"${context.translation.site}: ${_assetProvider.assetById?.site?.custName ?? "-"}".bodyText(context),
"${context.translation.md}: ${_assetProvider.assetById?.modelDefinition?.modelName ?? "-"}".bodyText(context),
"${context.translation.site}: ${_assetProvider.assetById?.site?.custName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
"${context.translation.md}: ${_assetProvider.assetById?.modelDefinition?.modelName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context),
],
).expanded,
],

@ -38,10 +38,10 @@ class AssetItemListView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
device.modelDefinition.assetName.heading6(context),
device.modelDefinition.assetName.cleanupWhitespace.capitalizeFirstOfEach.heading6(context),
8.height,
"${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context),
"${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context),
"${context.translation.modelName} : ${device.modelDefinition.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText(context),
],
),
Row(

Loading…
Cancel
Save