From 6841a8563f77a05b52848ae7e715e0d4001da56b Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Wed, 15 Nov 2023 09:43:40 +0300 Subject: [PATCH] Sub work order screen under testing --- lib/l10n/app_ar.arb | 5 ++++- lib/l10n/app_en.arb | 5 ++++- .../create_sub_workorder_page.dart | 18 +++++++++--------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index abaf7b6f..e7c6540e 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -364,5 +364,8 @@ "total" : "مجموع", "allRequests" : "كل الطلبات", "requestStatus" : "حالة الطلب", - "createSubWorkOrder" : "إنشاء أمر عمل فرعي" + "createSubWorkOrder" : "إنشاء أمر عمل فرعي", + "mrNumber" : "MR Number", + "vendorEng" : "المهندس المزود", + "vendorName" : "اسم المزود" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 7eb486a1..1713c757 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -366,5 +366,8 @@ "noDataFound" : "No Data Found", "allRequests" : "All Requests", "requestStatus" : "Request Status", - "createSubWorkOrder" : "Create Sub Work Order" + "createSubWorkOrder" : "Create Sub Work Order", + "mrNumber" : "MR Number", + "vendorEng" : "Vendor Engineer", + "vendorName" : "Vendor Name" } \ No newline at end of file diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 0d18d5d1..796e1b9b 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -197,7 +197,7 @@ class _CreateSubWorkOrderPageState extends State { ), if (_subWorkOrders.calllastSituation?.value == 12) AppTextFormField( - labelText: "MR number", + labelText: context.translation.mrNumber, initialValue: _subWorkOrders.mrNumber, onSaved: (value) { _subWorkOrders.mrNumber = value; @@ -207,7 +207,7 @@ class _CreateSubWorkOrderPageState extends State { if (_showVendorFields) SingleItemDropDownMenu( context: context, - title: "Vendor Engineer", + title: context.translation.vendorEng, initialValue: _subWorkOrders.supplier, onSelect: (supplier) { if (supplier != null) { @@ -221,7 +221,7 @@ class _CreateSubWorkOrderPageState extends State { if (_showVendorFields) SingleItemDropDownMenu( context: context, - title: "Vendor Name", + title: context.translation.vendorName, enabled: _subWorkOrders.supplier?.suppPersons?.isNotEmpty ?? false, staticData: _subWorkOrders.supplier.suppPersons, onSelect: (suppPerson) { @@ -280,9 +280,9 @@ class _CreateSubWorkOrderPageState extends State { label: context.translation.submitRequest, onPressed: () async { setState(() {}); + _subWorkOrders.suppEngineerWorkOrders ?? []; + if (engineer != null) _subWorkOrders.suppEngineerWorkOrders.add(engineer..id = 0); if (await validate()) { - _subWorkOrders.suppEngineerWorkOrders ?? []; - if (engineer != null) _subWorkOrders.suppEngineerWorkOrders.add(engineer..id = 0); _subWorkOrders.attachmentsWorkOrder ??= []; for (var file in _files) { _subWorkOrders.attachmentsWorkOrder.add(Attachment(id: 0, name: "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}")); @@ -334,11 +334,11 @@ class _CreateSubWorkOrderPageState extends State { } else if (_subWorkOrders.calllastSituation == null) { Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.callLastSituation}"); return false; - } else if (_showVendorFields && (_subWorkOrders.supplier.suppliername == null || _subWorkOrders.supplier.suppliername.isEmpty)) { - await Fluttertoast.showToast(msg: "Vendor Name Field is Required"); - return false; } else if (_showVendorFields && _subWorkOrders.suppEngineerWorkOrders == null) { - await Fluttertoast.showToast(msg: "Vendor Engineer Field is Required"); + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.vendorEng}"); + return false; + } else if (_showVendorFields && (_subWorkOrders.supplier.suppliername == null || _subWorkOrders.supplier.suppliername.isEmpty)) { + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.vendorName}"); return false; } else if (_subWorkOrders.calllastSituation.value == 12 && (_subWorkOrders.sparePartsWorkOrders == null || _subWorkOrders.sparePartsWorkOrders.isEmpty)) { Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.partNo}");