src/components/Activities/Attendance.jsx

@@ -6,34 +6,27 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import usePagination from "../../hooks/usePagination";
 import { useNavigate } from "react-router-dom";
 import { ITEMS_PER_PAGE } from "../../utils/constants";
-import { useAttendance } from "../../hooks/useAttendance";
+import { useAttendance } from "../../hooks/useAttendance"; // This hook is already providing data
 import { useSelector } from "react-redux";
 import { useQueryClient } from "@tanstack/react-query";
 import eventBus from "../../services/eventBus";
 
-const Attendance = ({ getRole, handleModalData }) => {
+const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedAttendanceFromParent, showOnlyCheckout, setshowOnlyCheckout }) => {
   const queryClient = useQueryClient();
-  const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
   const [todayDate, setTodayDate] = useState(new Date());
-  const [ShowPending, setShowPending] = useState(false);
+
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
   );
   const {
-    attendance,
     loading: attLoading,
     recall: attrecall,
     isFetching
-  } = useAttendance(selectedProject);
+  } = useAttendance(selectedProject); // Keep this hook to manage recall and fetching status
-  const filteredAttendance = ShowPending
-    ? attendance?.filter(
-        (att) => att?.checkInTime !== null && att?.checkOutTime === null
-      )
-    : attendance;
 
