src/components/Activities/AttendcesLogs.jsx

@@ -6,35 +6,45 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import { useSelector, useDispatch } from "react-redux";
 import { fetchAttendanceData } 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) => {
-  const resetPage = useCallback(() => setCurrentPage(1), []);
+    if (pageNumber > 0 && pageNumber <= maxPage) {
+      setCurrentPage(pageNumber);
+    }
+  }, [maxPage]);
+
+  const resetPage = useCallback(() => setCurrentPage(1), []); // This is returned by the hook
 
   return {
     currentPage,
     totalPages: maxPage,
     currentItems,
     paginate,
-    resetPage,
+    resetPage, // Ensure resetPage is returned here
   };
 };
 
 const AttendanceLog = ({
   handleModalData,
+  projectId,
+  setshowOnlyCheckout,
+  showOnlyCheckout,
+  searchQuery, // Prop for search query
 }) => {
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
@@ -45,50 +55,74 @@ const AttendanceLog = ({
   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();
+      filteredData = filteredData.filter((att) => {
+        // Construct a full name from available parts, filtering out null/undefined
+        const fullName = [att.firstName, att.middleName, att.lastName]
+          .filter(Boolean) // This removes null, undefined, or empty string parts
+          .join(" ")
+          .toLowerCase();
+
+        return (
+          att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          fullName.includes(lowerCaseSearchQuery)
+        );
+      });
+    }
+
     const group1 = filteredData
       .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
       .sort(sortByName);
@@ -131,74 +165,68 @@ const AttendanceLog = ({
       (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);
 
+  // Reset page when processedData changes (due to filters/search)
   useEffect(() => {
     resetPage();
-  }, [processedData, resetPage]);
+  }, [processedData, resetPage]); // Add resetPage to dependency array
 
   const handler = useCallback(
     (msg) => {
       const { startDate, endDate } = dateRange;
-      const checkIn = msg.response.checkInTime.substring(0, 10);
+      const checkIn = msg.response.checkInTime ? msg.response.checkInTime.substring(0, 10) : null;
+
       if (
-        selectedProject === msg.projectId &&
+        projectId === msg.projectId &&
+        checkIn &&
         startDate <= checkIn &&
         checkIn <= endDate
       ) {
-        queryClient.setQueriesData(["attendanceLogs"],(oldData)=>{
+        dispatch(
-          if(!oldData) {
+          fetchAttendanceData({
-            queryClient.invalidateQueries({queryKey:["attendanceLogs"]})
+            projectId,
-          }
+            fromDate: startDate,
-          return oldData.map((record) =>
+            toDate: endDate,
-          record.id === msg.response.id ? { ...record, ...msg.response } : record
+          })
         );
-        })
-
-        filtering(updatedAttendance);
-        resetPage();
       }
     },
-    [selectedProject, dateRange, data, filtering, resetPage]
+    [projectId, dateRange, dispatch]
   );
 
+  useEffect(() => {
   useEffect(() => {
     eventBus.on("attendance_log", handler);
     return () => eventBus.off("attendance_log", handler);
   }, [handler]);
 
+  const employeeHandler = useCallback(
   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(() => {
   useEffect(() => {
     eventBus.on("employee", employeeHandler);
     return () => eventBus.off("employee", employeeHandler);
@@ -230,18 +258,18 @@ const AttendanceLog = ({
         </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()}
           />
         </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 +288,97 @@ 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 +393,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 +406,8 @@ const AttendanceLog = ({
               )
             )}
             <li
-              className={`page-item ${
+              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                currentPage === totalPages ? "disabled" : ""
+                }`}
-              }`}
             >
               <button
                 className="page-link"
@@ -382,4 +423,4 @@ const AttendanceLog = ({
   );
 };
 
-export default AttendanceLog;
+export default AttendanceLog;

src/components/Activities/Regularization.jsx

@@ -7,64 +7,39 @@ 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(
+        const updatedAttendance = regularizes?.filter(item => item.id !== msg.response.id);
-        //   (item) => item.id !== msg.response.id
+        cacheData("regularizedList", {
-        // );
+          data: updatedAttendance,
-        // cacheData("regularizedList", {
+          projectId: selectedProject,
-        //   data: updatedAttendance,
+        });
-        //   projectId: selectedProject,
+        refetch();
-        // });
-        // refetch();
-
-        queryClient.setQueryData(
-          ["regularizedList", selectedProject],
-          (oldData) => {
-            if (!oldData) {
-              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 employeeHandler = useCallback(
-
-  const { currentPage, totalPages, currentItems, paginate } = usePagination(
-    filteredData,
-    20
-  );
-  useEffect(() => {
-    eventBus.on("regularization", handler);
-    return () => eventBus.off("regularization", handler);
-  }, [handler]);
-
   const employeeHandler = useCallback(
     (msg) => {
       if (regularizes.some((item) => item.employeeId == msg.employeeId)) {
@@ -74,41 +49,58 @@ const Regularization = ({ handleRequest }) => {
     [regularizes]
   );
 
+  useEffect(() => {
+    eventBus.on("regularization", handler);
+    return () => eventBus.off("regularization", handler);
+  }, [handler]);
+
+  useEffect(() => {
   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">
@@ -123,24 +115,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">
@@ -155,25 +156,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;
@@ -187,3 +181,4 @@ const Regularization = ({ handleRequest }) => {
 };
 
 export default Regularization;
+

src/pages/Activities/AttendancePage.jsx

@@ -10,13 +10,11 @@ import AttendanceLog from "../../components/Activities/AttendcesLogs";
 import Attendance from "../../components/Activities/Attendance";
 // import AttendanceModel from "../../components/Activities/AttendanceModel";
 import showToast from "../../services/toastService";
-// import { useProjects } from "../../hooks/useProjects";
 import Regularization from "../../components/Activities/Regularization";
 import { useAttendance } from "../../hooks/useAttendance";
 import { useDispatch, useSelector } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
-// import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
+import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
-import { hasUserPermission } from "../../utils/authUtils";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
 import eventBus from "../../services/eventBus";
@@ -30,16 +28,16 @@ import { useQueryClient } from "@tanstack/react-query";
 
 const AttendancePage = () => {
   const [activeTab, setActiveTab] = useState("all");
-  const [ShowPending, setShowPending] = useState(false);
+  const [showPending, setShowPending] = useState(false); // Renamed for consistency
-  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 {
+  const {
-  //   attendance,
+    attendance,
-  //   loading: attLoading,
+    loading: attLoading,
-  //   recall: attrecall,
+    recall: attrecall,
-  // } = useAttendance(selectedProject);
+  } = useAttendace(selectedProject);
   const [attendances, setAttendances] = useState();
   const [empRoles, setEmpRoles] = useState(null);
   const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
@@ -47,49 +45,55 @@ const AttendancePage = () => {
   const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
+
   const [formData, setFormData] = useState({
     markTime: "",
     description: "",
     date: new Date().toLocaleDateString(),
   });
 
-  // const handler = useCallback(
+  const handler = useCallback(
-  //   (msg) => {
+    (msg) => {
-  //     if (selectedProject == msg.projectId) {
+      if (selectedProject === msg.projectId) {
-  //       const updatedAttendance = attendances.map((item) =>
+        // Ensure attendances is not null before mapping
-  //         item.employeeId === msg.response.employeeId
+        const updatedAttendance = attendances
-  //           ? { ...item, ...msg.response }
+          ? attendances.map((item) =>
-  //           : item
+            item.employeeId === msg.response.employeeId
-  //       );
+              ? { ...item, ...msg.response }
-  //       queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
+              : item
-  //         if (!oldData) return oldData;
+          )
-  //         return oldData.map((emp) =>
+          : [msg.response]; // If attendances is null, initialize with new response
-  //           emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
-  //         );
-  //       });
-  //     }
-  //   },
-  //   [selectedProject, attrecall]
-  // );
 
-  // const employeeHandler = useCallback(
+        cacheData("Attendance", {
-  //   (msg) => {
+          data: updatedAttendance,
-  //     if (attendances.some((item) => item.employeeId == msg.employeeId)) {
+          projectId: selectedProject,
-  //       attrecall();
+        });
-  //     }
+        setAttendances(updatedAttendance);
-  //   },
+      }
-  //   [selectedProject, attendances]
+    },
-  // );
+    [selectedProject, attendances] // Removed attrecall as it's not a direct dependency for this state update
-  useEffect(() => {
+  );
-    if (selectedProject == null) {
+
-      dispatch(setProjectId(projectNames[0]?.id));
+  const employeeHandler = useCallback(
-    }
+    (msg) => {
-  }, []);
+      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";
   };
 
@@ -104,23 +108,101 @@ const AttendancePage = () => {
   const closeModal = () => {
     setModelConfig(null);
     setIsCreateModalOpen(false);
+    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 = (formData) => {
+    dispatch(markCurrentAttendance(formData))
+      .then((action) => {
+        // Check if payload and employeeId exist before mapping
+        if (action.payload && action.payload.employeeId) {
+          const updatedAttendance = attendances
+            ? attendances.map((item) =>
+              item.employeeId === action.payload.employeeId
+                ? { ...item, ...action.payload }
+                : item
+            )
+            : [action.payload]; // If attendances is null, initialize with new 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");
+      });
   };
 
   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]);
 
-
+  // Open modal when modelConfig is set
   useEffect(() => {
     if (modelConfig !== null) {
       openModel();
     }
-  }, [modelConfig, isCreateModalOpen]);
+  }, [modelConfig]); // Removed isCreateModalOpen from here as it's set by openModel()
+  
+  useEffect(() => {
+    setAttendances(attendance);
+  }, [attendance]);
 
-  // useEffect(() => {
+  // Filter and search logic for the 'Today's' tab (Attendance component)
-  //   eventBus.on("attendance", handler);
+  const filteredAndSearchedTodayAttendance = useCallback(() => {
-  //   return () => eventBus.off("attendance", handler);
+    let currentData = attendances;
-  // }, [handler]);
+
+    if (showPending) {
+      currentData = currentData?.filter(
+        (att) => att?.checkInTime !== null && att?.checkOutTime === null
+      );
+    }
+
+    if (searchQuery) {
+      const lowerCaseSearchQuery = searchQuery.toLowerCase();
+      currentData = currentData?.filter((att) => {
+        // Combine first, middle, and last names for a comprehensive search
+        const fullName = [att.firstName, att.middleName, att.lastName]
+          .filter(Boolean) // Remove null or undefined parts
+          .join(" ")
+          .toLowerCase();
+
+        return (
+          att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
+          fullName.includes(lowerCaseSearchQuery)
+        );
+      });
+    }
+    return currentData;
+  }, [attendances, showPending, searchQuery]);
+
+
+  // Event bus listeners
+  useEffect(() => {
+    eventBus.on("attendance", handler);
+    return () => eventBus.off("attendance", handler);
+  }, [handler]);
 
   // useEffect(() => {
   //   eventBus.on("employee", employeeHandler);
@@ -174,69 +256,100 @@ 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 className="nav nav-tabs d-flex justify-content-between align-items-center" role="tablist">
-            <li className="nav-item">
+            <div className="d-flex">
-              <button
+              <li className="nav-item">
-                type="button"
+                <button
-                className={`nav-link ${
+                  type="button"
-                  activeTab === "all" ? "active" : ""
+                  className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`}
-                } fs-6`}
+                  onClick={() => setActiveTab("all")}
-                onClick={() => setActiveTab("all")}
+                  data-bs-toggle="tab"
-                data-bs-toggle="tab"
+                  data-bs-target="#navs-top-home"
-                data-bs-target="#navs-top-home"
+                >
-              >
+                  Today's
-                Today's
+                </button>
-              </button>
+              </li>
-            </li>
+              <li className="nav-item">
-            <li className="nav-item">
+                <button
-              <button
+                  type="button"
-                type="button"
+                  className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`}
-                className={`nav-link ${
+                  onClick={() => setActiveTab("logs")}
-                  activeTab === "logs" ? "active" : ""
+                  data-bs-toggle="tab"
-                } fs-6`}
+                  data-bs-target="#navs-top-profile"
-                onClick={() => setActiveTab("logs")}
+                >
-                data-bs-toggle="tab"
+                  Logs
-                data-bs-target="#navs-top-profile"
+                </button>
-              >
+              </li>
-                Logs
+              <li className={`nav-item ${!DoRegularized && "d-none"}`}>
-              </button>
+                <button
-            </li>
+                  type="button"
-            <li className={`nav-item ${!DoRegularized && "d-none"}`}>
+                  className={`nav-link ${activeTab === "regularization" ? "active" : ""
-              <button
+                    } fs-6`}
-                type="button"
+                  onClick={() => setActiveTab("regularization")}
-                className={`nav-link ${
+                  data-bs-toggle="tab"
-                  activeTab === "regularization" ? "active" : ""
+                  data-bs-target="#navs-top-messages"
-                } fs-6`}
+                >
-                onClick={() => setActiveTab("regularization")}
+                  Regularization
-                data-bs-toggle="tab"
+                </button>
-                data-bs-target="#navs-top-messages"
+              </li>
-              >
+            </div>
-                Regularization
+            {/* Search Box remains here */}
-              </button>
+            <div className="p-2">
-            </li>
+              <input
+                type="text"
+                className="form-control form-control-sm" // Bootstrap small size input
+                placeholder="Search employee..."
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+              // style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
+              />
+            </div>
+
           </ul>
           <div className="tab-content attedanceTabs py-0 px-1 px-sm-3" >
             {activeTab === "all" && (
                   <div className="tab-pane fade show active py-0">
                     <Attendance
+                      attendance={filteredAndSearchedTodayAttendance()}
                       handleModalData={handleModalData}
                       getRole={getRole}
+                      setshowOnlyCheckout={setShowPending}
+                      showOnlyCheckout={showPending}
                     />
                   </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} // Pass search query to AttendanceLog
                 />
               </div>
             )}
             {activeTab === "regularization" && DoRegularized && (
               <div className="tab-pane fade show active py-0">
-                <Regularization />
+                <Regularization
+                  handleRequest={handleSubmit}
+                  searchQuery={searchQuery} // ✅ Pass it here
+                />
               </div>
             )}
+
+            {!attLoading && !attendances && <span>Not Found</span>}
           </div>
         </div>
       </div>
@@ -244,4 +357,4 @@ const AttendancePage = () => {
   );
 };
 
-export default AttendancePage;
+export default AttendancePage;