src/components/Activities/AttendLogs.jsx

@@ -2,12 +2,27 @@ import React, { useEffect, useState } from "react";
 import { useEmployeeAttendacesLog } from "../../hooks/useAttendance";
 import { convertShortTime } from "../../utils/dateUtils";
 import { useNavigate } from "react-router-dom";
+import { THRESH_HOLD } from "../../utils/constants";
 
 const AttendLogs = ({ Id }) => {
   const { logs, loading } = useEmployeeAttendacesLog(Id);
   const navigate = useNavigate();
 
-  const whichActivityPerform = (actvity) => {
+  const isCheckoutRegularized = (
+    activityTimeStr,
+    checkoutTimeStr,
+    threshHours
+  ) => {
+    if (!activityTimeStr || !checkoutTimeStr) return false;
+
+    const activityTime = new Date(activityTimeStr);
+    const checkoutTime = new Date(checkoutTimeStr);
+    const threshTimeMs = threshHours * 60 * 60 * 1000;
+
+    return checkoutTime - activityTime > threshTimeMs;
+  };
+
+  const whichActivityPerform = (actvity, checkOutTime) => {
     switch (actvity) {
       case 1:
         return (
@@ -24,12 +39,12 @@ const AttendLogs = ({ Id }) => {
       case 2:
         return (
           <i
-            className="bx bx-help-circle text-secondary"
+            className="bx bx-help-circle text-danger"
             data-bs-toggle="tooltip"
             data-bs-offset="0,8"
             data-bs-placement="top"
             data-bs-custom-class="tooltip"
-            title="regularize Requested"
+            title="Regularize Requested"
           ></i>
         );
         break;
@@ -41,14 +56,33 @@ const AttendLogs = ({ Id }) => {
             data-bs-offset="0,8"
             data-bs-placement="top"
             data-bs-custom-class="tooltip"
-            title="Regularized"
+            title="Request Deleted!"
           ></i>
         );
         break;
       case 4:
+        if (
+          checkOutTime &&
+          isCheckoutRegularized(
+            logs[0]?.activityTime,
+            checkOutTime,
+            THRESH_HOLD
+          )
+        ) {
           return (
             <i
-            className="bx bx-left-arrow-circle text-danger "
+              className="bx bx-check-circle text-success"
+              data-bs-toggle="tooltip"
+              data-bs-offset="0,8"
+              data-bs-placement="top"
+              data-bs-custom-class="tooltip"
+              title="Regularized"
+            ></i>
+          );
+        } else {
+          return (
+            <i
+              className="bx bx-left-arrow-circle text-danger"
               data-bs-toggle="tooltip"
               data-bs-offset="0,8"
               data-bs-placement="top"
@@ -56,6 +90,7 @@ const AttendLogs = ({ Id }) => {
               title="Check-Out"
             ></i>
           );
+        }
 
         break;
       case 5:
@@ -79,6 +114,7 @@ const AttendLogs = ({ Id }) => {
     const url = `https://www.google.com/maps?q=${lat},${lng}`;
     window.open(url, "_blank"); // Open in new tab
   };
+
   useEffect(() => {
     const tooltipTriggerList = Array.from(
       document.querySelectorAll('[data-bs-toggle="tooltip"]')
@@ -122,11 +158,13 @@ const AttendLogs = ({ Id }) => {
                   <tr key={index}>
                     <td>{log.activityTime.slice(0, 10)}</td>
                     <td>{convertShortTime(log.activityTime)}</td>
-                    <td>{whichActivityPerform(log.activity)}</td>
+                    <td>
+                      {whichActivityPerform(log.activity, log.activityTime)}
+                    </td>
                     <td>
                       {log?.latitude != 0 ? (
                         <i
-                          className="bx bx-location-plus text-danger  cursor-pointer"
+                          className="bx bx-map text-danger  cursor-pointer"
                           data-bs-toggle="tooltip"
                           data-bs-offset="0,8"
                           data-bs-placement="top"
@@ -146,7 +184,9 @@ const AttendLogs = ({ Id }) => {
                       }`}
                     </td>
                     <td className="text-wrap" colSpan={3}>
-                      {log?.comment || "--"}
+                      {log?.comment?.length > 50
+                        ? `${log.comment.slice(0, 50)}...`
+                        : log.comment || "--"}
                     </td>
                   </tr>
                 ))}

src/components/Project/Infrastructure/WorkArea.jsx

@@ -6,11 +6,20 @@ import { useDispatch } from "react-redux";
 import { refreshData } from "../../../slices/localVariablesSlice";
 import ProjectRepository from "../../../repositories/ProjectRepository";
 import showToast from "../../../services/toastService";
+import {useHasUserPermission} from "../../../hooks/useHasUserPermission";
+import {ASSIGN_REPORT_TASK, MANAGE_PROJECT_INFRA, MANAGE_TASK} from "../../../utils/constants";
+import {useParams} from "react-router-dom";
 
 const WorkArea = ({ workArea, floor, forBuilding }) => {
   const [workItems, setWorkItems] = useState([]);
   const dispatch = useDispatch();
-  const [Project, setProject] = useState();
+  const [ Project, setProject ] = useState();
+  const {projectId} = useParams();
+ 
+    const ManageTasks = useHasUserPermission(MANAGE_TASK);
+    const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
+  const ManageAndAssignTak = useHasUserPermission( ASSIGN_REPORT_TASK );
+  
 
   useEffect(() => {
     const project = getCachedData("projectInfo");
@@ -170,7 +179,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                   className="accordion-collapse collapse"
                   aria-labelledby={`heading-${workArea.id}`}
                 >
-                  <div className="accordion-body p-0">
+                  <div className="accordion-body px-1">
                     <table className="table table-sm mx-1">
                       <thead>
                         <tr>
@@ -189,9 +198,11 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                           <th className="infra-activity-table-header">
                             Progress
                           </th>
+                          {( ManageInfra || ( !projectId && ManageAndAssignTak  ) ) && (
                             <th className="infra-activity-table-header text-end">
                               <span className="px-2">Actions</span>
                             </th>
+                          )}
                         </tr>
                       </thead>
                       <tbody className="table-border-bottom-0">

src/components/Project/Infrastructure/WorkItem.jsx

@@ -178,19 +178,21 @@ const WorkItem = ({
         </td>
 
         <td className="text-center d-none d-md-table-cell">
-          {hasWorkItem ? (
+          {hasWorkItem
-            `${NewWorkItem?.workItem?.completedWork ??
+            ? `${
+                NewWorkItem?.workItem?.completedWork ??
                 workItem?.completedWork ??
-            "0"}/${NewWorkItem?.workItem?.plannedWork ??
+                "0"
+              }/${
+                NewWorkItem?.workItem?.plannedWork ??
                 workItem?.plannedWork ??
-            "0"}`
+                "0"
-          ) : (
+              }`
-            "NA"
+            : "NA"}
-          )}
         </td>
 
         {/* Progress Bar - always visible */}
-        <td className="text-center" style={{ width: "15%" }}>
+        <td className="text-center " style={{ width: "15%" }}>
           <div className="progress p-0">
             <div
               className="progress-bar"
@@ -217,7 +219,11 @@ const WorkItem = ({
         </td>
 
         {/* Actions - always visible */}
-        <td className="text-end align-items-middle ">
+        {(ManageInfra ||
+          (!projectId &&
+            ManageAndAssignTak &&
+            PlannedWork !== CompletedWork)) && (
+          <td className="text-end align-items-middle border-top">
             {/* Desktop (md and up): inline icons */}
             <div className="d-none d-md-flex justify-content-end gap-1 px-2">
               {!projectId &&
@@ -260,13 +266,16 @@ const WorkItem = ({
               ></i>
 
               <ul className="dropdown-menu dropdown-menu-start">
-              {!projectId && ManageAndAssignTak && PlannedWork !== CompletedWork && (
+                {!projectId &&
+                  ManageAndAssignTak &&
+                  PlannedWork !== CompletedWork && (
                     <li>
                       <a
                         className="dropdown-item d-flex align-items-center"
                         onClick={openModal}
                       >
-                    <i className="bx bx-user-plus text-primary me-2"></i> Assign
+                        <i className="bx bx-user-plus text-primary me-2"></i>{" "}
+                        Assign
                       </a>
                     </li>
                   )}
@@ -293,6 +302,7 @@ const WorkItem = ({
               </ul>
             </div>
           </td>
+        )}
       </tr>
     </>
   );

src/hooks/useAttendanceStatus.js

@@ -1,17 +1,16 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react';
-import { timeElapsed } from "../utils/dateUtils";
+import { timeElapsed } from '../utils/dateUtils'; // Make sure it calculates in hours
-import { useSelector } from "react-redux";
+import { THRESH_HOLD } from '../utils/constants';
-import { THRESH_HOLD } from "../utils/constants";
 
+// THRESH_HOLD in hours (e.g., 12, 48, or 60)
 export const ACTIONS = {
   CHECK_IN: 0,
   CHECK_OUT: 1,
   REGULARIZATION: 2,
   REQUESTED: 3,
   APPROVED: 4,
-  REJECTED: 5,
+  REJECTED: 5
 };
-const now = new Date();
 
 const useAttendanceStatus = (attendanceData) => {
   const [status, setStatus] = useState({
@@ -19,133 +18,100 @@ const useAttendanceStatus = (attendanceData) => {
     action: null,
     disabled: true,
     text: "Unknown",
-    color: "btn-secondary",
+    color: 'btn-secondary',
   });
 
   useEffect(() => {
     const { checkInTime, checkOutTime, activity } = attendanceData;
+    const now = new Date();
 
-    if (activity === 0 && checkInTime === null && checkOutTime === null) {
+    const isSameDay = (date1, date2) =>
-      setStatus({
+      new Date(date1).toDateString() === new Date(date2).toDateString();
+
+    // 1. No check-in/check-out yet → Allow Check-In
+    if (activity === 0 && !checkInTime && !checkOutTime) {
+      return setStatus({
         status: "Check-In",
         action: ACTIONS.CHECK_IN,
         disabled: false,
         text: "Check In",
-        color: "btn-primary",
+        color: 'btn-primary',
       });
-    } else if (activity === 4 && new Date(checkOutTime) < now) {
+    }
-      setStatus({
+
-        status: "Approved",
+    // 2. Checked in, no checkout yet
-        action: ACTIONS.APPROVED,
+    if (checkInTime && !checkOutTime) {
-        disabled: true,
+      if (timeElapsed(checkInTime, THRESH_HOLD)) {
-        text: "Approved",
+        return setStatus({
-        color: "btn-success",
-      });
-    } else if (
-      activity === 0 &&
-      checkInTime === null &&
-      checkOutTime === null &&
-      !timeElapsed(checkInTime, THRESH_HOLD)
-    ) {
-      setStatus({
-        status: "Check-In",
-        action: ACTIONS.CHECK_IN,
-        disabled: false,
-        text: "Check In",
-        color: "btn-primary",
-      });
-    } else if (
-      activity === 0 &&
-      checkInTime !== null &&
-      checkOutTime === null &&
-      timeElapsed(checkInTime, THRESH_HOLD)
-    ) {
-      setStatus({
-        status: "Request Regularize",
-        action: ACTIONS.REGULARIZATION,
-        disabled: false,
-        text: "Regularizes",
-        color: "btn-warning",
-      });
-    } else if (
-      activity === 1 &&
-      checkInTime !== null &&
-      checkOutTime === null &&
-      !timeElapsed(checkInTime, THRESH_HOLD)
-    ) {
-      setStatus({
-        status: "Check-Out",
-        action: ACTIONS.CHECK_OUT,
-        disabled: false,
-        text: "Check Out",
-        color: "btn-primary",
-      });
-    } else if (
-      activity === 1 &&
-      checkInTime !== null &&
-      checkOutTime === null &&
-      timeElapsed(checkInTime, THRESH_HOLD)
-    ) {
-      setStatus({
           status: "Request Regularize",
           action: ACTIONS.REGULARIZATION,
           disabled: false,
           text: "Regularize",
-        color: "btn-warning",
+          color: 'btn-warning',
         });
-    } else if (
+      } else {
-      activity === 4 &&
+        return setStatus({
-      checkInTime !== null &&
+          status: "Check-Out",
-      checkOutTime !== null &&
+          action: ACTIONS.CHECK_OUT,
-      !timeElapsed(checkInTime, THRESH_HOLD)
+          disabled: false,
-    ) {
+          text: "Check Out",
-      if (
+          color: 'btn-primary',
-        activity === 4 &&
+        });
-        checkInTime !== null &&
+      }
-        checkOutTime !== null &&
+    }
-        new Date(checkOutTime).toDateString() !== new Date().toDateString()
+
-      ) {
+    // 3. Already checked in and out → Handle activity === 4 (Approved)
-        setStatus({
+    if (checkInTime && checkOutTime && activity === 4) {
+      if (!isSameDay(checkOutTime, now) && !timeElapsed(checkOutTime, THRESH_HOLD)) {
+        return setStatus({
           status: "Approved",
           action: ACTIONS.APPROVED,
           disabled: true,
           text: "Approved",
-          color: "btn-success",
+          color: 'btn-success',
         });
-      } else {
+      } else if (isSameDay(checkOutTime, now)) {
-        setStatus({
+        return setStatus({
           status: "Check-In",
           action: ACTIONS.CHECK_IN,
           disabled: false,
           text: "Check In",
-          color: "btn-primary",
+          color: 'btn-primary',
         });
       }
-    } else if (activity === 2 && checkInTime !== null) {
+    }
-      setStatus({
+
+    // 4. Regularization Requested
+    if (activity === 2) {
+      return setStatus({
         status: "Requested",
         action: ACTIONS.REQUESTED,
         disabled: true,
         text: "Requested",
-        color: "btn-info",
+        color: 'btn-info',
       });
-    } else if (activity === 5 && checkInTime !== null) {
+    }
-      setStatus({
+
+    // 5. Rejected Regularization
+    if (activity === 5) {
+      return setStatus({
         status: "Rejected",
         action: ACTIONS.REJECTED,
         disabled: true,
         text: "Rejected",
-        color: "btn-danger",
+        color: 'btn-danger',
       });
-    } else {
+    }
-      setStatus({
+
+    // Default to Approved if none of the above apply
+    return setStatus({
       status: "Approved",
       action: ACTIONS.APPROVED,
       disabled: true,
       text: "Approved",
-        color: "btn-success",
+      color: 'btn-success',
     });
-    }
+
   }, [attendanceData]);
 
   return status;