From 981f5f82005be05a651dc6e81919759561508d41 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 2 Apr 2024 14:41:50 +0300 Subject: [PATCH] point 36 improvement. --- .../create_sub_workorder_page.dart | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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 f95fe85..e3bade3 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -10,6 +10,7 @@ import 'package:test_sa/controllers/providers/api/status_drop_down/report/servic import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/device/asset.dart'; @@ -147,10 +148,7 @@ class _CreateSubWorkOrderPageState extends State { if (isCurrentUserIsAssistantEmp) { // _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)]; _subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))]; - } - else { - - } + } else {} print("isCurrentUserIsAssistantEmp:$isCurrentUserIsAssistantEmp:${widget.workOrder.assistantEmployees?.length}"); if (_callRequestForWorkOrder == null) { _partsProvider = Provider.of(context); @@ -202,6 +200,11 @@ class _CreateSubWorkOrderPageState extends State { selectedTime.minute, ); if (selectedDateTime != null) { + if (_subWorkOrders.visitDate != null && selectedDateTime.isBefore(DateTime.parse(_subWorkOrders.visitDate))) { + "Visit Date time must be greater then previous date".showToast; + return; + } + setState(() { _subWorkOrders.visitDate = selectedDateTime?.toIso8601String(); }); @@ -257,7 +260,7 @@ class _CreateSubWorkOrderPageState extends State { title: context.translation.reason, initialValue: _subWorkOrders.reason, onSelect: (value) { - if(value!=null) { + if (value != null) { _subWorkOrders.reason = value; } }, @@ -268,10 +271,9 @@ class _CreateSubWorkOrderPageState extends State { title: context.translation.equipmentStatus, initialValue: _subWorkOrders.equipmentStatus, onSelect: (value) { - if(value!=null) { + if (value != null) { _subWorkOrders.equipmentStatus = value; } - }, ), 8.height, @@ -392,7 +394,7 @@ class _CreateSubWorkOrderPageState extends State { title: context.translation.assignAssistant, assetId: widget.workOrder?.callRequest?.asset?.id, - initialValue: (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) ? _subWorkOrders.assistantEmployees?.first : null, + initialValue: (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) ? _subWorkOrders.assistantEmployees?.first : null, // initialValue: !isCurrentAssigned // ? (widget.workOrder.assistantEmployees?.first) // : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) @@ -477,7 +479,7 @@ class _CreateSubWorkOrderPageState extends State { if (signature == null || signature.isEmpty) return; _subWorkOrders.localEngSignature = signature; _subWorkOrders.engSignature = signature != null ? "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}" : null; - }, + }, ), 8.height, ESignature(