From 35b16dc8edcd35b384b036fb6139f07de6b05d7e Mon Sep 17 00:00:00 2001
From: Vaibhav Surve <vaibhav.surve@marcoaiot.com>
Date: Sat, 3 May 2025 15:30:12 +0530
Subject: [PATCH] handelled the requested button

---
 lib/view/dashboard/attendanceScreen.dart | 47 +++++++++++++-----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/lib/view/dashboard/attendanceScreen.dart b/lib/view/dashboard/attendanceScreen.dart
index 7124673..33e02e0 100644
--- a/lib/view/dashboard/attendanceScreen.dart
+++ b/lib/view/dashboard/attendanceScreen.dart
@@ -507,6 +507,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
         DataCell(
           ElevatedButton(
             onPressed: (log.activity == 5 ||
+                    log.activity == 2 || // Add this condition for activity 2
                     (log.activity == 4 &&
                         !(log.checkOut != null &&
                             log.checkIn != null &&
@@ -525,7 +526,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
 
                     int updatedAction;
                     String actionText;
-
+                    bool imageCapture = true;
                     if (log.activity == 0) {
                       updatedAction = 0;
                       actionText = "Check In";
@@ -539,6 +540,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                           log.checkIn!.isBefore(twoDaysAgo)) {
                         updatedAction = 2;
                         actionText = "Request Regularize";
+                        imageCapture = false;
                       } else if (log.checkOut != null &&
                           log.checkOut!.isBefore(twoDaysAgo)) {
                         updatedAction = 2;
@@ -568,6 +570,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                       int.parse(attendanceController.selectedProjectId!),
                       comment: actionText,
                       action: updatedAction,
+                      imageCapture: imageCapture,
                     );
 
                     ScaffoldMessenger.of(context).showSnackBar(
@@ -611,26 +614,28 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                           log.checkIn != null &&
                           DateTime.now().difference(log.checkIn!).inDays <= 2)
                       ? ButtonActions.checkIn
-                      : (log.activity == 4)
-                          ? ButtonActions.approved
-                          : (log.activity == 0)
-                              ? ButtonActions.checkIn
-                              : (log.activity == 1 &&
-                                      log.checkOut != null &&
-                                      DateTime.now()
-                                              .difference(log.checkOut!)
-                                              .inDays <=
-                                          2)
-                                  ? ButtonActions.checkOut
-                                  : (log.activity == 2 ||
-                                          (log.activity == 1 &&
-                                              log.checkOut == null &&
-                                              log.checkIn != null &&
-                                              log.checkIn!.isBefore(
-                                                  DateTime.now().subtract(
-                                                      Duration(days: 2)))))
-                                      ? ButtonActions.requestRegularize
-                                      : ButtonActions.checkOut,
+                      : (log.activity == 2) // Change text when activity is 2
+                          ? "Requested"
+                          : (log.activity == 4)
+                              ? ButtonActions.approved
+                              : (log.activity == 0)
+                                  ? ButtonActions.checkIn
+                                  : (log.activity == 1 &&
+                                          log.checkOut != null &&
+                                          DateTime.now()
+                                                  .difference(log.checkOut!)
+                                                  .inDays <=
+                                              2)
+                                      ? ButtonActions.checkOut
+                                      : (log.activity == 2 ||
+                                              (log.activity == 1 &&
+                                                  log.checkOut == null &&
+                                                  log.checkIn != null &&
+                                                  log.checkIn!.isBefore(
+                                                      DateTime.now().subtract(
+                                                          Duration(days: 2)))))
+                                          ? ButtonActions.requestRegularize
+                                          : ButtonActions.checkOut,
             ),
           ),
         )