From 547b815b61654ceddc3110dc1c50f809a4f07267 Mon Sep 17 00:00:00 2001
From: WaseemAbbasi22 <muhammad.abbasi@cloudsolutions.com.sa>
Date: Tue, 24 Jun 2025 14:34:46 +0300
Subject: [PATCH] End date picker last date changed to current date

---
 .../maintenance_request/components/assistant_employee_card.dart | 2 ++
 .../forms/maintenance_request/components/external_request.dart  | 2 ++
 lib/views/widgets/date_and_time/date_picker.dart                | 2 +-
 lib/views/widgets/timer/app_timer.dart                          | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/modules/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart b/lib/modules/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart
index 04656fe2..09e96ffe 100644
--- a/lib/modules/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart
+++ b/lib/modules/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart
@@ -140,9 +140,11 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
                         ADatePicker(
                           label: context.translation.endTime,
                           hideShadow: true,
+                          from:requestDetailProvider.currentWorkOrder?.data?.requestedDate,
                           backgroundColor: AppColor.neutral100,
                           date: requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.endDate,
                           formatDateWithTime: true,
+                          to: DateTime.now(),
                           onDatePicker: (selectedDate) {
                             showTimePicker(
                               context: context,
diff --git a/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart b/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart
index b58c1634..e0e7269c 100644
--- a/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart
+++ b/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart
@@ -175,6 +175,8 @@ class _ExternalMaintenanceRequestState extends State<ExternalMaintenanceRequest>
                         label: context.translation.endTime,
                         hideShadow: true,
                         backgroundColor: AppColor.neutral100,
+                        from: requestDetailProvider.currentWorkOrder?.data?.requestedDate,
+                        to: DateTime.now(),
                         date: requestDetailProvider.activityMaintenanceHelperModel?.supplierEndTime,
                         formatDateWithTime: true,
                         onDatePicker: (selectedDate) {
diff --git a/lib/views/widgets/date_and_time/date_picker.dart b/lib/views/widgets/date_and_time/date_picker.dart
index a0572575..b06f414c 100644
--- a/lib/views/widgets/date_and_time/date_picker.dart
+++ b/lib/views/widgets/date_and_time/date_picker.dart
@@ -81,7 +81,7 @@ class ADatePicker extends StatelessWidget {
               context: context,
               initialDate: DateTime.now(),
               firstDate: from ?? DateTime.now(),
-              lastDate: to ?? DateTime.now().add(const Duration(days: 365)),
+              lastDate: to ?? DateTime.now(),
             );
             if (picked != null && onDatePicker != null) {
               onDatePicker!(picked); // Use null-aware operator
diff --git a/lib/views/widgets/timer/app_timer.dart b/lib/views/widgets/timer/app_timer.dart
index daaad568..7833918f 100644
--- a/lib/views/widgets/timer/app_timer.dart
+++ b/lib/views/widgets/timer/app_timer.dart
@@ -187,6 +187,7 @@ class _AppTimerState extends State<AppTimer> {
                 enable: _pickerStartAt != null,
                 from:_pickerStartAt,
                 date: _pickerEndAt,
+                to: DateTime.now(),
                 formatDateWithTime: true,
                 onDatePicker: (selectedDate) {
                   showTimePicker(