-  const attendanceList = Array.isArray(filteredAttendance)
+  const attendanceList = Array.isArray(filteredAndSearchedAttendanceFromParent)
-    ? filteredAttendance
+    ? filteredAndSearchedAttendanceFromParent
     : [];
 
   const sortByName = (a, b) => {
@@ -41,6 +34,7 @@ const Attendance = ({ getRole, handleModalData }) => {
     const nameB = (b.firstName + b.lastName).toLowerCase();
     return nameA?.localeCompare(nameB);
   };
+
   const group1 = attendanceList
     .filter((d) => d.activity === 1 || d.activity === 4)
     .sort(sortByName);
@@ -48,36 +42,39 @@ const Attendance = ({ getRole, handleModalData }) => {
     .filter((d) => d.activity === 0)
     .sort(sortByName);
 
-  const filteredData = [...group1, ...group2];
+  const finalFilteredDataForPagination = [...group1, ...group2];
+
   const { currentPage, totalPages, currentItems, paginate } = usePagination(
-    filteredData,
+    finalFilteredDataForPagination, // Use the data that's already been searched and grouped
     ITEMS_PER_PAGE
   );
 
   const handler = useCallback(
     (msg) => {
-      if (selectedProject == msg.projectId) {
+      if (selectedProject === msg.projectId) {
         queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
           if (!oldData) {
-            queryClient.invalidateQueries({queryKey:["attendance"]})
+            queryClient.invalidateQueries({ queryKey: ["attendance"] });
-          };
+            return; // Exit to avoid mapping on undefined oldData
+          }
           return oldData.map((record) =>
             record.employeeId === msg.response.employeeId ? { ...record, ...msg.response } : record
           );
         });
       }
     },
-    [selectedProject, attrecall]
+    [selectedProject, queryClient] // Added queryClient to dependencies
   );
 
   const employeeHandler = useCallback(
     (msg) => {
-      if (attendances.some((item) => item.employeeId == msg.employeeId)) {
+      if (attrecall) { // Check if attrecall function exists
         attrecall();
       }
     },
-    [selectedProject, attendance]
+    [attrecall] // Dependency should be attrecall, not `selectedProject` or `attendance` here
   );
+
   useEffect(() => {
     eventBus.on("attendance", handler);
     return () => eventBus.off("attendance", handler);
@@ -100,13 +97,14 @@ const Attendance = ({ getRole, handleModalData }) => {
               role="switch"
               id="inactiveEmployeesCheckbox"
               disabled={isFetching}
-              checked={ShowPending}
+              checked={showOnlyCheckout} // Use prop for checked state
-              onChange={(e) => setShowPending(e.target.checked)}
+              onChange={(e) => setshowOnlyCheckout(e.target.checked)} // Use prop for onChange
             />
             <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
-        {Array.isArray(attendance) && attendance.length > 0 ? (
+        {/* Use `filteredAndSearchedAttendanceFromParent` for the initial check of data presence */}
+        {Array.isArray(filteredAndSearchedAttendanceFromParent) && filteredAndSearchedAttendanceFromParent.length > 0 ? (
           <>
             <table className="table ">
               <thead>
@@ -124,7 +122,7 @@ const Attendance = ({ getRole, handleModalData }) => {
                 </tr>
               </thead>
               <tbody className="table-border-bottom-0 ">
-                {currentItems &&
+                {currentItems && currentItems.length > 0 ? ( // Check currentItems length before mapping
                   currentItems
                     .sort((a, b) => {
                       const checkInA = a?.checkInTime
@@ -181,18 +179,22 @@ const Attendance = ({ getRole, handleModalData }) => {
                           />
                         </td>
                       </tr>
-                    ))}
+                    ))
-                {!attendance && (
+                ) : (
-                  <span className="text-secondary m-4">No employees assigned to the project!</span>
+                  <tr>
+                    <td colSpan="6" className="text-center text-muted py-4">
+                      No matching records found.
+                    </td>
+                  </tr>
                 )}
               </tbody>
             </table>
 
-            {!loading && filteredData.length > 20 && (
+            {!attLoading && finalFilteredDataForPagination.length > ITEMS_PER_PAGE && ( // Use the data before pagination for total count check
               <nav aria-label="Page ">
                 <ul className="pagination pagination-sm justify-content-end py-1">
                   <li
-                    className={`page-item  ${
+                    className={`page-item ${
                       currentPage === 1 ? "disabled" : ""
                     }`}
                   >
@@ -238,14 +240,16 @@ const Attendance = ({ getRole, handleModalData }) => {
           <div>Loading...</div>
         ) : (
           <div className="text-muted">
-            {Array.isArray(attendance)
+            {/* Check the actual prop passed for initial data presence */}
-              ? "No employees assigned to the project"
+            {Array.isArray(filteredAndSearchedAttendanceFromParent) && filteredAndSearchedAttendanceFromParent.length === 0
-              : "Attendance data unavailable"}
+              ? ""
+              : "Attendance data unavailable."}
           </div>
         )}
 
-        {currentItems?.length == 0 && attendance.length > 0 && (
+        {/* This condition should check `currentItems` or `finalFilteredDataForPagination` */}
-          <div className="my-4"><span className="text-secondary">No Pending Record Available !</span></div>
+        {currentItems?.length === 0 && finalFilteredDataForPagination.length > 0 && showOnlyCheckout && (
+          <div className="my-4"><span className="text-secondary">No Pending Record Available for your search!</span></div>
         )}
       </div>
     </>

src/components/Activities/AttendcesLogs.jsx

@@ -4,24 +4,31 @@ import Avatar from "../common/Avatar";
 import { convertShortTime } from "../../utils/dateUtils";
 import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import { useSelector, useDispatch } from "react-redux";
-import { fetchAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
+import { fetchAttendanceData, setAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
 import DateRangePicker from "../common/DateRangePicker";
-import { clearCacheKey, getCachedData } from "../../slices/apiDataManager";
 import eventBus from "../../services/eventBus";
-import AttendanceRepository from "../../repositories/AttendanceRepository";
-import { useAttendancesLogs } from "../../hooks/useAttendance";
-import { queryClient } from "../../layouts/AuthLayout";
 
 const usePagination = (data, itemsPerPage) => {
   const [currentPage, setCurrentPage] = useState(1);
-  const maxPage = Math.ceil(data.length / itemsPerPage);
+  const totalItems = Array.isArray(data) ? data.length : 0;
+  const maxPage = Math.ceil(totalItems / itemsPerPage);
+
   const currentItems = useMemo(() => {
+    if (!Array.isArray(data) || data.length === 0) {
+      return [];
+    }
     const startIndex = (currentPage - 1) * itemsPerPage;
     const endIndex = startIndex + itemsPerPage;
     return data.slice(startIndex, endIndex);
   }, [data, currentPage, itemsPerPage]);
 
-  const paginate = useCallback((pageNumber) => setCurrentPage(pageNumber), []);
+  const paginate = useCallback((pageNumber) => {
+    if (pageNumber > 0 && pageNumber <= maxPage) {
+      setCurrentPage(pageNumber);
+    }
+  }, [maxPage]);
+
+  // Ensure resetPage is returned by the hook
   const resetPage = useCallback(() => setCurrentPage(1), []);
 
   return {
@@ -35,60 +42,91 @@ const usePagination = (data, itemsPerPage) => {
 
 const AttendanceLog = ({
   handleModalData,
+  projectId,
+  setshowOnlyCheckout,
+  showOnlyCheckout,
+  searchQuery, // Prop for search query
 }) => {
-  const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
-  );
   const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
   const dispatch = useDispatch();
-  const [loading, setLoading] = useState(false);
+  const { data, loading, error } = useSelector((store) => store.attendanceLogs);
-  const [showPending,setShowPending] = useState(false)
-
   const [isRefreshing, setIsRefreshing] = useState(false);
-  const [processedData, setProcessedData] = useState([]);
 
-  const today = new Date();
+  const today = useMemo(() => {
-  today.setHours(0, 0, 0, 0);
+    const d = new Date();
+    d.setHours(0, 0, 0, 0);
+    return d;
+  }, []);
 
-  const yesterday = new Date();
+  const yesterday = useMemo(() => {
-  yesterday.setDate(yesterday.getDate() - 1);
+    const d = new Date();
+    d.setDate(d.getDate() - 1);
+    return d;
+  }, []);
 
-  const isSameDay = (dateStr) => {
+  const isSameDay = useCallback((dateStr) => {
     if (!dateStr) return false;
     const d = new Date(dateStr);
     d.setHours(0, 0, 0, 0);
     return d.getTime() === today.getTime();
-  };
+  }, [today]);
 
-  const isBeforeToday = (dateStr) => {
+  const isBeforeToday = useCallback((dateStr) => {
     if (!dateStr) return false;
     const d = new Date(dateStr);
     d.setHours(0, 0, 0, 0);
     return d.getTime() < today.getTime();
-  };
+  }, [today]);
 
-  const sortByName = (a, b) => {
+  const sortByName = useCallback((a, b) => {
-    const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
+    const nameA = `${a.firstName || ""} ${a.lastName || ""}`.toLowerCase();
-    const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
+    const nameB = `${b.firstName || ""} ${b.lastName || ""}`.toLowerCase();
-    return nameA?.localeCompare(nameB);
+    return nameA.localeCompare(nameB);
-  };
+  }, []);
 
-  const {
+  useEffect(() => {
-    data = [],
+    const { startDate, endDate } = dateRange;
-    isLoading,
+    dispatch(
-    error,
+      fetchAttendanceData({
-    refetch,
+        projectId,
-    isFetching,
+        fromDate: startDate,
-  } = useAttendancesLogs(
+        toDate: endDate,
-    selectedProject,
+      })
-    dateRange.startDate,
+    );
-    dateRange.endDate
+    setIsRefreshing(false);
-  );
+  }, [dateRange, projectId, dispatch, isRefreshing]);
-  const filtering = (data) => {
+
-    const filteredData = showPending
+  const processedData = useMemo(() => {
+    let filteredData = showOnlyCheckout
       ? data.filter((item) => item.checkOutTime === null)
       : data;
 
+    // Apply search query filter
+    if (searchQuery) {
+      const lowerCaseSearchQuery = searchQuery.toLowerCase().trim(); // Trim whitespace
+
+      filteredData = filteredData.filter((att) => {
+        // Option 1: Combine firstName, middleName, lastName
+        const fullName = [att.firstName, att.middleName, att.lastName]
+          .filter(Boolean) // This removes null, undefined, or empty string parts
+          .join(" ")
+          .toLowerCase();
+
+        // Option 2: Check `employeeName` if it exists and is reliable
+        const employeeName = att.employeeName?.toLowerCase() || "";
+
+        // Option 3: Check `employeeId`
+        const employeeId = att.employeeId?.toLowerCase() || "";
+
+        // Check if the search query is included in any of the relevant fields
+        return (
+          fullName.includes(lowerCaseSearchQuery) ||
+          employeeName.includes(lowerCaseSearchQuery) ||
+          employeeId.includes(lowerCaseSearchQuery)
+        );
+      });
+    }
+
     const group1 = filteredData
       .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
       .sort(sortByName);
@@ -127,53 +165,46 @@ const AttendanceLog = ({
       return acc;
     }, {});
 
+    // Sort dates in descending order
     const sortedDates = Object.keys(groupedByDate).sort(
       (a, b) => new Date(b) - new Date(a)
     );
 
-    const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
+    // Create the final sorted array
-    setProcessedData(finalData);
+    return sortedDates.flatMap((date) => groupedByDate[date]);
-  };
+  }, [data, showOnlyCheckout, searchQuery, isSameDay, isBeforeToday, sortByName]);
-
-  useEffect(() => {
-    filtering(data);
-  }, [data, showPending]);
 
   const {
     currentPage,
     totalPages,
     currentItems: paginatedAttendances,
     paginate,
-    resetPage,
+    resetPage, // Destructure resetPage here
   } = usePagination(processedData, 20);
 
+  // Effect to reset pagination when search query changes
   useEffect(() => {
     resetPage();
-  }, [processedData, resetPage]);
+  }, [searchQuery, resetPage]); // Add resetPage to dependencies
 
   const handler = useCallback(
     (msg) => {
       const { startDate, endDate } = dateRange;
       const checkIn = msg.response.checkInTime.substring(0, 10);
       if (
-        selectedProject === msg.projectId &&
+        projectId === msg.projectId &&
         startDate <= checkIn &&
         checkIn <= endDate
       ) {
-        queryClient.setQueriesData(["attendanceLogs"],(oldData)=>{
+        const updatedAttendance = data.map((item) =>
-          if(!oldData) {
+          item.id === msg.response.id
-            queryClient.invalidateQueries({queryKey:["attendanceLogs"]})
+            ? { ...item, ...msg.response }
-          }
+            : item
-          return oldData.map((record) =>
-          record.id === msg.response.id ? { ...record, ...msg.response } : record
         );
-        })
+        dispatch(setAttendanceData(updatedAttendance)); // Update Redux store
-
-        filtering(updatedAttendance);
-        resetPage();
       }
     },
-    [selectedProject, dateRange, data, filtering, resetPage]
+    [projectId, dateRange, data, dispatch]
   );
 
   useEffect(() => {
@@ -184,19 +215,15 @@ const AttendanceLog = ({
   const employeeHandler = useCallback(
     (msg) => {
       const { startDate, endDate } = dateRange;
-      if (data.some((item) => item.employeeId == msg.employeeId)) {
+      dispatch(
-        // dispatch(
+        fetchAttendanceData({
-        //   fetchAttendanceData({
+          projectId,
-        //     ,
+          fromDate: startDate,
-        //     fromDate: startDate,
+          toDate: endDate,
-        //     toDate: endDate,
+        })
-        //   })
+      );
-        // );
-
-        refetch()
-      }
     },
-    [selectedProject, dateRange, data]
+    [projectId, dateRange, dispatch]
   );
 
   useEffect(() => {
@@ -220,28 +247,27 @@ const AttendanceLog = ({
               type="checkbox"
               className="form-check-input"
               role="switch"
-              disabled={isFetching}
               id="inactiveEmployeesCheckbox"
-              checked={showPending}
+              checked={showOnlyCheckout}
-              onChange={(e) => setShowPending(e.target.checked)}
+              onChange={(e) => setshowOnlyCheckout(e.target.checked)}
             />
             <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
         <div className="col-md-2 m-0 text-end">
           <i
-            className={`bx bx-refresh cursor-pointer fs-4 ${
+            className={`bx bx-refresh cursor-pointer fs-4 ${loading || isRefreshing ? "spin" : ""
-              isFetching ? "spin" : ""
+              }`}
-            }`}
             title="Refresh"
-            onClick={() => refetch()}
+            onClick={() => setIsRefreshing(true)}
           />
         </div>
       </div>
-      <div className="table-responsive text-nowrap">
+      <div
-        {isLoading ? (
+        className="table-responsive text-nowrap"
-          <div><p className="text-secondary">Loading...</p></div>
+        style={{ minHeight: "200px", display: 'flex' }}
-        ) : data?.length > 0 ? (
+      >
+        {processedData && processedData.length > 0 ? (
           <table className="table mb-0">
             <thead>
               <tr>
@@ -260,82 +286,96 @@ const AttendanceLog = ({
               </tr>
             </thead>
             <tbody>
-              {paginatedAttendances.reduce((acc, attendance, index, arr) => {
+              {(loading || isRefreshing) && (
-                const currentDate = moment(
+                <tr>
-                  attendance.checkInTime || attendance.checkOutTime
+                  <td colSpan={6}>Loading...</td>
-                ).format("YYYY-MM-DD");
+                </tr>
-                const previousAttendance = arr[index - 1];
+              )}
-                const previousDate = previousAttendance
+              {!loading &&
-                  ? moment(
+                !isRefreshing &&
+                paginatedAttendances.reduce((acc, attendance, index, arr) => {
+                  const currentDate = moment(
+                    attendance.checkInTime || attendance.checkOutTime
+                  ).format("YYYY-MM-DD");
+                  const previousAttendance = arr[index - 1];
+                  const previousDate = previousAttendance
+                    ? moment(
                       previousAttendance.checkInTime ||
-                        previousAttendance.checkOutTime
+                      previousAttendance.checkOutTime
                     ).format("YYYY-MM-DD")
-                  : null;
+                    : null;
 
-                if (!previousDate || currentDate !== previousDate) {
+                  if (!previousDate || currentDate !== previousDate) {
+                    acc.push(
+                      <tr
+                        key={`header-${currentDate}`}
+                        className="table-row-header"
+                      >
+                        <td colSpan={6} className="text-start">
+                          <strong>
+                            {moment(currentDate).format("DD-MM-YYYY")}
+                          </strong>
+                        </td>
+                      </tr>
+                    );
+                  }
                   acc.push(
-                    <tr
+                    <tr key={attendance.id || index}>
-                      key={`header-${currentDate}`}
+                      <td colSpan={2}>
-                      className="table-row-header"
+                        <div className="d-flex justify-content-start align-items-center">
-                    >
+                          <Avatar
-                      <td colSpan={6} className="text-start">
+                            firstName={attendance.firstName}
-                        <strong>
+                            lastName={attendance.lastName}
-                          {moment(currentDate).format("DD-MM-YYYY")}
+                          />
-                        </strong>
+                          <div className="d-flex flex-column">
+                            <a href="#" className="text-heading text-truncate">
+                              <span className="fw-normal">
+                                {attendance.firstName} {attendance.lastName}
+                              </span>
+                            </a>
+                          </div>
+                        </div>
+                      </td>
+                      <td>
+                        {moment(
+                          attendance.checkInTime || attendance.checkOutTime
+                        ).format("DD-MMM-YYYY")}
+                      </td>
+                      <td>{convertShortTime(attendance.checkInTime)}</td>
+                      <td>
+                        {attendance.checkOutTime
+                          ? convertShortTime(attendance.checkOutTime)
+                          : "--"}
+                      </td>
+                      <td className="text-center">
+                        <RenderAttendanceStatus
+                          attendanceData={attendance}
+                          handleModalData={handleModalData}
+                          Tab={2}
+                          currentDate={today.toLocaleDateString("en-CA")}
+                        />
                       </td>
                     </tr>
                   );
-                }
+                  return acc;
-                acc.push(
+                }, [])}
-                  <tr key={index}>
-                    <td colSpan={2}>
-                      <div className="d-flex justify-content-start align-items-center">
-                        <Avatar
-                          firstName={attendance.firstName}
-                          lastName={attendance.lastName}
-                        />
-                        <div className="d-flex flex-column">
-                          <a href="#" className="text-heading text-truncate">
-                            <span className="fw-normal">
-                              {attendance.firstName} {attendance.lastName}
-                            </span>
-                          </a>
-                        </div>
-                      </div>
-                    </td>
-                    <td>
-                      {moment(
-                        attendance.checkInTime || attendance.checkOutTime
-                      ).format("DD-MMM-YYYY")}
-                    </td>
-                    <td>{convertShortTime(attendance.checkInTime)}</td>
-                    <td>
-                      {attendance.checkOutTime
-                        ? convertShortTime(attendance.checkOutTime)
-                        : "--"}
-                    </td>
-                    <td className="text-center">
-                      <RenderAttendanceStatus
-                        attendanceData={attendance}
-                        handleModalData={handleModalData}
-                        Tab={2}
-                        currentDate={today.toLocaleDateString("en-CA")}
-                      />
-                    </td>
-                  </tr>
-                );
-                return acc;
-              }, [])}
             </tbody>
           </table>
         ) : (
-           <div className="my-4"><span className="text-secondary">No Record Available !</span></div>
+          !loading &&
+          !isRefreshing && (
+            <div
+              className="d-flex justify-content-center align-items-center text-muted"
+              style={{
+                width: "100%",
+              }}
+            >
+              No employee logs.
+            </div>
+          )
         )}
       </div>
-        {paginatedAttendances?.length == 0 && data?.length > 0 && (
+      {!loading && !isRefreshing && processedData.length > 20 && (
-          <div className="my-4"><span className="text-secondary">No Pending Record Available !</span></div>
-        )}
-      {processedData.length > 10 && (
         <nav aria-label="Page ">
           <ul className="pagination pagination-sm justify-content-end py-1">
             <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
@@ -350,9 +390,8 @@ const AttendanceLog = ({
               (pageNumber) => (
                 <li
                   key={pageNumber}
-                  className={`page-item ${
+                  className={`page-item ${currentPage === pageNumber ? "active" : ""
-                    currentPage === pageNumber ? "active" : ""
+                    }`}
-                  }`}
                 >
                   <button
                     className="page-link"
@@ -364,9 +403,8 @@ const AttendanceLog = ({
               )
             )}
             <li
-              className={`page-item ${
+              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                currentPage === totalPages ? "disabled" : ""
+                }`}
-              }`}
             >
               <button
                 className="page-link"
@@ -382,4 +420,4 @@ const AttendanceLog = ({
   );
 };
 
-export default AttendanceLog;
+export default AttendanceLog;

src/components/Activities/CheckCheckOutForm.jsx

@@ -10,6 +10,12 @@ import showToast from "../../services/toastService";
 import { checkIfCurrentDate } from "../../utils/dateUtils";
 import { useMarkAttendance } from "../../hooks/useAttendance";
 
+
+// const schema = z.object({
+//   markTime: z.string().nonempty({ message: "Time is required" }),
+//   description: z.string().max(200, "description should less than 200 chracters").optional()
+// });
+
 const createSchema = (modeldata) => {
   return z
     .object({
@@ -42,74 +48,83 @@ const createSchema = (modeldata) => {
     });
 };
 
-const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => {
+
-  const projectId = useSelector((store) => store.localVariables.projectId);
+const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
-  const { mutate: MarkAttendance } = useMarkAttendance();
+
+  const projectId = useSelector((store) => store.localVariables.projectId)
+  const {mutate:MarkAttendance} = useMarkAttendance()
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
-  const dispatch = useDispatch();
+  const dispatch = useDispatch()
-  const today = new Date().toISOString().split("T")[0];
+  const today = new Date().toISOString().split('T')[0];
 
-  const formatDate = (dateString) => {
+    const formatDate = (dateString) => {
     if (!dateString) {
-      return "";
+      return '';
     }
-    const [year, month, day] = dateString.split("-");
+    const [year, month, day] = dateString.split('-');
     return `${day}-${month}-${year}`;
   };
 
+  // const {
+  //   register,
+  //   handleSubmit,
+  //   formState: { errors },
+  //   reset,
+  //   setValue,
+  // } = useForm({
+  //   resolver: zodResolver(schema),
+  //   mode: "onChange"
+  // });
+
   const {
-    register,
+  register,
-    handleSubmit,
+  handleSubmit,
-    formState: { errors },
+  formState: { errors },
-    reset,
+  reset,
-    setValue,
+  setValue,
-  } = useForm({
+} = useForm({
-    resolver: zodResolver(createSchema(modeldata)),
+  resolver: zodResolver(createSchema(modeldata)),
-    mode: "onChange",
+  mode: "onChange",
-  });
+});
+
 
   const onSubmit = (data) => {
-    let record = {
+    let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
-      ...data,
+    if (modeldata.forWhichTab === 1) {
-      date: new Date().toLocaleDateString(),
+      handleSubmitForm(record)
-      latitude: coords.latitude,
+    } else {
-      longitude: coords.longitude,
+
-      employeeId: modeldata.employeeId,
+      dispatch(markAttendance(record))
-      action: modeldata.action,
+        .unwrap()
-      id: modeldata?.id || null,
+        .then((data) => {
-    };
+
-    const payload = {
+    //       showToast("Attendance Marked Successfully", "success");
-      Id: modeldata?.id || null,
+    //     })
-      comment: data.description,
+    //     .catch((error) => {
-      employeeID: modeldata.employeeId,
+
-      projectId: projectId,
+    //       showToast(error, "error");
-      date: new Date().toISOString(),
+
-      markTime: data.markTime,
+        });
-      latitude: coords.latitude.toString(),
+    }
-      longitude: coords.longitude.toString(),
+
-      action: modeldata.action,
+    closeModal()
-      image: null,
-    };
-    MarkAttendance({ payload, forWhichTab: modeldata.forWhichTab });
-    closeModal();
   };
 
   return (
+
+
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+
       <div className="col-12 col-md-12">
         <label className="fs-5 text-dark text-center d-flex align-items-center flex-wrap">
-          {modeldata?.checkInTime && !modeldata?.checkOutTime
+          {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out :' : 'Check-in :'}
-            ? "Check-out :"
-            : "Check-in :"}
         </label>
       </div>
 
       <div className="col-6 col-md-6 ">
         <label className="form-label" htmlFor="checkInDate">
-          {modeldata?.checkInTime && !modeldata?.checkOutTime
+          {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out Date' : 'Check-in Date'}
-            ? "Check-out Date"
-            : "Check-in Date"}
         </label>
         <input
           type="text"
@@ -117,7 +132,7 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => {
           className="form-control"
           value={
             modeldata?.checkInTime && !modeldata?.checkOutTime
-              ? formatDate(modeldata?.checkInTime?.split("T")[0]) || ""
+              ? formatDate(modeldata?.checkInTime?.split('T')[0]) || ''
               : formatDate(today)
           }
           disabled
@@ -132,9 +147,7 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => {
           checkOutTime={modeldata?.checkOutTime}
           checkInTime={modeldata?.checkInTime}
         />
-        {errors.markTime && (
+        {errors.markTime && <p className="text-danger">{errors.markTime.message}</p>}
-          <p className="text-danger">{errors.markTime.message}</p>
-        )}
       </div>
 
       <div className="col-12 col-md-12">
@@ -153,6 +166,7 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => {
         )}
       </div>
 
+
       <div className="col-12 text-center">
         <button type="submit" className="btn btn-sm btn-primary me-3">
           {isLoading ? "Please Wait..." : "Submit"}
@@ -168,15 +182,20 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => {
         </button>
       </div>
     </form>
-  );
+
-};
+  )
+}
+
 
 export default CheckCheckOutmodel;
 
+
 const schemaReg = z.object({
-  description: z.string().min(1, { message: "please give reason!" }),
+  description: z.string().min(1, { message: "please give reason!" })
 });
 
+
+
 export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
@@ -191,22 +210,21 @@ export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
 
   const getCurrentDate = () => {
     const today = new Date();
-    return today.toLocaleDateString("en-CA");
+    return today.toLocaleDateString('en-CA');
   };
 
+
   const onSubmit = (data) => {
-    let record = {
+    let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, }
-      ...data,
+    handleSubmitForm(record)
-      date: new Date().toLocaleDateString(),
+    closeModal()
-      latitude: coords.latitude,
-      longitude: coords.longitude,
-    };
-    handleSubmitForm(record);
-    closeModal();
   };
 
   return (
+
+
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+
       <div className="col-12 col-md-12">
         <p>Regularize Attendance</p>
         <label className="form-label" htmlFor="description">
@@ -223,6 +241,7 @@ export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
         )}
       </div>
 
+
       <div className="col-12 text-center">
         <button type="submit" className="btn btn-sm btn-primary me-3">
           {isLoading ? "Please Wait..." : "Submit"}
@@ -238,5 +257,6 @@ export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
         </button>
       </div>
     </form>
-  );
+
-};
+  )
+}

src/components/Activities/Regularization.jsx

@@ -7,56 +7,37 @@ import { useRegularizationRequests } from "../../hooks/useAttendance";
 import moment from "moment";
 import usePagination from "../../hooks/usePagination";
 import eventBus from "../../services/eventBus";
-import { cacheData, clearCacheKey } from "../../slices/apiDataManager";
+import { cacheData } from "../../slices/apiDataManager";
-import { useQueryClient } from "@tanstack/react-query";
 
-const Regularization = ({ handleRequest }) => {
+const Regularization = ({ handleRequest, searchQuery }) => {
-  const queryClient = useQueryClient();
+  const selectedProject = useSelector((store) => store.localVariables.projectId);
-  var selectedProject = useSelector((store) => store.localVariables.projectId);
+  const [regularizesList, setRegularizedList] = useState([]);
-  const [regularizesList, setregularizedList] = useState([]);
+  const { regularizes, loading, refetch } = useRegularizationRequests(selectedProject);
-  const { regularizes, loading, error, refetch } =
-    useRegularizationRequests(selectedProject);
 
   useEffect(() => {
-    setregularizedList(regularizes);
+    setRegularizedList(regularizes);
   }, [regularizes]);
 
   const sortByName = (a, b) => {
-    const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
+    const nameA = (a.firstName + a.lastName).toLowerCase();
-    const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
+    const nameB = (b.firstName + b.lastName).toLowerCase();
-    return nameA?.localeCompare(nameB);
+    return nameA.localeCompare(nameB);
   };
 
   const handler = useCallback(
     (msg) => {
       if (selectedProject == msg.projectId) {
-    
+        const updatedAttendance = regularizes?.filter(item => item.id !== msg.response.id);
-
+        cacheData("regularizedList", {
-        queryClient.setQueryData(
+          data: updatedAttendance,
-          ["regularizedList", selectedProject],
+          projectId: selectedProject,
-          (oldData) => {
+        });
-            if (!oldData) {
+        refetch();
-              queryClient.invalidateQueries({ queryKey: ["regularizedList"] });
-            }
-            return oldData.filter((record) => record.id !== msg.response.id);
-          }
-        ),
-          queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] });
       }
     },
     [selectedProject, regularizes]
   );
-
+  
-  const filteredData = [...regularizesList]?.sort(sortByName);
-
-  const { currentPage, totalPages, currentItems, paginate } = usePagination(
-    filteredData,
-    20
-  );
-  useEffect(() => {
-    eventBus.on("regularization", handler);
-    return () => eventBus.off("regularization", handler);
-  }, [handler]);
 
   const employeeHandler = useCallback(
     (msg) => {
@@ -67,41 +48,57 @@ const Regularization = ({ handleRequest }) => {
     [regularizes]
   );
 
+  useEffect(() => {
+    eventBus.on("regularization", handler);
+    return () => eventBus.off("regularization", handler);
+  }, [handler]);
+
   useEffect(() => {
     eventBus.on("employee", employeeHandler);
     return () => eventBus.off("employee", employeeHandler);
   }, [employeeHandler]);
 
+  // ✅ Search filter logic added here
+  const filteredData = [...regularizesList]
+    ?.filter((item) => {
+      if (!searchQuery) return true;
+      const lowerSearch = searchQuery.toLowerCase();
+      const fullName = `${item.firstName || ""} ${item.lastName || ""}`.toLowerCase();
+
+      return (
+        item.firstName?.toLowerCase().includes(lowerSearch) ||
+        item.lastName?.toLowerCase().includes(lowerSearch) ||
+        fullName.includes(lowerSearch) ||
+        item.employeeId?.toLowerCase().includes(lowerSearch)
+      );
+    })
+    .sort(sortByName);
+
+  const { currentPage, totalPages, currentItems, paginate } = usePagination(filteredData, 20);
+
   return (
     <div className="table-responsive text-nowrap pb-4">
-      {loading ? (
+      <table className="table mb-0">
-        <div className="my-2">
+        <thead>
-          <p className="text-secondary">Loading...</p>
+          <tr>
-        </div>
+            <th colSpan={2}>Name</th>
-      ) : currentItems?.length > 0 ? (
+            <th>Date</th>
-        <table className="table mb-0">
+            <th>
-          <thead>
+              <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
-            <tr>
+            </th>
-              <th colSpan={2}>Name</th>
+            <th>
-              <th>Date</th>
+              <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
-              <th>
+            </th>
-                <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
+            <th>Action</th>
-              </th>
+          </tr>
-              <th>
+        </thead>
-                <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
+        <tbody>
-              </th>
+          {!loading && currentItems?.length > 0 ? (
-              <th>Action</th>
+            currentItems.map((att, index) => (
-            </tr>
-          </thead>
-          <tbody>
-            {currentItems?.map((att, index) => (
               <tr key={index}>
                 <td colSpan={2}>
                   <div className="d-flex justify-content-start align-items-center">
-                    <Avatar
+                    <Avatar firstName={att.firstName} lastName={att.lastName} />
-                      firstName={att.firstName}
-                      lastName={att.lastName}
-                    ></Avatar>
                     <div className="d-flex flex-column">
                       <a href="#" className="text-heading text-truncate">
                         <span className="fw-normal">
@@ -116,24 +113,33 @@ const Regularization = ({ handleRequest }) => {
                 <td>
                   {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
                 </td>
-                <td className="text-center ">
+                <td className="text-center">
                   <RegularizationActions
                     attendanceData={att}
                     handleRequest={handleRequest}
                     refresh={refetch}
                   />
-                  {/* </div> */}
                 </td>
               </tr>
-            ))}
+            ))
-          </tbody>
+          ) : (
-        </table>
+            <tr>
-      ) : (
+              <td
-        <div className="my-4">
+                colSpan={6}
-          {" "}
+                className="text-center"
-          <span className="text-secondary">No Requests Found !</span>
+                style={{
-        </div>
+                  height: "200px",
-      )}
+                  verticalAlign: "middle",
+                  borderBottom: "none",
+                }}
+              >
+                {loading ? "Loading..." : "No Record Found"}
+              </td>
+            </tr>
+          )}
+        </tbody>
+      </table>
+
       {!loading && totalPages > 1 && (
         <nav aria-label="Page ">
           <ul className="pagination pagination-sm justify-content-end py-1 mt-3">
@@ -148,25 +154,18 @@ const Regularization = ({ handleRequest }) => {
             {[...Array(totalPages)].map((_, index) => (
               <li
                 key={index}
-                className={`page-item ${
+                className={`page-item ${currentPage === index + 1 ? "active" : ""}`}
-                  currentPage === index + 1 ? "active" : ""
-                }`}
               >
-                <button
+                <button className="page-link" onClick={() => paginate(index + 1)}>
-                  className="page-link "
-                  onClick={() => paginate(index + 1)}
-                >
                   {index + 1}
                 </button>
               </li>
             ))}
             <li
-              className={`page-item ${
+              className={`page-item ${currentPage === totalPages ? "disabled" : ""}`}
-                currentPage === totalPages ? "disabled" : ""
-              }`}
             >
               <button
-                className="page-link "
+                className="page-link"
                 onClick={() => paginate(currentPage + 1)}
               >
                 &raquo;

src/components/Project/AssignTask.jsx

@@ -16,7 +16,6 @@ import { useCreateTask } from "../../hooks/useTasks";
 const AssignTask = ({ assignData, onClose, setAssigned }) => {
   const maxPlanned =
     assignData?.workItem?.plannedWork - assignData?.workItem?.completedWork;
-
   const schema = z.object({
     selectedEmployees: z
       .array(z.string())
@@ -49,6 +48,9 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
   const infoRef = useRef(null);
   const infoRef1 = useRef(null);
 
+  // State for search term
+  const [searchTerm, setSearchTerm] = useState("");
+
   useEffect(() => {
     if (typeof bootstrap !== "undefined") {
       if (infoRef.current) {
@@ -81,9 +83,13 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
     recallEmployeeData,
   } = useEmployeesAllOrByProjectId(false, selectedProject, false);
   const dispatch = useDispatch();
-  const { data: jobRoleData, loading } = useMaster();
+  const { loading } = useMaster();
+  const { data: jobRoleData } = useMaster();
 
-  const [selectedRole, setSelectedRole] = useState("all");
+  // Changed to an array to hold multiple selected roles
+  const [selectedRoles, setSelectedRoles] = useState(["all"]);
+  // Changed to an array to hold multiple selected roles
+  // const [selectedRoles, setSelectedRoles] = useState(["all"]);
   const [displayedSelection, setDisplayedSelection] = useState("");
   const {
     handleSubmit,
@@ -121,20 +127,79 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
 
   useEffect(() => {
     dispatch(changeMaster("Job Role"));
-
+    // Initial state should reflect "All Roles" selected
-    return () => setSelectedRole("all");
+    setSelectedRoles(["all"]);
   }, [dispatch]);
 
-  const handleRoleChange = (event) => {
+  // Modified handleRoleChange to handle multiple selections
-    setSelectedRole(event.target.value);
+  const handleRoleChange = (event, roleId) => {
+    // If 'all' is selected, clear other selections
+    if (roleId === "all") {
+      setSelectedRoles(["all"]);
+    } else {
+      setSelectedRoles((prevSelectedRoles) => {
+        // If "all" was previously selected, remove it
+        const newRoles = prevSelectedRoles.filter((role) => role !== "all");
+        if (newRoles.includes(roleId)) {
+          // If role is already selected, unselect it
+          return newRoles.filter((id) => id !== roleId);
+        } else {
+          // If role is not selected, add it
+          return [...newRoles, roleId];
+        }
+      });
+    }
   };
 
-  const filteredEmployees =
+  useEffect(() => {
-    selectedRole === "all"
+    // Update displayedSelection based on selectedRoles
-      ? employees
+    if (selectedRoles.includes("all")) {
-      : employees?.filter(
+      setDisplayedSelection("All Roles");
-          (emp) => String(emp.jobRoleId || "") === selectedRole
+    } else if (selectedRoles.length > 0) {
-        );
+      const selectedRoleNames = selectedRoles.map(roleId => {
+        const role = jobRoleData?.find(r => String(r.id) === roleId);
+        return role ? role.name : '';
+      }).filter(Boolean); // Filter out empty strings for roles not found
+      setDisplayedSelection(selectedRoleNames.join(', '));
+    } else {
+      setDisplayedSelection("Select Roles");
+    }
+  }, [selectedRoles, jobRoleData]);
+
+
+  const handleSearchChange = (event) => {
+    setSearchTerm(event.target.value);
+  };
+
+  // Filter employees first by role, then by search term AND job role name
+  const filteredEmployees = employees?.filter((emp) => {
+    const matchesRole =
+      selectedRoles.includes("all") || selectedRoles.includes(String(emp.jobRoleId));
+    // Convert both first and last names and job role name to lowercase for case-insensitive matching
+    const fullName = `${emp.firstName} ${emp.lastName}`.toLowerCase();
+
+    const jobRoleName = jobRoleData?.find((role) => role.id === emp.jobRoleId)?.name?.toLowerCase() || "";
+
+    const searchLower = searchTerm.toLowerCase();
+    // Check if the full name OR job role name includes the search term
+    const matchesSearch = fullName.includes(searchLower) || jobRoleName.includes(searchLower);
+    return matchesRole && matchesSearch;
+  });
+
+  // Determine unique job role IDs from the filtered employees (for dropdown options)
+  const uniqueJobRoleIdsInFilteredEmployees = new Set(
+    employees?.map(emp => emp.jobRoleId).filter(Boolean)
+  );
+
+  // Filter jobRoleData to only include roles present in the uniqueJobRoleIdsInFilteredEmployees
+  const jobRolesForDropdown = jobRoleData?.filter(role =>
+    uniqueJobRoleIdsInFilteredEmployees.has(role.id)
+  );
+
+  // Calculate the count of selected roles for display
+  const selectedRolesCount = selectedRoles.includes("all")
+    ? 0 // "All Roles" doesn't contribute to a specific count
+    : selectedRoles.length;
 
   const onSubmit = (data) => {
     const selectedEmployeeIds = data.selectedEmployees;
@@ -159,226 +224,339 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
     reset();
     onClose();
   };
+
   return (
-    <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
+   <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
-      <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
+  <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
-      <div className="container my-3">
+  <div className="container my-3">
-        <div className="mb-1">
+    <div className="mb-1">
-          <p className="mb-0">
+      <p className="mb-0">
-            <span className="text-dark text-start d-flex align-items-center flex-wrap form-text">
+        <span className="text-dark text-start d-flex align-items-center flex-wrap form-text">
-              <span className="me-2 m-0 font-bold">Work Location :</span>
+          <span className="me-2 m-0 fw-bold">Work Location :</span> {/* Changed font-bold to fw-bold */}
-              {[
+          {[
-                assignData?.building?.buildingName,
+            assignData?.building?.buildingName,
-                assignData?.floor?.floorName,
+            assignData?.floor?.floorName,
-                assignData?.workArea?.areaName,
+            assignData?.workArea?.areaName,
-                assignData?.workItem?.activityMaster?.activityName,
+            assignData?.workItem?.activityMaster?.activityName,
-              ]
+          ]
-                .filter(Boolean) // Filter out any undefined/null values
+            .filter(Boolean) // Filter out any undefined/null values
-                .map((item, index, array) => (
+            .map((item, index, array) => (
-                  <span key={index} className="d-flex align-items-center">
+              <span key={index} className="d-flex align-items-center">
-                    {item}
+                {item}
-                    {index < array.length - 1 && (
+                {index < array.length - 1 && (
-                      <i className="bx bx-chevron-right mx-2"></i>
+                  <i className="bx bx-chevron-right mx-2"></i>
-                    )}
+                )}
-                  </span>
+              </span>
-                ))}
+            ))}
-            </span>
+        </span>
-          </p>
+      </p>
 
-          <form onSubmit={handleSubmit(onSubmit)}>
+      <form onSubmit={handleSubmit(onSubmit)}>
-            <div className="form-label text-start">
+        <div className="form-label text-start">
-              <div className="row mb-1">
+          <div className="row mb-1">
-                <div className="col-12">
+            <div className="col-12">
-                  <div className="form-text text-start">
+              <div className="form-text text-start">
-                    <div className="d-flex align-items-center form-text fs-7">
+                <div className="d-flex align-items-center form-text fs-7">
-                      <span className="text-dark">Select Team</span>
+                  <span className="text-dark">Select Team</span>
-                      <div className="me-2">{displayedSelection}</div>
+                  <div className="dropdown position-relative d-inline-block">
-                      <a
+                    <a
-                        className="dropdown-toggle hide-arrow cursor-pointer"
+                      className={`dropdown-toggle hide-arrow cursor-pointer ${
-                        data-bs-toggle="dropdown"
+                        selectedRoles.includes("all") || selectedRoles.length === 0
-                        aria-expanded="false"
+                          ? "text-secondary"
+                          : "text-primary"
+                      }`}
+                      data-bs-toggle="dropdown"
+                      role="button"
+                      aria-expanded="false"
+                    >
+                      <i className="bx bx-slider-alt ms-2"></i>
+                    </a>
+
+                    {/* Badge */}
+                    {selectedRolesCount > 0 && (
+                      <span
+                        className="position-absolute top-0 start-100 translate-middle badge rounded-circle bg-warning text-white"
+                        style={{
+                          fontSize: "0.65rem",
+                          minWidth: "18px",
+                          height: "18px",
+                          padding: "0",
+                          lineHeight: "18px",
+                          textAlign: "center",
+                          zIndex: 10,
+                        }}
                       >
-                        <i className="bx bx-filter bx-lg text-primary"></i>
+                        {selectedRolesCount}
-                      </a>
+                      </span>
+                    )}
 
-                      <ul className="dropdown-menu p-2 text-capitalize">
+                    {/* Dropdown Menu - Corrected: Removed duplicate ul block */}
-                        <li key="all">
+                    <ul className="dropdown-menu p-2 text-capitalize" style={{ maxHeight: "300px", overflowY: "auto" }}>
-                          <button
+                      <li> {/* Changed key="all" to a unique key if possible, or keep it if "all" is a unique identifier */}
-                            type="button"
+                        <div className="form-check dropdown-item py-0">
-                            className="dropdown-item py-1"
+                          <input
-                            onClick={() =>
+                            className="form-check-input"
-                              handleRoleChange({
+                            type="checkbox"
-                                target: { value: "all" },
+                            id="checkboxAllRoles" // Unique ID
-                              })
+                            value="all"
-                            }
+                            checked={selectedRoles.includes("all")}
-                          >
+                            onChange={(e) => handleRoleChange(e, e.target.value)}
+                          />
+                          <label className="form-check-label ms-2" htmlFor="checkboxAllRoles">
                             All Roles
-                          </button>
+                          </label>
+                        </div>
+                      </li>
+
+                      {jobRolesForDropdown?.map((role) => (
+                        <li key={role.id}>
+                          <div className="form-check dropdown-item py-0">
+                            <input
+                              className="form-check-input"
+                              type="checkbox"
+                              id={`checkboxRole-${role.id}`} // Unique ID
+                              value={role.id}
+                              checked={selectedRoles.includes(String(role.id))}
+                              onChange={(e) => handleRoleChange(e, e.target.value)}
+                            />
+                            <label className="form-check-label ms-2" htmlFor={`checkboxRole-${role.id}`}>
+                              {role.name}
+                            </label>
+                          </div>
                         </li>
-                        {jobRoleData?.map((user) => (
+                      ))}
-                          <li key={user.id}>
+                    </ul>
-                            <button
-                              type="button"
-                              className="dropdown-item py-1"
-                              value={user.id}
-                              onClick={handleRoleChange}
-                            >
-                              {user.name}
-                            </button>
-                          </li>
-                        ))}
-                      </ul>
-                    </div>
                   </div>
+                  <input
+                    type="text"
+                    className="form-control form-control-sm ms-auto mb-2 mt-2"
+                    placeholder="Search employees or roles..."
+                    value={searchTerm}
+                    onChange={handleSearchChange}
+                    style={{ maxWidth: "200px" }}
+                  />
                 </div>
               </div>
-
+            </div>
+          </div>
+          <div
+            className="col-12 mt-2"
+            style={{ maxHeight: "280px", overflowY: "auto", overflowX: "hidden" }}
+          >
+            {selectedRoles?.length > 0 && (
               <div className="row">
-                <div className="col-12 h-sm-25 overflow-auto mt-2" style={{height:"300px"}}>
+                {employeeLoading ? (
-                  {selectedRole !== "" && (
+                  <div className="col-12">
-                    <div className="row">
+                    <p className="text-center">Loading employees...</p>
-                      {employeeLoading ? (
+                  </div>
-                        <div className="col-12">
+                ) : filteredEmployees?.length > 0 ? (
-                          <p className="text-center">Loading employees...</p>
+                  filteredEmployees.map((emp) => {
-                        </div>
+                    const jobRole = jobRoleData?.find(
-                      ) : filteredEmployees?.length > 0 ? (
+                      (role) => role?.id === emp?.jobRoleId
-                        filteredEmployees.map((emp) => {
+                    );
-                          const jobRole = jobRoleData?.find(
-                            (role) => role?.id === emp?.jobRoleId
-                          );
 
-                          return (
+                    return (
-                            <div
+                      <div
-                              key={emp.id}
+                        key={emp.id}
-                              className="col-6 col-md-4 col-lg-3 mb-3"
+                        className="col-6 col-md-4 col-lg-3 mb-3"
-                            >
+                      >
-                              <div className="form-check d-flex align-items-start">
+                        <div className="form-check d-flex align-items-start">
-                                <Controller
+                          <Controller
-                                  name="selectedEmployees"
+                            name="selectedEmployees"
-                                  control={control}
+                            control={control}
-                                  render={({ field }) => (
+                            render={({ field }) => (
-                                    <input
+                              <input
-                                      {...field}
+                                {...field}
-                                      className="form-check-input me-1 mt-1"
+                                className="form-check-input me-1 mt-1"
-                                      type="checkbox"
+                                type="checkbox"
-                                      id={`employee-${emp?.id}`}
+                                id={`employee-${emp?.id}`} // Unique ID
-                                      value={emp.id}
+                                value={emp.id}
-                                      checked={field.value?.includes(emp.id)}
+                                checked={field.value?.includes(emp.id)}
-                                      onChange={(e) => {
+                                onChange={(e) => {
-                                        handleCheckboxChange(e, emp);
+                                  handleCheckboxChange(e, emp);
-                                      }}
+                                }}
-                                    />
+                              />
-                                  )}
+                            )}
-                                />
+                          />
-                                <div className="flex-grow-1">
+                          <div className="flex-grow-1">
-                                  <p
+                            <p
-                                    className="mb-0"
+                              className="mb-0"
-                                    style={{ fontSize: "13px" }}
+                              style={{ fontSize: "13px" }}
-                                  >
-                                    {emp.firstName} {emp.lastName}
-                                  </p>
-                                  <small
-                                    className="text-muted"
-                                    style={{ fontSize: "11px" }}
-                                  >
-                                    {loading ? (
-                                      <span className="placeholder-glow">
-                                        <span className="placeholder col-6"></span>
-                                      </span>
-                                    ) : (
-                                      jobRole?.name || "Unknown Role"
-                                    )}
-                                  </small>
-                                </div>
-                              </div>
-                            </div>
-                          );
-                        })
-                      ) : (
-                        <div className="col-12">
-                          <p className="text-center">
-                            No employees found for the selected role.
-                          </p>
-                        </div>
-                      )}
-                    </div>
-                  )}
-                </div>
-              </div>
-
-              <div
-                className="col-12 h-25 overflow-auto"
-                style={{ maxHeight: "200px" }}
-              >
-                {watch("selectedEmployees")?.length > 0 && (
-                  <div className="mt-1">
-                    <div className="text-start px-2">
-                      {watch("selectedEmployees")?.map((empId) => {
-                        const emp = employees.find((emp) => emp.id === empId);
-                        return (
-                          emp && (
-                            <span
-                              key={empId}
-                              className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
                             >
                               {emp.firstName} {emp.lastName}
-                              <p
+                            </p>
-                                type="button"
+                            <small
-                                className=" btn-close-white p-0 m-0"
+                              className="text-muted"
-                                aria-label="Close"
+                              style={{ fontSize: "11px" }}
-                                onClick={() => {
+                            >
-                                  const updatedSelected = watch(
+                              {loading ? (
-                                    "selectedEmployees"
+                                <span className="placeholder-glow">
-                                  ).filter((id) => id !== empId);
+                                  <span className="placeholder col-6"></span>
-                                  setValue(
+                                </span>
-                                    "selectedEmployees",
+                              ) : (
-                                    updatedSelected
+                                jobRole?.name || "Unknown Role"
-                                  );
+                              )}
-                                  trigger("selectedEmployees");
+                            </small>
-                                }}
+                          </div>
-                              >
+                        </div>
-                                <i className="icon-base bx bx-x icon-md "></i>
+                      </div>
-                              </p>
+                    );
-                            </span>
+                  })
-                          )
+                ) : (
-                        );
+                  <div className="col-12">
-                      })}
+                    <p className="text-center">
-                    </div>
+                      No employees found for the selected role(s).
+                    </p>
                   </div>
                 )}
               </div>
+            )}
+          </div>
 
-              {!loading && errors.selectedEmployees && (
+          <div
-                <div className="danger-text mt-1">
+            className="col-12 h-25 overflow-auto"
-                  <p>{errors.selectedEmployees.message}</p>{" "}
+            style={{ maxHeight: "200px" }}
+          >
+            {watch("selectedEmployees")?.length > 0 && (
+              <div className="mt-1">
+                <div className="text-start px-2">
+                  {watch("selectedEmployees")?.map((empId) => {
+                    const emp = employees.find((emp) => emp.id === empId);
+                    return (
+                      emp && (
+                        <span
+                          key={empId}
+                          className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
+                        >
+                          {emp.firstName} {emp.lastName}
+                          {/* Changed p tag to button for semantic correctness and accessibility */}
+                          <button
+                            type="button"
+                            className="btn-close btn-close-white ms-1" // Added ms-1 for spacing, removed p-0 m-0
+                            aria-label="Remove employee" // More descriptive aria-label
+                            onClick={() => {
+                              const updatedSelected = watch(
+                                "selectedEmployees"
+                              ).filter((id) => id !== empId);
+                              setValue(
+                                "selectedEmployees",
+                                updatedSelected
+                              );
+                              trigger("selectedEmployees");
+                            }}
+                          >
+                            <i className="icon-base bx bx-x icon-md"></i>
+                          </button>
+                        </span>
+                      )
+                    );
+                  })}
                 </div>
-              )}
+              </div>
+            )}
+          </div>
 
-              <div className="col-md text-start mx-0 px-0">
+          {!loading && errors.selectedEmployees && (
-                <div className="form-check form-check-inline mt-3 px-1">
+            <div className="danger-text mt-1">
-                  <label
+              <p>{errors.selectedEmployees.message}</p>{" "}
-                    className="form-text text-dark align-items-center d-flex"
+            </div>
-                    htmlFor="inlineCheckbox1"
+          )}
+
+          <div className="col-md text-start mx-0 px-0">
+            <div className="form-check form-check-inline mt-3 px-1">
+              <label
+                className="form-text text-dark align-items-center d-flex"
+                htmlFor="inlineCheckbox1" // This htmlFor isn't linked to a checkbox in this context
+              >
+                Pending Task of Activity :
+                <label
+                  className="form-check-label fs-7 ms-4"
+                  htmlFor="inlineCheckbox1" // This htmlFor isn't linked to a checkbox in this context
+                >
+                  <strong>
+                    {assignData?.workItem?.plannedWork -
+                      assignData?.workItem?.completedWork}
+                  </strong>{" "}
+                  <u>
+                    {
+                      assignData?.workItem?.activityMaster
+                        ?.unitOfMeasurement
+                    }
+                  </u>
+                </label>
+                <div style={{ display: "flex", alignItems: "center" }}>
+                  <div
+                    ref={infoRef}
+                    tabIndex="0"
+                    className="d-flex align-items-center avatar-group justify-content-center ms-2"
+                    data-bs-toggle="popover"
+                    data-bs-trigger="focus"
+                    data-bs-placement="right"
+                    data-bs-html="true"
+                    style={{ cursor: "pointer" }}
                   >
-                    Pending Task of Activity :
+                    &nbsp;
-                    <label
+                    <svg
-                      className="form-check-label fs-7 ms-4"
+                      xmlns="http://www.w3.org/2000/svg"
-                      htmlFor="inlineCheckbox1"
+                      width="13"
+                      height="13"
+                      fill="currentColor"
+                      className="bi bi-info-circle"
+                      viewBox="0 0 16 16"
                     >
-                      <strong>
+                      <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                        {assignData?.workItem?.plannedWork -
+                      <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                          assignData?.workItem?.completedWork}
+                    </svg>
-                      </strong>{" "}
+                  </div>
+                </div>
+              </label>
+            </div>
+          </div>
+
+          {/* Target for Today input and validation */}
+          <div className="col-md text-start mx-0 px-0">
+            <div className="form-check form-check-inline mt-2 px-1 mb-2 text-start">
+              <label
+                className="text-dark text-start d-flex align-items-center flex-wrap form-text"
+                htmlFor="targetForTodayInput" // Added a unique htmlFor for clarity
+              >
+                <span>Target for Today</span>&nbsp;
+                <span style={{ marginLeft: "46px" }}>:</span>
+              </label>
+            </div>
+            <div
+              className="form-check form-check-inline col-sm-3 mt-2"
+              style={{ marginLeft: "-28px" }}
+            >
+              <Controller
+                name="plannedTask"
+                control={control}
+                render={({ field }) => (
+                  <div className="d-flex align-items-center gap-1 ">
+                    <input
+                      type="text"
+                      className="form-control form-control-sm"
+                      {...field}
+                      id="defaultFormControlInput" // Consider a more descriptive ID if used elsewhere
+                      aria-describedby="defaultFormControlHelp"
+                    />
+                    <span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
                       <u>
+                        {" "}
                         {
                           assignData?.workItem?.activityMaster
                             ?.unitOfMeasurement
                         }
                       </u>
-                    </label>
+                    </span>
-                    <div style={{ display: "flex", alignItems: "center" }}>
+                    <div
+                      style={{
+                        display: "flex",
+                        alignItems: "center",
+                      }}
+                    >
                       <div
-                        ref={infoRef}
+                        ref={infoRef1}
                         tabIndex="0"
                         className="d-flex align-items-center avatar-group justify-content-center ms-2"
                         data-bs-toggle="popover"
@@ -387,133 +565,89 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
                         data-bs-html="true"
                         style={{ cursor: "pointer" }}
                       >
-                        <i class='bx bx-info-circle bx-xs m-0 text-secondary'></i>
+                        &nbsp;
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          width="13"
+                          height="13"
+                          fill="currentColor"
+                          className="bi bi-info-circle"
+                          viewBox="0 0 16 16"
+                        >
+                          <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                          <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
+                        </svg>
                       </div>
                     </div>
-                  </label>
-                </div>
-              </div>
-
-              {/* Target for Today input and validation */}
-              <div className="col-md text-start mx-0 px-0">
-                <div className="form-check form-check-inline mt-2 px-1 mb-2 text-start">
-                  <label
-                    className="text-dark text-start d-flex align-items-center flex-wrap form-text"
-                    htmlFor="inlineCheckbox1"
-                  >
-                    <span>Target for Today</span>&nbsp;
-                    <span style={{ marginLeft: "46px" }}>:</span>
-                  </label>
-                </div>
-                <div
-                  className="form-check form-check-inline col-sm-3 mt-2"
-                  style={{ marginLeft: "-28px" }}
-                >
-                  <Controller
-                    name="plannedTask"
-                    control={control}
-                    render={({ field }) => (
-                      <div className="d-flex align-items-center gap-1 ">
-                        <input
-                          type="text"
-                          className="form-control form-control-sm"
-                          {...field}
-                          id="defaultFormControlInput"
-                          aria-describedby="defaultFormControlHelp"
-                        />
-                        <span style={{ paddingLeft: "6px" }}>
-                          {
-                            assignData?.workItem?.workItem?.activityMaster
-                              ?.unitOfMeasurement
-                          }
-                        </span>
-                        <div
-                          className="flex align-items-center"
-                        >
-                          <div
-                            ref={infoRef1}
-                            tabIndex="0"
-                            className="d-flex align-items-center avatar-group justify-content-center ms-2 cursor-pointer"
-                            data-bs-toggle="popover"
-                            data-bs-trigger="focus"
-                            data-bs-placement="right"
-                            data-bs-html="true"
-                          >
-                              <i class='bx bx-info-circle bx-xs m-0 text-secondary'></i>
-                          </div>
-                        </div>
-                      </div>
-                    )}
-                  />
-                </div>
-
-                {errors.plannedTask && (
-                  <div className="danger-text mt-1">
-                    {errors.plannedTask.message}
                   </div>
                 )}
-
-                {isHelpVisible && (
-                  <div
-                    className="position-absolute bg-white border p-2 rounded shadow"
-                    style={{ zIndex: 10, marginLeft: "10px" }}
-                  >
-                    {/* Add your help content here */}
-                    <p className="mb-0">
-                      Enter the target value for today's task.
-                    </p>
-                  </div>
-                )}
-              </div>
-
-              <label
-                className="form-text fs-7 m-1 text-lg text-dark"
-                htmlFor="descriptionTextarea" // Changed htmlFor for better accessibility
-              >
-                Description
-              </label>
-              <Controller
-                name="description"
-                control={control}
-                render={({ field }) => (
-                  <textarea
-                    {...field}
-                    className="form-control"
-                    id="descriptionTextarea" // Changed id for better accessibility
-                    rows="2"
-                  />
-                )}
               />
-              {errors.description && (
-                <div className="danger-text">{errors.description.message}</div>
-              )}
             </div>
 
-            {/* Submit and Cancel buttons */}
+            {errors.plannedTask && (
-            <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
+              <div className="danger-text mt-1">
-              <button
+                {errors.plannedTask.message}
-                type="submit"
+              </div>
-                className="btn btn-sm btn-primary "
+            )}
-                disabled={isSubmitting || loading}
+
+            {isHelpVisible && (
+              <div
+                className="position-absolute bg-white border p-2 rounded shadow"
+                style={{ zIndex: 10, marginLeft: "10px" }}
               >
-                {isSubmitting ? "Please Wait" : "Submit"}
+                <p className="mb-0">
-              </button>
+                  Enter the target value for today's task.
-              <button
+                </p>
-                type="reset"
+              </div>
-                className="btn btn-sm btn-label-secondary"
+            )}
-                data-bs-dismiss="modal"
+          </div>
-                aria-label="Close"
+
-                onClick={closedModel}
+          <label
-                disabled={isSubmitting || loading}
+            className="form-text fs-7 m-1 text-dark" // Removed duplicate htmlFor and text-lg
-              >
+            htmlFor="descriptionTextarea"
-                Cancel
+          >
-              </button>
+            Description
-            </div>
+          </label>
-          </form>
+          <Controller
+            name="description"
+            control={control}
+            render={({ field }) => (
+              <textarea
+                {...field}
+                className="form-control"
+                id="descriptionTextarea" // Unique ID
+                rows="2"
+              />
+            )}
+          />
+          {errors.description && (
+            <div className="danger-text">{errors.description.message}</div>
+          )}
         </div>
-      </div>
+
+        <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
+          <button
+            type="submit"
+            className="btn btn-sm btn-primary "
+            disabled={isSubmitting || loading}
+          >
+            {isSubmitting ? "Please Wait" : "Submit"}
+          </button>
+          <button
+            type="reset"
+            className="btn btn-sm btn-label-secondary"
+            data-bs-dismiss="modal"
+            aria-label="Close"
+            onClick={closedModel}
+            disabled={isSubmitting || loading}
+          >
+            Cancel
+          </button>
+        </div>
+      </form>
     </div>
-  );
+  </div>
+</div>  );
 };
 
-export default AssignTask;
+export default AssignTask;

src/components/master/CreateActivity.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect,useCallback } from "react";
+import React, { useState, useEffect } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";

src/hooks/usePositionTracker.js

@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react';
-import showToast from '../services/toastService';
 
 export const usePositionTracker = () => {
     const [coords, setCoords] = useState({ latitude: 0, longitude: 0 });
@@ -10,7 +9,7 @@ export const usePositionTracker = () => {
           setCoords(coords);
         },
         (error) => {
-          showToast("Please Allow Location","warn");
+          alert(error.message);
         },
         { enableHighAccuracy: true, timeout: 20000, maximumAge: 1000 }
       );

src/pages/Activities/AttendancePage.jsx

@@ -8,32 +8,35 @@ import {
 import Breadcrumb from "../../components/common/Breadcrumb";
 import AttendanceLog from "../../components/Activities/AttendcesLogs";
 import Attendance from "../../components/Activities/Attendance";
+import AttendanceModel from "../../components/Activities/AttendanceModel";
+import showToast from "../../services/toastService";
 import Regularization from "../../components/Activities/Regularization";
 import { useAttendance } from "../../hooks/useAttendance";
 import { useDispatch, useSelector } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
-import { hasUserPermission } from "../../utils/authUtils";
+import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
 import eventBus from "../../services/eventBus";
+import AttendanceRepository from "../../repositories/AttendanceRepository";
 import { useProjectName } from "../../hooks/useProjects";
-import GlobalModel from "../../components/common/GlobalModel";
-import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm";
-import AttendLogs from "../../components/Activities/AttendLogs";
-import { useQueryClient } from "@tanstack/react-query";
 
 const AttendancePage = () => {
   const [activeTab, setActiveTab] = useState("all");
-  const [ShowPending, setShowPending] = useState(false);
+  const [showPending, setShowPending] = useState(false);
-  const queryClient = useQueryClient();
+  const [searchQuery, setSearchQuery] = useState("");
   const loginUser = getCachedProfileData();
-  var selectedProject = useSelector((store) => store.localVariables.projectId);
+  const selectedProject = useSelector((store) => store.localVariables.projectId);
   const dispatch = useDispatch();
-
+  const {
+    attendance,
+    loading: attLoading,
+    recall: attrecall,
+  } = useAttendance(selectedProject);
   const [attendances, setAttendances] = useState();
   const [empRoles, setEmpRoles] = useState(null);
   const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-  const [modelConfig, setModelConfig] = useState();
+  const [modelConfig, setModelConfig] = useState(null); // Initialize as null
   const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
@@ -43,67 +46,172 @@ const AttendancePage = () => {
     date: new Date().toLocaleDateString(),
   });
 
-  useEffect(() => {
+  const handler = useCallback(
-    if (selectedProject == null) {
+    (msg) => {
-      dispatch(setProjectId(projectNames[0]?.id));
+      if (selectedProject === msg.projectId) {
-    }
+        const updatedAttendance = attendances
-  }, []);
+          ? attendances.map((item) =>
+              item.employeeId === msg.response.employeeId
+                ? { ...item, ...msg.response }
+                : item
+            )
+          : [msg.response];
+
+        cacheData("Attendance", {
+          data: updatedAttendance,
+          projectId: selectedProject,
+        });
+        setAttendances(updatedAttendance);
+      }
+    },
+    [selectedProject, attendances]
+  );
+
+  const employeeHandler = useCallback(
+    (msg) => {
+      // This logic seems fine for refetching if an employee ID exists in current attendances
+      if (attendances?.some((item) => item.employeeId === msg.employeeId)) {
+        AttendanceRepository.getAttendance(selectedProject)
+          .then((response) => {
+            cacheData("Attendance", { data: response.data, selectedProject });
+            setAttendances(response.data);
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+      }
+    },
+    [selectedProject, attendances]
+  );
 
   const getRole = (roleId) => {
     if (!empRoles) return "Unassigned";
     if (!roleId) return "Unassigned";
-    const role = empRoles.find((b) => b.id == roleId);
+    const role = empRoles.find((b) => b.id === roleId);
     return role ? role.role : "Unassigned";
   };
 
-  const openModel = () => {
+  // Simplified and moved modal opening logic
-    setIsCreateModalOpen(true);
+  const handleModalData = useCallback((employee) => {
-  };
-
-  const handleModalData = (employee) => {
     setModelConfig(employee);
-  };
+    setIsCreateModalOpen(true); // Open the modal directly when data is set
+  }, []);
 
-  const closeModal = () => {
+  const closeModal = useCallback(() => {
     setModelConfig(null);
     setIsCreateModalOpen(false);
-  };
+    // Directly manipulating the DOM is generally not recommended in React.
+    // React handles modal visibility via state. If you must, ensure it's
+    // for external libraries or for very specific, controlled reasons.
+    // For a typical Bootstrap modal, just setting `isCreateModalOpen` to false
+    // should be enough if the modal component itself handles the Bootstrap classes.
+    const modalElement = document.getElementById("check-Out-modal");
+    if (modalElement) {
+      modalElement.classList.remove("show");
+      modalElement.style.display = "none";
+      document.body.classList.remove("modal-open");
+      const modalBackdrop = document.querySelector(".modal-backdrop");
+      if (modalBackdrop) {
+        modalBackdrop.remove();
+      }
+    }
+  }, []);
+
+  const handleSubmit = useCallback((formData) => {
+    dispatch(markCurrentAttendance(formData))
+      .then((action) => {
+        if (action.payload && action.payload.employeeId) {
+          const updatedAttendance = attendances
+            ? attendances.map((item) =>
+                item.employeeId === action.payload.employeeId
+                  ? { ...item, ...action.payload }
+                  : item
+              )
+            : [action.payload];
+
+          cacheData("Attendance", {
+            data: updatedAttendance,
+            projectId: selectedProject,
+          });
+          setAttendances(updatedAttendance);
+          showToast("Attendance Marked Successfully", "success");
+        } else {
+          showToast("Failed to mark attendance: Invalid response", "error");
+        }
+      })
+      .catch((error) => {
+        showToast(error.message, "error");
+      });
+  }, [dispatch, attendances, selectedProject]);
+
 
   const handleToggle = (event) => {
-    setShowOnlyCheckout(event.target.checked);
+    setShowPending(event.target.checked);
   };
 
+  useEffect(() => {
+    if (selectedProject === null && projectNames.length > 0) {
+      dispatch(setProjectId(projectNames[0]?.id));
+    }
+  }, [selectedProject, projectNames, dispatch]);
 
   useEffect(() => {
-    if (modelConfig !== null) {
+    setAttendances(attendance);
-      openModel();
+  }, [attendance]);
+
+  const filteredAndSearchedTodayAttendance = useCallback(() => {
+    let currentData = attendances;
+
+    if (showPending) {
+      currentData = currentData?.filter(
+        (att) => att?.checkInTime !== null && att?.checkOutTime === null
+      );
     }
-  }, [modelConfig, isCreateModalOpen]);
+
+    if (searchQuery) {
+      const lowerCaseSearchQuery = searchQuery.toLowerCase();
+      currentData = currentData?.filter((att) => {
+        const fullName = [att.firstName, att.middleName, att.lastName]
+          .filter(Boolean)
+          .join(" ")
+          .toLowerCase();
+
+        return (
+          att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          fullName.includes(lowerCaseSearchQuery)
+        );
+      });
+    }
+    return currentData;
+  }, [attendances, showPending, searchQuery]);
+
+  useEffect(() => {
+    eventBus.on("attendance", handler);
+    return () => eventBus.off("attendance", handler);
+  }, [handler]);
+
+  useEffect(() => {
+    eventBus.on("employee", employeeHandler);
+    return () => eventBus.off("employee", employeeHandler);
+  }, [employeeHandler]);
 
   return (
     <>
       {isCreateModalOpen && modelConfig && (
-        <GlobalModel
+        <div
-          isOpen={isCreateModalOpen}
+          className="modal fade show"
-          size={modelConfig?.action === 6 && "lg"}
+          style={{ display: "block" }}
-          closeModal={closeModal}
+          id="check-Out-modal"
+          tabIndex="-1"
+          aria-hidden="true"
         >
-          {(modelConfig?.action === 0 ||
+          <AttendanceModel
-            modelConfig?.action === 1 ||
+            modelConfig={modelConfig}
-            modelConfig?.action === 2) && (
+            closeModal={closeModal}
-            <CheckCheckOutmodel
+            handleSubmitForm={handleSubmit}
-              modeldata={modelConfig}
+          />
-              closeModal={closeModal}
+        </div>
-            />
-          )}
-          {/* For view logs */}
-          {modelConfig?.action === 6 && (
-            <AttendLogs Id={modelConfig?.id} closeModal={closeModal} />
-          )}
-          {modelConfig?.action === 7 && (
-            <Confirmation closeModal={closeModal} />
-          )}
-        </GlobalModel>
       )}
 
       <div className="container-fluid">
@@ -113,69 +221,106 @@ const AttendancePage = () => {
             { label: "Attendance", link: null },
           ]}
         ></Breadcrumb>
-        <div className="nav-align-top nav-tabs-shadow" >
+        <div className="nav-align-top nav-tabs-shadow">
-          <ul className="nav nav-tabs" role="tablist">
+          <ul
-            <li className="nav-item">
+            className="nav nav-tabs d-flex justify-content-between align-items-center"
-              <button
+            role="tablist"
-                type="button"
+          >
-                className={`nav-link ${
+            <div className="d-flex">
-                  activeTab === "all" ? "active" : ""
+              <li className="nav-item">
-                } fs-6`}
+                <button
-                onClick={() => setActiveTab("all")}
+                  type="button"
-                data-bs-toggle="tab"
+                  className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`}
-                data-bs-target="#navs-top-home"
+                  onClick={() => setActiveTab("all")}
-              >
+                  data-bs-toggle="tab"
-                Today's
+                  data-bs-target="#navs-top-home"
-              </button>
+                >
-            </li>
+                  Today's
-            <li className="nav-item">
+                </button>
-              <button
+              </li>
-                type="button"
+              <li className="nav-item">
-                className={`nav-link ${
+                <button
-                  activeTab === "logs" ? "active" : ""
+                  type="button"
-                } fs-6`}
+                  className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`}
-                onClick={() => setActiveTab("logs")}
+                  onClick={() => setActiveTab("logs")}
-                data-bs-toggle="tab"
+                  data-bs-toggle="tab"
-                data-bs-target="#navs-top-profile"
+                  data-bs-target="#navs-top-profile"
-              >
+                >
-                Logs
+                  Logs
-              </button>
+                </button>
-            </li>
+              </li>
-            <li className={`nav-item ${!DoRegularized && "d-none"}`}>
+              <li className={`nav-item ${!DoRegularized && "d-none"}`}>
-              <button
+                <button
-                type="button"
+                  type="button"
-                className={`nav-link ${
+                  className={`nav-link ${
-                  activeTab === "regularization" ? "active" : ""
+                    activeTab === "regularization" ? "active" : ""
-                } fs-6`}
+                  } fs-6`}
-                onClick={() => setActiveTab("regularization")}
+                  onClick={() => setActiveTab("regularization")}
-                data-bs-toggle="tab"
+                  data-bs-toggle="tab"
-                data-bs-target="#navs-top-messages"
+                  data-bs-target="#navs-top-messages"
-              >
+                >
-                Regularization
+                  Regularization
-              </button>
+                </button>
-            </li>
+              </li>
+            </div>
+            <div className="p-2">
+              <input
+                type="text"
+                className="form-control form-control-sm"
+                placeholder="Search employee..."
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+              />
+            </div>
           </ul>
-          <div className="tab-content attedanceTabs py-0 px-1 px-sm-3" >
+          <div className="tab-content attedanceTabs py-0 px-1 px-sm-3">
             {activeTab === "all" && (
+              <>
+                {!attLoading && (
                   <div className="tab-pane fade show active py-0">
                     <Attendance
+                      attendance={filteredAndSearchedTodayAttendance()}
                       handleModalData={handleModalData}
                       getRole={getRole}
+                      setshowOnlyCheckout={setShowPending}
+                      showOnlyCheckout={showPending}
+                      searchQuery={searchQuery}
                     />
                   </div>
+                )}
+                {!attLoading && filteredAndSearchedTodayAttendance()?.length === 0 && (
+                  <p>
+                    {" "}
+                    {showPending
+                      ? "No Pending Available"
+                      : "No Employee assigned yet."}{" "}
+                  </p>
+                )}
+              </>
             )}
+
             {activeTab === "logs" && (
               <div className="tab-pane fade show active py-0">
                 <AttendanceLog
                   handleModalData={handleModalData}
+                  projectId={selectedProject}
+                  setshowOnlyCheckout={setShowPending}
+                  showOnlyCheckout={showPending}
+                  searchQuery={searchQuery}
                 />
               </div>
             )}
+
             {activeTab === "regularization" && DoRegularized && (
               <div className="tab-pane fade show active py-0">
-                <Regularization />
+                <Regularization
+                  handleRequest={handleSubmit}
+                  searchQuery={searchQuery}
+                />
               </div>
             )}
+
+            {!attLoading && !attendances && <span>Not Found</span>}
           </div>
         </div>
       </div>
@@ -183,4 +328,4 @@ const AttendancePage = () => {
   );
 };
 
-export default AttendancePage;
+export default AttendancePage;