point 36 improvement.

main_design2.0
Sikander Saleem 2 years ago
parent e3954ecfe9
commit 981f5f8200

@ -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/controllers/providers/api/status_drop_down/report/service_types_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.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/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/models/device/asset.dart';
@ -147,10 +148,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
if (isCurrentUserIsAssistantEmp) { if (isCurrentUserIsAssistantEmp) {
// _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)]; // _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)];
_subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))]; _subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))];
} } else {}
else {
}
print("isCurrentUserIsAssistantEmp:$isCurrentUserIsAssistantEmp:${widget.workOrder.assistantEmployees?.length}"); print("isCurrentUserIsAssistantEmp:$isCurrentUserIsAssistantEmp:${widget.workOrder.assistantEmployees?.length}");
if (_callRequestForWorkOrder == null) { if (_callRequestForWorkOrder == null) {
_partsProvider = Provider.of<PartsProvider>(context); _partsProvider = Provider.of<PartsProvider>(context);
@ -202,6 +200,11 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
selectedTime.minute, selectedTime.minute,
); );
if (selectedDateTime != null) { 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(() { setState(() {
_subWorkOrders.visitDate = selectedDateTime?.toIso8601String(); _subWorkOrders.visitDate = selectedDateTime?.toIso8601String();
}); });
@ -257,7 +260,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
title: context.translation.reason, title: context.translation.reason,
initialValue: _subWorkOrders.reason, initialValue: _subWorkOrders.reason,
onSelect: (value) { onSelect: (value) {
if(value!=null) { if (value != null) {
_subWorkOrders.reason = value; _subWorkOrders.reason = value;
} }
}, },
@ -268,10 +271,9 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
title: context.translation.equipmentStatus, title: context.translation.equipmentStatus,
initialValue: _subWorkOrders.equipmentStatus, initialValue: _subWorkOrders.equipmentStatus,
onSelect: (value) { onSelect: (value) {
if(value!=null) { if (value != null) {
_subWorkOrders.equipmentStatus = value; _subWorkOrders.equipmentStatus = value;
} }
}, },
), ),
8.height, 8.height,
@ -392,7 +394,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
title: context.translation.assignAssistant, title: context.translation.assignAssistant,
assetId: widget.workOrder?.callRequest?.asset?.id, 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 // initialValue: !isCurrentAssigned
// ? (widget.workOrder.assistantEmployees?.first) // ? (widget.workOrder.assistantEmployees?.first)
// : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) // : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false)
@ -477,7 +479,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
if (signature == null || signature.isEmpty) return; if (signature == null || signature.isEmpty) return;
_subWorkOrders.localEngSignature = signature; _subWorkOrders.localEngSignature = signature;
_subWorkOrders.engSignature = signature != null ? "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}" : null; _subWorkOrders.engSignature = signature != null ? "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}" : null;
}, },
), ),
8.height, 8.height,
ESignature( ESignature(

Loading…
Cancel
Save