diff --git a/lib/views/pages/user/requests/first_action_bottom_sheet.dart b/lib/views/pages/user/requests/first_action_bottom_sheet.dart index 30d322f8..1abdcff4 100644 --- a/lib/views/pages/user/requests/first_action_bottom_sheet.dart +++ b/lib/views/pages/user/requests/first_action_bottom_sheet.dart @@ -3,6 +3,7 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/user_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'; @@ -104,6 +105,11 @@ class _FirstActionBottomSheetState extends State { selectedTime.minute, ); if (selectedDateTime != null) { + if (selectedDateTime.isBefore(DateTime.parse(_serviceRequest.date))) { + "Visit Date time must be greater then request date".showToast; + return; + } + setState(() { _serviceRequest.visitDate = selectedDateTime?.toIso8601String(); }); diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index 52fc7624..134a5235 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -10,6 +10,7 @@ import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_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'; @@ -39,8 +40,6 @@ import '../../../../widgets/images/multi_image_picker.dart'; import '../../../../widgets/status/report/service_report_fault_description.dart'; import '../../../../widgets/status/report/service_report_repair_location.dart'; import '../../../../widgets/timer/app_timer.dart'; - -/// todo : TBD (compare with the design) class CreateServiceReport extends StatefulWidget { static const String id = "/create-service-report"; final ServiceRequest request; @@ -171,6 +170,10 @@ class _CreateServiceReportState extends State with TickerPr selectedTime.minute, ); if (selectedDateTime != null) { + if (selectedDateTime.isBefore(DateTime.parse(widget.request.date))) { + "Return to service Date time must be greater then request date".showToast; + return; + } setState(() { _serviceReport.visitDate = selectedDateTime?.toIso8601String(); });