Incorrect navigation when viewing project details

public/assets/css/core-extend.css

@@ -9,4 +9,88 @@
 }
 .table_header_border {
  border-bottom:2px solid var(--bs-table-border-color) ;
-}
+}
+.text-gary-80 {
+  color:var(--bs-gray-500)
+}
+
+.text-royalblue{
+  color: #1796e3;
+}
+
+.text-md {
+  font-size: 2rem;
+}
+
+.text-md-b { 
+  font-weight: normal;
+}
+.text-xxs { font-size: 0.55rem; }       /* 8px */
+.text-xs { font-size: 0.75rem; }       /* 12px */
+.text-sm { font-size: 0.875rem; }      /* 14px */
+.text-base { font-size: 1rem; }        /* 16px */
+.text-lg { font-size: 1.125rem; }      /* 18px */
+.text-xl { font-size: 1.25rem; }       /* 20px */
+.text-2xl { font-size: 1.5rem; }       /* 24px */
+.text-3xl { font-size: 1.875rem; }     /* 30px */
+.text-4xl { font-size: 2.25rem; }      /* 36px */
+.text-5xl { font-size: 3rem; }         /* 48px */
+.text-6xl { font-size: 3.75rem; }      /* 60px */
+.text-7xl { font-size: 4.5rem; }       /* 72px */
+.text-8xl { font-size: 6rem; }         /* 96px */
+.text-9xl { font-size: 8rem; }         /* 128px */
+
+
+/*  */
+
+.w-0     { width: 0px; }
+.w-px    { width: 1px; }
+.w-1     { width: 0.25rem; }  /* 4px */
+.w-2     { width: 0.5rem; }   /* 8px */
+.w-3     { width: 0.75rem; }  /* 12px */
+.w-4     { width: 1rem; }     /* 16px */
+.w-5     { width: 1.25rem; }  /* 20px */
+.w-6     { width: 1.5rem; }   /* 24px */
+.w-8     { width: 2rem; }     /* 32px */
+.w-10    { width: 2.5rem; }   /* 40px */
+.w-12    { width: 3rem; }     /* 48px */
+.w-16    { width: 4rem; }     /* 64px */
+.w-20    { width: 5rem; }     /* 80px */
+.w-24    { width: 6rem; }     /* 96px */
+.w-32    { width: 8rem; }     /* 128px */
+.w-40    { width: 10rem; }    /* 160px */
+.w-48    { width: 12rem; }    /* 192px */
+.w-56    { width: 14rem; }    /* 224px */
+.w-64    { width: 16rem; }    /* 256px */
+.w-auto  { width: auto; }
+.w-full  { width: 100%; }
+.w-screen{ width: 100vw; }
+.w-min   { width: min-content; }
+.w-max   { width: max-content; }
+
+
+
+.h-0     { height: 0px; }
+.h-px    { height: 1px; }
+.h-1     { height: 0.25rem; }  /* 4px */
+.h-2     { height: 0.5rem; }   /* 8px */
+.h-3     { height: 0.75rem; }  /* 12px */
+.h-4     { height: 1rem; }     /* 16px */
+.h-5     { height: 1.25rem; }  /* 20px */
+.h-6     { height: 1.5rem; }   /* 24px */
+.h-8     { height: 2rem; }     /* 32px */
+.h-10    { height: 2.5rem; }   /* 40px */
+.h-12    { height: 3rem; }     /* 48px */
+.h-16    { height: 4rem; }     /* 64px */
+.h-20    { height: 5rem; }     /* 80px */
+.h-24    { height: 6rem; }     /* 96px */
+.h-32    { height: 8rem; }     /* 128px */
+.h-40    { height: 10rem; }    /* 160px */
+.h-48    { height: 12rem; }    /* 192px */
+.h-56    { height: 14rem; }    /* 224px */
+.h-64    { height: 16rem; }    /* 256px */
+.h-auto  { height: auto; }
+.h-full  { height: 100%; }
+.h-screen{ height: 100vh; }
+.h-min   { height: min-content; }
+.h-max   { height: max-content; }

public/assets/vendor/css/core.css

@@ -32573,4 +32573,7 @@ body:not(.modal-open) .layout-content-navbar .layout-navbar {
 }
 .text-red{
   color:var(--bs-red)
+}
+.bg-gray {
+background:var(--bs-body-color)
 }

src/ModalProvider.jsx

@@ -3,15 +3,19 @@ import { useOrganizationModal } from "./hooks/useOrganization";
 import OrganizationModal from "./components/Organization/OrganizationModal";
 import { useAuthModal } from "./hooks/useAuth";
 import SwitchTenant from "./pages/authentication/SwitchTenant";
+import { useProjectModal } from "./hooks/useProjects";
+import { ProjectModal } from "./components/Project/ManageProjectInfo";
 
 const ModalProvider = () => {
   const { isOpen, onClose } = useOrganizationModal();
   const { isOpen: isAuthOpen } = useAuthModal();
+  const {isOpen:isOpenProject}  = useProjectModal()
 
   return (
     <>
       {isOpen && <OrganizationModal />}
       {isAuthOpen && <SwitchTenant />}
+      {isOpenProject && <ProjectModal/>}
     </>
   );
 };

src/components/Activities/Attendance.jsx

@@ -11,6 +11,7 @@ import { useSelector } from "react-redux";
 import { useQueryClient } from "@tanstack/react-query";
 import eventBus from "../../services/eventBus";
 import { useSelectedProject } from "../../slices/apiDataManager";
+import Pagination from "../common/Pagination";
 
 const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizationId, includeInactive, date }) => {
   const queryClient = useQueryClient();
@@ -108,6 +109,8 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
     return () => eventBus.off("employee", employeeHandler);
   }, [employeeHandler]);
 
+
+  
   return (
     <>
       <div
@@ -138,7 +141,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
                 <tr className="border-top-1">
                   <th colSpan={2}>Name</th>
                   <th>Role</th>
-                  <th>Organization</th>
+                  {/* <th>Organization</th> */}
                   <th>
                     <i className="bx bxs-down-arrow-alt text-success"></i>
                     Check-In
@@ -187,7 +190,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
                         </td>
 
                         <td>{item.jobRoleName}</td>
-                        <td>{item.organizationName || "--"}</td>
+                        {/* <td>{item.organizationName || "--"}</td> */}
 
                         <td>
                           {item.checkInTime
@@ -226,46 +229,12 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
 
 
             {!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
-              <nav aria-label="Page ">
+              
-                <ul className="pagination pagination-sm justify-content-end py-1">
+              <Pagination
-                  <li
+                currentPage={currentPage}
-                    className={`page-item  ${currentPage === 1 ? "disabled" : ""
+                totalPages={totalPages}
-                      }`}
+                onPageChange={paginate}
-                  >
+              />
-                    <button
-                      className="page-link btn-xs"
-                      onClick={() => paginate(currentPage - 1)}
-                    >
-                      &laquo;
-                    </button>
-                  </li>
-                  {[...Array(totalPages)].map((_, index) => (
-                    <li
-                      key={index}
-                      className={`page-item ${currentPage === index + 1 ? "active" : ""
-                        }`}
-                    >
-                      <button
-                        className="page-link "
-                        onClick={() => paginate(index + 1)}
-                      >
-                        {index + 1}
-                      </button>
-                    </li>
-                  ))}
-                  <li
-                    className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                      }`}
-                  >
-                    <button
-                      className="page-link "
-                      onClick={() => paginate(currentPage + 1)}
-                    >
-                      &raquo;
-                    </button>
-                  </li>
-                </ul>
-              </nav>
             )}
           </>
         ) : (

src/components/Activities/AttendcesLogs.jsx

@@ -11,6 +11,7 @@ import AttendanceRepository from "../../repositories/AttendanceRepository";
 import { useAttendancesLogs } from "../../hooks/useAttendance";
 import { queryClient } from "../../layouts/AuthLayout";
 import { ITEMS_PER_PAGE } from "../../utils/constants";
+import Pagination from "../common/Pagination";
 
 const usePagination = (data, itemsPerPage) => {
   const [currentPage, setCurrentPage] = useState(1);
@@ -84,56 +85,50 @@ const AttendanceLog = ({ handleModalData, searchTerm ,organizationId}) => {
     dateRange.endDate,
     organizationId
   );
-  const filtering = (data) => {
+  const filtering = useCallback((dataToFilter) => {
-    const filteredData = showPending
+  const filteredData = showPending
-      ? data.filter((item) => item.checkOutTime === null)
+    ? dataToFilter.filter((item) => item.checkOutTime === null)
-      : data;
+    : dataToFilter;
 
-    const group1 = filteredData
+  const group1 = filteredData
-      .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
+    .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
-      .sort(sortByName);
+    .sort(sortByName);
-    const group2 = filteredData
+  const group2 = filteredData
-      .filter((d) => d.activity === 4 && isSameDay(d.checkOutTime))
+    .filter((d) => d.activity === 4 && isSameDay(d.checkOutTime))
-      .sort(sortByName);
+    .sort(sortByName);
-    const group3 = filteredData
+  const group3 = filteredData
-      .filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime))
+    .filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime))
-      .sort(sortByName);
+    .sort(sortByName);
-    const group4 = filteredData.filter(
+  const group4 = filteredData.filter(
-      (d) => d.activity === 4 && isBeforeToday(d.checkOutTime)
+    (d) => d.activity === 4 && isBeforeToday(d.checkOutTime)
-    );
+  );
-    const group5 = filteredData
+  const group5 = filteredData
-      .filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
+    .filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
-      .sort(sortByName);
+    .sort(sortByName);
-    const group6 = filteredData
+  const group6 = filteredData
-      .filter((d) => d.activity === 5)
+    .filter((d) => d.activity === 5)
-      .sort(sortByName);
+    .sort(sortByName);
 
-    const sortedList = [
+  const sortedList = [...group1, ...group2, ...group3, ...group4, ...group5, ...group6];
-      ...group1,
-      ...group2,
-      ...group3,
-      ...group4,
-      ...group5,
-      ...group6,
-    ];
 
-    // Group by date
+  // Group by date
-    const groupedByDate = sortedList.reduce((acc, item) => {
+  const groupedByDate = sortedList.reduce((acc, item) => {
-      const date = (item.checkInTime || item.checkOutTime)?.split("T")[0];
+    const date = (item.checkInTime || item.checkOutTime)?.split("T")[0];
-      if (date) {
+    if (date) {
-        acc[date] = acc[date] || [];
+      acc[date] = acc[date] || [];
-        acc[date].push(item);
+      acc[date].push(item);
-      }
+    }
-      return acc;
+    return acc;
-    }, {});
+  }, {});
 
-    const sortedDates = Object.keys(groupedByDate).sort(
+  const sortedDates = Object.keys(groupedByDate).sort(
-      (a, b) => new Date(b) - new Date(a)
+    (a, b) => new Date(b) - new Date(a)
-    );
+  );
+
+  const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
+  setProcessedData(finalData);
+}, [showPending]);
 
-    const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
-    setProcessedData(finalData);
-  };
 
   useEffect(() => {
     filtering(data);
@@ -285,7 +280,7 @@ const AttendanceLog = ({ handleModalData, searchTerm ,organizationId}) => {
                   Name
                 </th>
                 <th className="border-top-1">Date</th>
-                <th>Organization</th>
+                {/* <th>Organization</th> */}
                 <th>
                   <i className="bx bxs-down-arrow-alt text-success"></i> Check-In
                 </th>
@@ -344,7 +339,7 @@ const AttendanceLog = ({ handleModalData, searchTerm ,organizationId}) => {
                         attendance.checkInTime || attendance.checkOutTime
                       ).format("DD-MMM-YYYY")}
                     </td>
-                    <td>{attendance.organizationName || "--"}</td> 
+                    {/* <td>{attendance.organizationName || "--"}</td>  */}
                     <td>{convertShortTime(attendance.checkInTime)}</td>
                     <td>
                       {attendance.checkOutTime
@@ -378,45 +373,11 @@ const AttendanceLog = ({ handleModalData, searchTerm ,organizationId}) => {
         </div>
       )}
       {filteredSearchData.length > ITEMS_PER_PAGE && (
-        <nav aria-label="Page ">
+      <Pagination
-          <ul className="pagination pagination-sm justify-content-end py-1">
+                currentPage={currentPage}
-            <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
+                totalPages={totalPages}
-              <button
+                onPageChange={paginate}
-                className="page-link btn-xs"
+              />
-                onClick={() => paginate(currentPage - 1)}
-              >
-                &laquo;
-              </button>
-            </li>
-            {Array.from({ length: totalPages }, (_, i) => i + 1).map(
-              (pageNumber) => (
-                <li
-                  key={pageNumber}
-                  className={`page-item ${currentPage === pageNumber ? "active" : ""
-                    }`}
-                >
-                  <button
-                    className="page-link"
-                    onClick={() => paginate(pageNumber)}
-                  >
-                    {pageNumber}
-                  </button>
-                </li>
-              )
-            )}
-            <li
-              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                }`}
-            >
-              <button
-                className="page-link"
-                onClick={() => paginate(currentPage + 1)}
-              >
-                &raquo;
-              </button>
-            </li>
-          </ul>
-        </nav>
       )}
     </>
   );

src/components/Activities/CheckCheckOutForm.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -9,6 +9,7 @@ import showToast from "../../services/toastService";
 import { checkIfCurrentDate } from "../../utils/dateUtils";
 import { useMarkAttendance } from "../../hooks/useAttendance";
 import { useSelectedProject } from "../../slices/apiDataManager";
+import { useProjectName } from "../../hooks/useProjects";
 
 const createSchema = (modeldata) => {
   return z
@@ -19,31 +20,36 @@ const createSchema = (modeldata) => {
         .max(200, "Description should be less than 200 characters")
         .optional(),
     })
-    .refine((data) => {
+    .refine(
-      if (modeldata?.checkInTime && !modeldata?.checkOutTime) {
+      (data) => {
-        const checkIn = new Date(modeldata.checkInTime);
+        if (modeldata?.checkInTime && !modeldata?.checkOutTime) {
-        const [time, modifier] = data.markTime.split(" ");
+          const checkIn = new Date(modeldata.checkInTime);
-        const [hourStr, minuteStr] = time.split(":");
+          const [time, modifier] = data.markTime.split(" ");
-        let hour = parseInt(hourStr, 10);
+          const [hourStr, minuteStr] = time.split(":");
-        const minute = parseInt(minuteStr, 10);
+          let hour = parseInt(hourStr, 10);
+          const minute = parseInt(minuteStr, 10);
 
-        if (modifier === "PM" && hour !== 12) hour += 12;
+          if (modifier === "PM" && hour !== 12) hour += 12;
-        if (modifier === "AM" && hour === 12) hour = 0;
+          if (modifier === "AM" && hour === 12) hour = 0;
 
-        const checkOut = new Date(checkIn);
+          const checkOut = new Date(checkIn);
-        checkOut.setHours(hour, minute, 0, 0);
+          checkOut.setHours(hour, minute, 0, 0);
 
-        return checkOut > checkIn;
+          return checkOut >= checkIn;
+        }
+        return true;
+      },
+      {
+        message: "Checkout time must be later than check-in time",
+        path: ["markTime"],
       }
-      return true;
+    );
-    }, {
-      message: "Checkout time must be later than check-in time",
-      path: ["markTime"],
-    });
 };
 
 const CheckInCheckOut = ({ modeldata, closeModal, handleSubmitForm }) => {
+  const [currentProject, setCurrentProject] = useState(null);
   const projectId = useSelectedProject();
+  const { projectNames, loading } = useProjectName();
   const { mutate: MarkAttendance } = useMarkAttendance();
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
@@ -95,17 +101,24 @@ const CheckInCheckOut = ({ modeldata, closeModal, handleSubmitForm }) => {
     closeModal();
   };
 
+  useEffect(() => {
+    if (projectId && projectNames) {
+      setCurrentProject(
+        projectNames?.find((project) => project.id === projectId)
+      );
+    }
+  }, [projectNames, projectId, loading]);
+
   return (
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
       <div className="col-12 d-flex justify-content-center">
         <label className="fs-5 text-dark text-center">
           {modeldata?.checkInTime && !modeldata?.checkOutTime
-            ? "Check-out :"
+            ? `Check out for ${currentProject?.name}`
-            : "Check-in :"}
+            : `Check In for ${currentProject?.name}`}
         </label>
       </div>
 
-
       <div className="col-6 col-md-6 text-start">
         <label className="form-label" htmlFor="checkInDate">
           {modeldata?.checkInTime && !modeldata?.checkOutTime

src/components/Activities/Regularization.jsx

@@ -9,6 +9,7 @@ import usePagination from "../../hooks/usePagination";
 import eventBus from "../../services/eventBus";
 import { cacheData, clearCacheKey, useSelectedProject } from "../../slices/apiDataManager";
 import { useQueryClient } from "@tanstack/react-query";
+import Pagination from "../common/Pagination";
 
 const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, IncludeInActive  }) => {
   const queryClient = useQueryClient();
@@ -128,7 +129,7 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I
             <tr>
               <th colSpan={2}>Name</th>
               <th>Date</th>
-              <th>Organization</th>
+              {/* <th>Organization</th> */}
               <th>
                 <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
               </th>
@@ -158,7 +159,7 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I
                 </td>
                 <td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td>
 
-                <td>{att.organizationName || "--"}</td>
+                {/* <td>{att.organizationName || "--"}</td> */}
 
                 <td>{convertShortTime(att.checkInTime)}</td>
                 <td>
@@ -189,43 +190,11 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I
         </div>
       )}
       {!loading && totalPages > 1 && (
-        <nav aria-label="Page ">
+        <Pagination
-          <ul className="pagination pagination-sm justify-content-end py-1 mt-3">
+                currentPage={currentPage}
-            <li className={`page-item  ${currentPage === 1 ? "disabled" : ""}`}>
+                totalPages={totalPages}
-              <button
+                onPageChange={paginate}
-                className="page-link btn-xs"
+              />
-                onClick={() => paginate(currentPage - 1)}
-              >
-                &laquo;
-              </button>
-            </li>
-            {[...Array(totalPages)].map((_, index) => (
-              <li
-                key={index}
-                className={`page-item ${currentPage === index + 1 ? "active" : ""
-                  }`}
-              >
-                <button
-                  className="page-link "
-                  onClick={() => paginate(index + 1)}
-                >
-                  {index + 1}
-                </button>
-              </li>
-            ))}
-            <li
-              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                }`}
-            >
-              <button
-                className="page-link "
-                onClick={() => paginate(currentPage + 1)}
-              >
-                &raquo;
-              </button>
-            </li>
-          </ul>
-        </nav>
       )}
     </div>
   );

src/components/Dashboard/Attendance.jsx

@@ -2,7 +2,7 @@ import React, { useState, useMemo } from "react";
 import ApexChart from "../Charts/Circle";
 import { useProjects } from "../../hooks/useProjects";
 import { useDashboard_AttendanceData } from "../../hooks/useDashboard_Data";
-import { useSelectedProject } from "../../hooks/useSelectedProject"; // ✅ your custom hook
+import { useSelectedProject } from "../../hooks/useSelectedProject"; 
 
 const Attendance = () => {
   const { projects } = useProjects();
@@ -31,7 +31,7 @@ const selectedProjectId = useSelectedProject()
       <div className="card-header mb-1 pb-0">
         <div className="d-flex flex-wrap justify-content-between align-items-center">
           <div className="card-title mb-0 text-start">
-            <h5 className="mb-1">Attendance</h5>
+            <h5 className="mb-1 card-title">Attendance</h5>
             <p className="card-subtitle">Daily Attendance Data</p>
           </div>
 

src/components/Dashboard/AttendanceChart.jsx

@@ -1,205 +0,0 @@
-import React, { useState, useMemo } from "react";
-import { useSelector } from "react-redux";
-import ReactApexChart from "react-apexcharts";
-import { useAttendanceOverviewData } from "../../hooks/useDashboard_Data";
-import flatColors from "../Charts/flatColor";
-import ChartSkeleton from "../Charts/Skelton";
-
-const formatDate = (dateStr) => {
-  const date = new Date(dateStr);
-  return date.toLocaleDateString("en-GB", {
-    day: "2-digit",
-    month: "long",
-  });
-};
-
-const AttendanceOverview = () => {
-  const [dayRange, setDayRange] = useState(7);
-  const [view, setView] = useState("chart");
-
-  const projectId = useSelector((store) => store.localVariables.projectId);
-  const { attendanceOverviewData, loading, error } = useAttendanceOverviewData(
-    projectId,
-    dayRange
-  );
-
-  const { tableData, roles, dates } = useMemo(() => {
-    const map = new Map();
-
-    attendanceOverviewData.forEach((entry) => {
-      const date = formatDate(entry.date);
-      if (!map.has(date)) map.set(date, {});
-      map.get(date)[entry.role.trim()] = entry.present;
-    });
-
-    const uniqueRoles = [
-      ...new Set(attendanceOverviewData.map((e) => e.role.trim())),
-    ];
-    const sortedDates = [...map.keys()];
-    const data = sortedDates.map((date) => {
-      const row = { date };
-      uniqueRoles.forEach((role) => {
-        row[role] = map.get(date)?.[role] ?? 0;
-      });
-      return row;
-    });
-
-    return {
-      tableData: data,
-      roles: uniqueRoles,
-      dates: sortedDates,
-    };
-  }, [attendanceOverviewData]);
-
-  const chartSeries = roles.map((role) => ({
-    name: role,
-    data: tableData.map((row) => row[role]),
-  }));
-
-  const chartOptions = {
-    chart: {
-      type: "bar",
-      stacked: true,
-      height: 400,
-      toolbar: { show: false },
-    },
-    plotOptions: {
-      bar: {
-        borderRadius: 2,
-        columnWidth: "60%",
-      },
-    },
-    xaxis: {
-      categories: tableData.map((row) => row.date),
-    },
-    yaxis: {
-      show: true,
-      axisBorder: {
-        show: true,
-        color: "#78909C",
-        offsetX: 0,
-        offsetY: 0,
-      },
-      axisTicks: {
-        show: true,
-        borderType: "solid",
-        color: "#78909C",
-        width: 6,
-        offsetX: 0,
-        offsetY: 0,
-      },
-    },
-    legend: {
-      position: "bottom",
-    },
-    fill: {
-      opacity: 1,
-    },
-    colors: roles.map((_, i) => flatColors[i % flatColors.length]),
-  };
-
-  return (
-    <div className="bg-white p-4 rounded shadow d-flex flex-column">
-      {/* Header */}
-      <div className="d-flex justify-content-between align-items-center mb-3">
-        <div className="card-title mb-0 text-start">
-          <h5 className="mb-1 fw-bold">Attendance Overview</h5>
-          <p className="card-subtitle">Role-wise present count</p>
-        </div>
-        <div className="d-flex gap-2">
-          <select
-            className="form-select form-select-sm"
-            value={dayRange}
-            onChange={(e) => setDayRange(Number(e.target.value))}
-          >
-            <option value={7}>Last 7 Days</option>
-            <option value={15}>Last 15 Days</option>
-            <option value={30}>Last 30 Days</option>
-          </select>
-          <button
-            className={`btn btn-sm p-1 ${
-              view === "chart" ? "btn-primary" : "btn-outline-primary"
-            }`}
-            onClick={() => setView("chart")}
-            title="Chart View"
-          >
-            <i className="bx bx-bar-chart-alt-2"></i>
-          </button>
-          <button
-            className={`btn btn-sm p-1 ${
-              view === "table" ? "btn-primary" : "btn-outline-primary"
-            }`}
-            onClick={() => setView("table")}
-            title="Table View"
-          >
-            <i className="bx bx-list-ul fs-5"></i>
-          </button>
-        </div>
-      </div>
-
-      {/* Content */}
-      <div className="flex-grow-1 d-flex align-items-center justify-content-center">
-        {loading ? (
-          <ChartSkeleton />
-        ) : error ? (
-          <p className="text-danger">{error}</p>
-        ) : view === "chart" ? (
-          <div className="w-100">
-            <ReactApexChart
-              options={chartOptions}
-              series={chartSeries}
-              type="bar"
-              height={400}
-            />
-          </div>
-        ) : (
-          <div
-            className="table-responsive w-100"
-            style={{ maxHeight: "350px", overflowY: "auto" }}
-          >
-            <table className="table table-bordered table-sm text-start align-middle mb-0">
-              <thead
-                className="table-light"
-                style={{ position: "sticky", top: 0, zIndex: 1 }}
-              >
-                <tr>
-                  <th style={{ background: "#f8f9fa", textTransform: "none" }}>
-                    Role
-                  </th>
-                  {dates.map((date, idx) => (
-                    <th
-                      key={idx}
-                      style={{ background: "#f8f9fa", textTransform: "none" }}
-                    >
-                      {date}
-                    </th>
-                  ))}
-                </tr>
-              </thead>
-
-              <tbody>
-                {roles.map((role) => (
-                  <tr key={role}>
-                    <td>{role}</td>
-                    {tableData.map((row, idx) => {
-                      const value = row[role];
-                      const cellStyle =
-                        value > 0 ? { backgroundColor: "#d5d5d5" } : {};
-                      return (
-                        <td key={idx} style={cellStyle}>
-                          {value}
-                        </td>
-                      );
-                    })}
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default AttendanceOverview;

src/components/Dashboard/AttendanceOverview.jsx

@@ -0,0 +1,133 @@
+import React, { useState, useMemo } from "react";
+import { useSelector } from "react-redux";
+import ReactApexChart from "react-apexcharts";
+import { useAttendanceOverviewData } from "../../hooks/useDashboard_Data";
+import flatColors from "../Charts/flatColor";
+import ChartSkeleton from "../Charts/Skelton";
+import { useSelectedProject } from "../../slices/apiDataManager";
+import { formatDate_DayMonth } from "../../utils/dateUtils";
+
+
+
+const AttendanceOverview = () => {
+  const [dayRange, setDayRange] = useState(7);
+  const [view, setView] = useState("chart");
+  const selectedProject = useSelectedProject();
+
+  const { data: attendanceOverviewData, isLoading, isError, error } = useAttendanceOverviewData(
+    selectedProject,
+    dayRange
+  );
+
+  // Use empty array while loading
+  const attendanceData = attendanceOverviewData || [];
+
+  const { tableData, roles, dates } = useMemo(() => {
+    if (!attendanceData || attendanceData.length === 0) {
+      return { tableData: [], roles: [], dates: [] };
+    }
+
+    const map = new Map();
+
+    attendanceData.forEach((entry) => {
+      const date = formatDate_DayMonth(entry.date);
+      if (!map.has(date)) map.set(date, {});
+      map.get(date)[entry.role.trim()] = entry.present;
+    });
+
+    const uniqueRoles = [...new Set(attendanceData.map((e) => e.role.trim()))];
+    const sortedDates = [...map.keys()];
+
+    const tableData = sortedDates.map((date) => {
+      const row = { date };
+      uniqueRoles.forEach((role) => {
+        row[role] = map.get(date)?.[role] ?? 0;
+      });
+      return row;
+    });
+
+    return { tableData, roles: uniqueRoles, dates: sortedDates };
+  }, [attendanceData]);
+
+  const chartSeries = roles.map((role) => ({
+    name: role,
+    data: tableData.map((row) => row[role]),
+  }));
+
+  const chartOptions = {
+    chart: { type: "bar", stacked: true, height: 400, toolbar: { show: false } },
+    plotOptions: { bar: { borderRadius: 2, columnWidth: "60%" } },
+    xaxis: { categories: tableData.map((row) => row.date) },
+    yaxis: { show: true, axisBorder: { show: true, color: "#78909C" }, axisTicks: { show: true, color: "#78909C", width: 6 } },
+    legend: { position: "bottom" },
+    fill: { opacity: 1 },
+    colors: roles.map((_, i) => flatColors[i % flatColors.length]),
+  };
+
+  return (
+    <div className="bg-white p-4 rounded shadow d-flex flex-column position-relative " >
+      {/* Optional subtle loading overlay */}
+      {isLoading && (
+        <div className="position-absolute w-100 h-100 d-flex align-items-center justify-content-center bg-white bg-opacity-50 z-index-1">
+          <span>Loading...</span>
+        </div>
+      )}
+
+      {/* Header */}
+      <div className="d-flex justify-content-between align-items-center mb-3">
+        <div className="card-title mb-0 text-start">
+          <h5 className="mb-1 card-title">Attendance Overview</h5>
+          <p className="card-subtitle">Role-wise present count</p>
+        </div>
+        <div className="d-flex gap-2">
+          <select className="form-select form-select-sm" value={dayRange} onChange={(e) => setDayRange(Number(e.target.value))}>
+            <option value={7}>Last 7 Days</option>
+            <option value={15}>Last 15 Days</option>
+            <option value={30}>Last 30 Days</option>
+          </select>
+          <button className={`btn btn-sm p-1 ${view === "chart" ? "btn-primary" : "btn-outline-primary"}`} onClick={() => setView("chart")} title="Chart View">
+            <i className="bx bx-bar-chart-alt-2"></i>
+          </button>
+          <button className={`btn btn-sm p-1 ${view === "table" ? "btn-primary" : "btn-outline-primary"}`} onClick={() => setView("table")} title="Table View">
+            <i className="bx bx-list-ul fs-5"></i>
+          </button>
+        </div>
+      </div>
+
+      {/* Content */}
+      <div className="flex-grow-1 d-flex align-items-center justify-content-center">
+        {view === "chart" ? (
+          <div className="w-100">
+            <ReactApexChart options={chartOptions} series={chartSeries} type="bar" height={300} />
+          </div>
+        ) : (
+          <div className="table-responsive w-100" style={{ maxHeight: "350px", overflowY: "auto" }}>
+            <table className="table table-bordered table-sm text-start align-middle mb-0">
+              <thead className="table-light" style={{ position: "sticky", top: 0, zIndex: 1 }}>
+                <tr>
+                  <th style={{ background: "#f8f9fa", textTransform: "none" }}>Role</th>
+                  {dates.map((date, idx) => (
+                    <th key={idx} style={{ background: "#f8f9fa", textTransform: "none" }}>{date}</th>
+                  ))}
+                </tr>
+              </thead>
+              <tbody>
+                {roles.map((role) => (
+                  <tr key={role}>
+                    <td>{role}</td>
+                    {tableData.map((row, idx) => {
+                      const value = row[role];
+                      return <td key={idx} style={value > 0 ? { backgroundColor: "#d5d5d5" } : {}}>{value}</td>;
+                    })}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default AttendanceOverview;

src/components/Dashboard/Dashboard.jsx

@@ -1,69 +1,63 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
-import {
+// import {
-    useDashboardProjectsCardData,
+//     useDashboardProjectsCardData,
-    useDashboardTeamsCardData,
+//     useDashboardTeamsCardData,
-    useDashboardTasksCardData,
+//     useDashboardTasksCardData,
-    useAttendanceOverviewData
+//     useAttendanceOverviewData
-} from "../../hooks/useDashboard_Data";
+// } from "../../hooks/useDashboard_Data";
 
-import Projects from "./Projects";
+// import Projects from "./Projects";
-import Teams from "./Teams";
+// import Teams from "./Teams";
-import TasksCard from "./Tasks";
+// import TasksCard from "./Tasks";
-import ProjectCompletionChart from "./ProjectCompletionChart";
+// import ProjectCompletionChart from "./ProjectCompletionChart";
-import ProjectProgressChart from "./ProjectProgressChart";
+// import ProjectProgressChart from "./ProjectProgressChart";
-import ProjectOverview from "../Project/ProjectOverview";
+// import ProjectOverview from "../Project/ProjectOverview";
-import AttendanceOverview from "./AttendanceChart";
+import AttendanceOverview from "./AttendanceOverview";
+import { useSelectedProject } from "../../slices/apiDataManager";
+import { useProjectName } from "../../hooks/useProjects";
+import ExpenseAnalysis from "./ExpenseAnalysis";
+import ExpenseStatus from "./ExpenseStatus";
+import ExpenseByProject from "./ExpenseByProject";
 
 const Dashboard = () => {
-    const { projectsCardData } = useDashboardProjectsCardData();
+  // const { projectsCardData } = useDashboardProjectsCardData();
-    const { teamsCardData } = useDashboardTeamsCardData();
+  // const { teamsCardData } = useDashboardTeamsCardData();
-    const { tasksCardData } = useDashboardTasksCardData();
+  // const { tasksCardData } = useDashboardTasksCardData();
 
-    // Get the selected project ID from Redux store
+  // Get the selected project ID from Redux store
-    const projectId = useSelector((store) => store.localVariables.projectId);
+  const projectId = useSelector((store) => store.localVariables.projectId);
-    const isAllProjectsSelected = projectId === null;
+  const isAllProjectsSelected = projectId === null;
 
-    return (
+  return (
-        <div className="container-fluid mt-5">
+  <div className="container-fluid py-5">
-            <div className="row gy-4">
+  <div className="row mb-6 g-6">
-                {isAllProjectsSelected && (
+    <div className="col-12 col-xl-8">
-                    <div className="col-sm-6 col-lg-4">
+      <div className="card h-100">
-                        <Projects projectsCardData={projectsCardData} />
+        <ExpenseAnalysis />
-                    </div>
+      </div>
-                )}
+    </div>
 
-                <div className={`${!isAllProjectsSelected ? "col-sm-6 col-lg-6" : "col-sm-6 col-lg-4"}`}>
+    <div className="col-12 col-xl-4 col-md-6">
-                    <Teams teamsCardData={teamsCardData} />
+      <div className="card ">
-                </div>
+        <ExpenseStatus />
+      </div>
+    </div>
+  </div>
 
-                <div className={`${!isAllProjectsSelected ? "col-sm-6 col-lg-6" : "col-sm-6 col-lg-4"}`}>
+  <div className="row g-6">
-                    <TasksCard tasksCardData={tasksCardData} />
+    {!isAllProjectsSelected && (
-                </div>
+      <div className="col-6">
+        <AttendanceOverview />
+      </div>
+    )}
+    <div className="col-6">
+      <ExpenseByProject />
+    </div>
+  </div>
+</div>
 
-                {isAllProjectsSelected && (
+  );
-                    <div className="col-xxl-6 col-lg-6">
-                        <ProjectCompletionChart />
-                    </div>
-                )}
-
-                {!isAllProjectsSelected && (
-                    <div className="col-xxl-6 col-lg-6">
-                        <ProjectOverview />
-                    </div>
-                )}
-
-                <div className="col-xxl-6 col-lg-6">
-                    <ProjectProgressChart />
-                </div>
-                {!isAllProjectsSelected && (
-                    <div className="col-xxl-6 col-lg-6">
-                        <AttendanceOverview /> {/* ✅ Removed unnecessary projectId prop */}
-                    </div>
-                )}
-            </div>
-        </div>
-    );
 };
 
-export default Dashboard;
+export default Dashboard;

src/components/Dashboard/ExpenseAnalysis.jsx

@@ -0,0 +1,158 @@
+import React, { useEffect, useMemo, useState } from "react";
+import Chart from "react-apexcharts";
+import { useExpenseAnalysis } from "../../hooks/useDashboard_Data";
+import { useSelectedProject } from "../../slices/apiDataManager";
+import { DateRangePicker1 } from "../common/DateRangePicker";
+import { FormProvider, useForm } from "react-hook-form";
+import { formatCurrency, localToUtc } from "../../utils/appUtils";
+
+const ExpenseAnalysis = () => {
+  const projectId = useSelectedProject();
+
+  const methods = useForm({
+    defaultValues: {
+      startDate: "",
+      endDate: "",
+    },
+  });
+
+  const { watch } = methods;
+
+
+  const [startDate, endDate] = watch(["startDate", "endDate"]);
+  const { data, isLoading, isError, error, isFetching } = useExpenseAnalysis(
+  projectId,
+  startDate ? localToUtc(startDate) : null,
+  endDate ? localToUtc(endDate) : null
+  );
+
+  if (isError) return <div>{error.message}</div>;
+
+
+
+
+  const report = data?.report ?? [];
+
+const { labels, series, total } = useMemo(() => {
+  const labels = report.map((item) => item.projectName);
+  const series = report.map((item) => item.totalApprovedAmount || 0);
+  const total = formatCurrency(data?.totalAmount || 0);
+
+  return { labels, series, total };
+}, [report, data?.totalAmount]);
+
+  const donutOptions = {
+    chart: { type: "donut" },
+    labels,
+    legend: { show: false },
+    dataLabels: { enabled: true, formatter: (val) => `${val.toFixed(0)}%` },
+    colors: ["#7367F0", "#28C76F", "#FF9F43", "#EA5455", "#00CFE8", "#FF78B8"],
+    plotOptions: {
+      pie: {
+        donut: {
+          size: "70%",
+          labels: {
+            show: true,
+            total: {
+              show: true,
+              label: "Total",
+              fontSize: "16px",
+              formatter: () => `${total}`,
+            },
+          },
+        },
+      },
+    },
+  };
+
+  if (data?.report === 0) {
+    return <div>No data found</div>;
+  }
+
+  return (
+    <>
+      <div className="card-header d-flex justify-content-between  align-items-center ">
+        <div>
+          <h5 className="mb-1 card-title text-start">Expense Breakdown</h5>
+          <p className="card-subtitle">Category Wise Expense Breakdown</p>
+        </div>
+
+        <div className="text-end">
+          <FormProvider {...methods}>
+            <DateRangePicker1 />
+          </FormProvider>
+        </div>
+      </div>
+
+      <div className="card-body position-relative">
+        {/* Initial loading: show full loader */}
+        {isLoading && (
+          <div
+            className="d-flex justify-content-center align-items-center"
+            style={{ height: "200px" }}
+          >
+            <span>Loading...</span>
+          </div>
+        )}
+
+        {/* Data display */}
+        {!isLoading && report.length === 0 && (
+          <div className="text-center text-muted py-5">No data found</div>
+        )}
+
+        {!isLoading && report.length > 0 && (
+          <>
+            {/* Overlay spinner for refetch */}
+            {isFetching && (
+              <div className="position-absolute top-0 start-0 w-100 h-100 d-flex justify-content-center align-items-center bg-white bg-opacity-75">
+                <span>Loading...</span>
+              </div>
+            )}
+
+            <div className="d-flex justify-content-center mb-3">
+              <Chart
+                options={donutOptions}
+                series={report.map((item) => item.totalApprovedAmount || 0)}
+                type="donut"
+                width="320"
+              />
+            </div>
+
+            <div className="mb-2 w-100">
+              <div className="row">
+                {report.map((item, idx) => (
+                  <div
+                    className="col-6 d-flex justify-content-start align-items-start mb-2"
+                    key={idx}
+                  >
+                    <div className="avatar me-2">
+                      <span
+                        className="avatar-initial rounded-2"
+                        style={{
+                          backgroundColor:
+                            donutOptions.colors[
+                              idx % donutOptions.colors.length
+                            ],
+                        }}
+                      >
+                        <i className="bx bx-receipt fs-4"></i>
+                      </span>
+                    </div>
+                    <div className="d-flex flex-column gap-1 text-start">
+                      <small className="fw-semibold ">{item.projectName}</small>
+                      <span className="fw-semibold text-muted ms-1">
+                        {formatCurrency(item.totalApprovedAmount)}
+                      </span>
+                    </div>
+                  </div>
+                ))}
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+    </>
+  );
+};
+
+export default ExpenseAnalysis;

src/components/Dashboard/ExpenseByProject.jsx

@@ -0,0 +1,164 @@
+import React, { useState, useEffect } from "react";
+import Chart from "react-apexcharts";
+import { useExpenseType } from "../../hooks/masterHook/useMaster";
+import { useSelector } from "react-redux";
+import { useExpenseDataByProject } from "../../hooks/useDashboard_Data";
+import { formatCurrency } from "../../utils/appUtils";
+import { formatDate_DayMonth } from "../../utils/dateUtils";
+
+const ExpenseByProject = () => {
+  const projectId = useSelector((store) => store.localVariables.projectId);
+  const [range, setRange] = useState("12M");
+  const [selectedType, setSelectedType] = useState("");
+  const [viewMode, setViewMode] = useState("Category");
+  const [chartData, setChartData] = useState({ categories: [], data: [] });
+
+  const { ExpenseTypes, loading: typeLoading } = useExpenseType();
+
+  const { data: expenseApiData, isLoading } = useExpenseDataByProject(
+    projectId,
+    selectedType,
+    range === "All" ? null : parseInt(range)
+  );
+
+  useEffect(() => {
+    if (expenseApiData) {
+      const categories = expenseApiData.map((item) =>
+        formatDate_DayMonth(item.monthName, item.year)
+      );
+      const data = expenseApiData.map((item) => item.total);
+      setChartData({ categories, data });
+    } else {
+      setChartData({ categories: [], data: [] });
+    }
+  }, [expenseApiData]);
+
+  const getSelectedTypeName = () => {
+    if (!selectedType) return "All Types";
+    const found = ExpenseTypes.find((t) => t.id === selectedType);
+    return found ? found.name : "All Types";
+  };
+
+  const options = {
+    chart: { type: "bar", toolbar: { show: false } },
+    plotOptions: {
+      bar: { horizontal: false, columnWidth: "55%", borderRadius: 4 },
+    },
+    dataLabels: { enabled: true, formatter: (val) => formatCurrency(val) },
+    xaxis: {
+      categories: chartData.categories,
+      labels: { style: { fontSize: "12px" }, rotate: -45 },
+    },
+    tooltip: {
+      y: {
+        formatter: (val) => `${formatCurrency(val)} (${getSelectedTypeName()})`,
+      },
+    },
+
+    annotations: { xaxis: [{ x: 0, strokeDashArray: 0 }] },
+    fill: { opacity: 1 },
+    colors: ["#2196f3"],
+  };
+
+  const series = [
+    {
+      name: getSelectedTypeName(),
+      data: chartData.data,
+    },
+  ];
+
+  return (
+    <div className="card shadow-sm rounded ">
+      {/* Header */}
+      <div className="card-header">
+        <div className="d-flex justify-content-start align-items-center mb-3 mt-3">
+          <div>
+            <h5 className="mb-1 me-6 card-title">Monthly Expense -</h5>
+            <p className="card-subtitle me-5 mb-0">Detailed project expenses</p>
+          </div>
+          <div className="btn-group mb-4 ms-n8">
+            <button
+              className="btn btn-sm dropdown-toggle fs-5"
+              type="button"
+              data-bs-toggle="dropdown"
+              aria-expanded="false"
+            >
+              {viewMode}
+            </button>
+            <ul className="dropdown-menu dropdown-menu-end ">
+              <li>
+                <button
+                  className="dropdown-item"
+                  onClick={() => {
+                    setViewMode("Category");
+                    setSelectedType("");
+                  }}
+                >
+                  Category
+                </button>
+              </li>
+              <li>
+                <button
+                  className="dropdown-item"
+                  onClick={() => {
+                    setViewMode("Project");
+                    setSelectedType("");
+                  }}
+                >
+                  Project
+                </button>
+              </li>
+            </ul>
+          </div>
+        </div>
+
+        {/* Range Buttons + Expense Dropdown */}
+        <div className="d-flex align-items-center flex-wrap">
+          {["1M", "3M", "6M", "12M", "All"].map((item) => (
+            <button
+              key={item}
+              className={`border-0 px-2 py-1 text-sm rounded ${
+                range === item
+                  ? "text-white bg-primary"
+                  : "text-body bg-transparent"
+              }`}
+              style={{ cursor: "pointer", transition: "all 0.2s ease" }}
+              onClick={() => setRange(item)}
+            >
+              {item}
+            </button>
+          ))}
+          {viewMode === "Category" && (
+            <select
+              className="form-select form-select-sm ms-auto mb-3"
+              value={selectedType}
+              onChange={(e) => setSelectedType(e.target.value)}
+              disabled={typeLoading}
+              style={{ maxWidth: "200px" }}
+            >
+              <option value="">All Types</option>
+              {ExpenseTypes.map((type) => (
+                <option key={type.id} value={type.id}>
+                  {type.name}
+                </option>
+              ))}
+            </select>
+          )}
+        </div>
+      </div>
+
+      {/* Chart */}
+      <div
+        className="card-body bg-white text-dark p-3 rounded"
+      >
+        {isLoading ? (
+          <p>Loading chart...</p>
+        ) : (
+          <Chart options={options} series={series} type="bar"  height={235} />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default ExpenseByProject;

src/components/Dashboard/ExpenseStatus.jsx

@@ -0,0 +1,128 @@
+import React, { useEffect, useState } from "react";
+import { useExpense } from "../../hooks/useExpense";
+import { useExpenseStatus } from "../../hooks/useDashboard_Data";
+import { useSelectedProject } from "../../slices/apiDataManager";
+import { useProjectName } from "../../hooks/useProjects";
+import { countDigit, formatCurrency } from "../../utils/appUtils";
+import { EXPENSE_MANAGE, EXPENSE_STATUS } from "../../utils/constants";
+import { useNavigate } from "react-router-dom";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+
+const ExpenseStatus = () => {
+  const [projectName, setProjectName] = useState("All Project");
+  const selectedProject = useSelectedProject();
+  const { projectNames, loading } = useProjectName();
+  const { data, isPending, error } = useExpenseStatus(selectedProject);
+  const navigate = useNavigate();
+  const isManageExpense = useHasUserPermission(EXPENSE_MANAGE)
+
+  useEffect(() => {
+    if (selectedProject && projectNames?.length) {
+      const project = projectNames.find((p) => p.id === selectedProject);
+      setProjectName(project?.name || "All Project");
+    } else {
+      setProjectName("All Project");
+    }
+  }, [projectNames, selectedProject]);
+
+  const handleNavigate = (status) => {
+    if (selectedProject) {
+      navigate(`/expenses/${status}/${selectedProject}`);
+    } else {
+      navigate(`/expenses/${status}`);
+    }
+  };
+  return (
+    <>
+      <div className="card-header d-flex justify-content-between text-start ">
+        <div className="m-0">
+          <h5 className="card-title mb-1">Expense - By Status</h5>
+          <p className="card-subtitle m-0 ">{projectName}</p>
+        </div>
+      </div>
+
+      <div className="card-body ">
+        <div className=" py-0 text-start mb-2">
+         {isManageExpense && ( <div className="d-flex justify-content-between align-items-center">
+            <div className="d-block">
+              <span className={`fs-semibold d-block ${countDigit(data?.totalAmount) > 3 ? "text-base":"text-lg" }`}>Project Spendings:</span>{" "}
+              <small className="d-block text-xxs text-gary-80">{`(All Processed Payments)`}</small>
+            </div>
+            <span className={`text-end text-royalblue ${countDigit(data?.totalAmount) > 3 ? "text-":"text-3xl" }  text-md`}>
+              {formatCurrency(data?.totalAmount)}
+            </span>
+          </div>)}
+        </div>
+        <div className="report-list text-start">
+          {[
+            {
+              title: "Pending Payment",
+              count: data?.approvePending?.count,
+              amount: data?.approvePending?.totalAmount,
+              icon: "bx bx-rupee",
+              iconColor: "text-primary",
+              status: EXPENSE_STATUS.payment_pending,
+            },
+            {
+              title: "Pending Approve",
+              count: data?.processPending?.count,
+              amount: data?.processPending?.totalAmount,
+              icon: "fa-solid fa-check",
+              iconColor: "text-warning",
+              status: EXPENSE_STATUS.approve_pending,
+            },
+            {
+              title: "Pending Review",
+              count: data?.reviewPending?.count,
+              amount: data?.reviewPending?.totalAmount,
+              icon: "bx bx-search-alt-2",
+              iconColor: "text-secondary",
+              status: EXPENSE_STATUS.review_pending,
+            },
+            {
+              title: "Draft",
+              count: data?.submited?.count,
+              amount: data?.submited?.totalAmount,
+              icon: "bx bx-file-blank",
+              iconColor: "text-info",
+              status: EXPENSE_STATUS.daft,
+            },
+          ].map((item, idx) => (
+            <div
+              key={idx}
+              className="report-list-item rounded-2 mb-4  bg-lighter px-2 py-1 cursor-pointer"
+              onClick={() => handleNavigate(item?.status)}
+            >
+              <div className="d-flex align-items-center">
+                <div className="report-list-icon shadow-xs me-2">
+                  <span className="d-inline-flex align-items-center justify-content-center rounded-circle border p-2">
+                    <i className={`${item?.icon} ${item?.iconColor} bx-lg`}></i>
+                  </span>
+                </div>
+                <div className="d-flex justify-content-between align-items-center w-100 flex-wrap gap-2">
+                  <div className="d-flex flex-column gap-2">
+                    <span className="fw-bold">{item?.title}</span>
+                    {item?.amount ?   <small className="mb-0 text-primary">
+                      {formatCurrency(item?.amount)}
+                    </small> :""}
+                  </div>
+                  <div className="">
+                    {" "}
+                    <small className={`text-royalblue ${countDigit(item?.count) >= 3 ? "text-xl" : "text-2xl"} text-gray-500`}>
+                   {item?.count }
+                    </small>
+                    <small className="text-muted fs-semibold text-royalblue text-md">
+                      <i className="bx bx-chevron-right"></i>
+                    </small>
+                  </div>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default ExpenseStatus;

src/components/Directory/AssignedBucket.jsx

@@ -19,8 +19,11 @@ const AssignedBucket = ({ selectedBucket, handleClose }) => {
     }
   }, [selectedBucket, employeesList]);
 
-  const { mutate: AssignEmployee, isPending } = useAssignEmpToBucket(() =>
+  const { mutate: AssignEmployee, isPending } = useAssignEmpToBucket(() =>{
+     setSelectedEmployees([])
     handleClose()
+  }
+   
   );
 
   const handleSubmit = async (e) => {

src/components/Directory/ListViewContact.jsx

@@ -4,8 +4,9 @@ import Pagination from "../common/Pagination";
 import { useDirectoryContext } from "../../pages/Directory/DirectoryPage";
 import { useActiveInActiveContact } from "../../hooks/useDirectory";
 import ConfirmModal from "../common/ConfirmModal";
+import Loader from "../common/Loader";
 
-const ListViewContact = ({ data, Pagination }) => {
+const ListViewContact = ({ data, Pagination, isLoading }) => {
   const { showActive, setManageContact, setContactOpen } =
     useDirectoryContext();
   const [deleteContact, setDeleteContact] = useState({
@@ -85,6 +86,8 @@ const ListViewContact = ({ data, Pagination }) => {
     ActiveInActive({ contactId: contactId, contactStatus: !showActive });
   };
 
+  if(isLoading) return <Loader/>
+  if(!data|| data.length === 0)return <div className="text-center py-12">No Contact Found</div>
   return (
     <>
       <ConfirmModal
@@ -97,103 +100,97 @@ const ListViewContact = ({ data, Pagination }) => {
         paramData={deleteContact.contactId}
         isOpen={deleteContact.Open}
       />
-      <div className="card ">
+      <div className="card page-min-h">
         <div
           className="card-datatable table-responsive"
           id="horizontal-example"
         >
-          <div className="dataTables_wrapper no-footer mx-5 pb-2">
+         
-            <table className="table dataTable text-nowrap">
+          {data && (
-              <thead>
+            <div className="dataTables_wrapper no-footer mx-5 pb-2">
-                <tr className="table_header_border">
+              <table className="table dataTable text-nowrap">
-                  {contactList?.map((col) => (
+                <thead>
-                    <th key={col.key} className={col.align}>
+                  <tr className="table_header_border">
-                      {col.label}
+                    {contactList?.map((col) => (
+                      <th key={col.key} className={col.align}>
+                        {col.label}
+                      </th>
+                    ))}
+                    <th className="sticky-action-column bg-white text-center">
+                      Action
                     </th>
-                  ))}
-                  <th className="sticky-action-column bg-white text-center">
-                    Action
-                  </th>
-                </tr>
-              </thead>
-              <tbody >
-                {Array.isArray(data) && data.length > 0 ? (
-                  data.map((row, i) => (
-                    <tr
-                      key={i}
-                      style={{ background: `${!showActive ? "#f8f6f6" : ""}` }}
-                    >
-                      {contactList.map((col) => (
-                        <td key={col.key} className={col.align}>
-                          {col.getValue(row)}
-                        </td>
-                      ))}
-                      <td className="text-center">
-                        {showActive ? (
-                          <div className="d-flex justify-content-center gap-2">
-                            <i
-                              className="bx bx-show text-primary cursor-pointer"
-                              onClick={() =>
-                                setContactOpen({ contact: row, Open: true })
-                              }
-                            ></i>
-
-                            <i
-                              className="bx bx-edit text-secondary cursor-pointer"
-                              onClick={() =>
-                                setManageContact({
-                                  isOpen: true,
-                                  contactId: row.id,
-                                })
-                              }
-                            ></i>
-
-                            <i
-                              className="bx bx-trash text-danger cursor-pointer"
-                              onClick={() =>
-                                setDeleteContact({
-                                  contactId: row.id,
-                                  Open: true,
-                                })
-                              }
-                            ></i>
-                          </div>
-                        ) : (
-                          <i
-                            className={`bx  ${
-                              isPending && activeContact === row.id
-                                ? "bx-loader-alt bx-spin"
-                                : "bx-recycle"
-                              } me-1 text-primary cursor-pointer`}
-                            title="Restore"
-                            onClick={() => {
-                              setActiveContact(row.id);
-                              handleActiveInactive(row.id);
-                            }}
-                          ></i>
-                        )}
-                      </td>
-                    </tr>
-                  ))
-                ) : (
-                  <tr style={{ height: "200px" }}>
-                    <td
-                      colSpan={contactList.length + 1}
-                      className="text-center align-middle"
-                    >
-                      No contacts found
-                    </td>
                   </tr>
+                </thead>
+                <tbody>
+                  {Array.isArray(data) && data.length > 0 && (
+                    data.map((row, i) => (
+                      <tr
+                        key={i}
+                        style={{
+                          background: `${!showActive ? "#f8f6f6" : ""}`,
+                        }}
+                      >
+                        {contactList.map((col) => (
+                          <td key={col.key} className={col.align}>
+                            {col.getValue(row)}
+                          </td>
+                        ))}
+                        <td className="text-center">
+                          {showActive ? (
+                            <div className="d-flex justify-content-center gap-2">
+                              <i
+                                className="bx bx-show text-primary cursor-pointer"
+                                onClick={() =>
+                                  setContactOpen({ contact: row, Open: true })
+                                }
+                              ></i>
 
-                )}
+                              <i
-              </tbody>
+                                className="bx bx-edit text-secondary cursor-pointer"
-            </table>
+                                onClick={() =>
-            {Pagination && (
+                                  setManageContact({
-              <div className="d-flex justify-content-start">
+                                    isOpen: true,
-                {Pagination}
+                                    contactId: row.id,
-              </div>
+                                  })
-            )}
+                                }
-          </div>
+                              ></i>
+
+                              <i
+                                className="bx bx-trash text-danger cursor-pointer"
+                                onClick={() =>
+                                  setDeleteContact({
+                                    contactId: row.id,
+                                    Open: true,
+                                  })
+                                }
+                              ></i>
+                            </div>
+                          ) : (
+                            <i
+                              className={`bx  ${
+                                isPending && activeContact === row.id
+                                  ? "bx-loader-alt bx-spin"
+                                  : "bx-recycle"
+                              } me-1 text-primary cursor-pointer`}
+                              title="Restore"
+                              onClick={() => {
+                                setActiveContact(row.id);
+                                handleActiveInactive(row.id);
+                              }}
+                            ></i>
+                          )}
+                        </td>
+                      </tr>
+                    ))
+                  ) }
+                </tbody>
+              </table>
+              {Pagination && (
+                <div className="d-flex justify-content-start">{Pagination}</div>
+              )}
+            </div>
+          )}
+         
         </div>
       </div>
     </>

src/components/Directory/ManageContact.jsx

@@ -23,7 +23,7 @@ import Label from "../common/Label";
 const ManageContact = ({ contactId, closeModal }) => {
   // fetch master data
   const { buckets, loading: bucketsLoaging } = useBuckets();
-  const { projects, loading: projectLoading } = useProjects();
+  const { data: projects, loading: projectLoading } = useProjects();
   const { contactCategory, loading: contactCategoryLoading } =
     useContactCategory();
   const { organizationList } = useOrganization();
@@ -205,13 +205,14 @@ const ManageContact = ({ contactId, closeModal }) => {
             <Label htmlFor={"organization"} required>
               Organization
             </Label>
-           <InputSuggestions
+            <InputSuggestions
-    organizationList={organizationList}
+              organizationList={organizationList}
-  value={watch("organization") || ""}
+              value={watch("organization") || ""}
-  onChange={(val) => setValue("organization", val, { shouldValidate: true })}
+              onChange={(val) =>
-  error={errors.organization?.message}
+                setValue("organization", val, { shouldValidate: true })
-/>
+              }
-
+              error={errors.organization?.message}
+            />
           </div>
         </div>
 
@@ -394,6 +395,7 @@ const ManageContact = ({ contactId, closeModal }) => {
               labelKey="name"
               valueKey="id"
               IsLoading={projectLoading}
+              
             />
             {errors.projectIds && (
               <small className="danger-text">{errors.projectIds.message}</small>
@@ -408,6 +410,7 @@ const ManageContact = ({ contactId, closeModal }) => {
             label="Tags"
             options={contactTags}
             isRequired={true}
+            require
           />
           {errors.tags && (
             <small className="danger-text">{errors.tags.message}</small>
@@ -417,7 +420,7 @@ const ManageContact = ({ contactId, closeModal }) => {
         {/* Buckets */}
         <div className="row">
           <div className="col-md-12 mt-1 text-start">
-            <label className="form-label ">Select Bucket</label>
+            <Label required>Select Bucket</Label>
             <ul className="d-flex flex-wrap px-1 list-unstyled mb-0">
               {bucketsLoaging && <p>Loading...</p>}
               {buckets?.map((item) => (
@@ -450,7 +453,7 @@ const ManageContact = ({ contactId, closeModal }) => {
         </div>
 
         {/* Address + Description */}
-        <div className="col-12 text-start">
+        <div className="col-12 text-start mb-2">
           <label className="form-label">Address</label>
           <textarea
             className="form-control form-control-sm"
@@ -459,7 +462,7 @@ const ManageContact = ({ contactId, closeModal }) => {
           />
         </div>
         <div className="col-12 text-start">
-          <label className="form-label">Description</label>
+          <Label required>Description</Label>
           <textarea
             className="form-control form-control-sm"
             rows="2"
@@ -479,10 +482,13 @@ const ManageContact = ({ contactId, closeModal }) => {
           >
             Cancel
           </button>
-          <button className="btn btn-sm btn-primary" type="submit" disabled={isPending}>
+          <button
+            className="btn btn-sm btn-primary"
+            type="submit"
+            disabled={isPending}
+          >
             {isPending ? "Please Wait..." : "Submit"}
           </button>
-         
         </div>
       </form>
     </FormProvider>

src/components/Documents/DocumentFilterPanel.jsx

@@ -189,12 +189,12 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
         <div className="d-flex justify-content-end py-3 gap-2">
           <button
             type="button"
-            className="btn btn-label-secondary btn-xs"
+            className="btn btn-label-secondary btn-sm"
             onClick={onClear}
           >
             Clear
           </button>
-          <button type="submit" className="btn btn-primary btn-xs">
+          <button type="submit" className="btn btn-primary btn-sm">
             Apply
           </button>
         </div>

src/components/Documents/DocumentSkeleton.jsx

@@ -17,54 +17,56 @@ const SkeletonCell = ({
   />
 );
 
-export const DocumentTableSkeleton = ({ rows = 5 }) => {
+export const DocumentTableSkeleton = ({ rows = 10 }) => {
   return (
+    <table className="card-body table border-top dataTable no-footer dtr-column text-nowrap">
+      <thead>
+        <tr>
+          <th className="text-start">Name</th>
+          <th className="text-start">Document Type</th>
+          <th className="text-start">Uploaded By</th>
+          <th className="text-center">Uploaded on</th>
+          <th className="text-center">Status</th>
+        </tr>
+      </thead>
 
-      <table className="card-body table border-top dataTable no-footer dtr-column text-nowrap">
+      <tbody>
-        <thead>
+        {[...Array(rows)].map((_, idx) => (
-          <tr>
+          <tr key={idx} className={idx % 2 === 0 ? "odd" : "even"}>
-            <th className="text-start">Name</th>
+            {/* Name */}
-            <th className="text-start">Document Type</th>
+            <td className="text-start">
-            <th className="text-start">Uploaded By</th>
+              <SkeletonCell width="120px" height={16} />
-            <th className="text-center">Uploaded on</th>
+            </td>
-            <th className="text-center">Status</th>
-          </tr>
-        </thead>
 
-        <tbody>
+            {/* Document Type */}
-          {[...Array(rows)].map((_, idx) => (
+            <td className="text-start">
-            <tr key={idx} className={idx % 2 === 0 ? "odd" : "even"}>
+              <SkeletonCell width="100px" height={16} />
-              {/* Name */}
+            </td>
-              <td className="text-start">
-                <SkeletonCell width="120px" height={16} />
-              </td>
 
-              {/* Document Type */}
+            {/* Uploaded By (Avatar + Name) */}
-              <td className="text-start">
+            <td className="text-start">
-                <SkeletonCell width="100px" height={16} />
+              <div className="d-flex align-items-center gap-2">
-              </td>
+                <SkeletonCell
-
+                  width="30px"
-              {/* Uploaded By (Avatar + Name) */}
+                  height={30}
-              <td className="text-start">
+                  className="rounded-circle"
-                <div className="d-flex align-items-center gap-2">
+                />
-                  <SkeletonCell width="30px" height={30} className="rounded-circle" />
-                  <SkeletonCell width="80px" height={16} />
-                </div>
-              </td>
-
-              {/* Uploaded on */}
-              <td className="text-center">
                 <SkeletonCell width="80px" height={16} />
-              </td>
+              </div>
+            </td>
 
-              {/* Status */}
+            {/* Uploaded on */}
-              <td className="text-center">
+            <td className="text-center">
-                <SkeletonCell width="70px" height={20} className="rounded" />
+              <SkeletonCell width="80px" height={16} />
-              </td>
+            </td>
-            </tr>
+
-          ))}
+            {/* Status */}
-        </tbody>
+            <td className="text-center">
-      </table>
+              <SkeletonCell width="70px" height={20} className="rounded" />
-   
+            </td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
   );
 };

src/components/Documents/Documents.jsx

@@ -117,7 +117,7 @@ const Documents = ({ Document_Entity, Entity }) => {
   }, [Document_Entity]);
   return (
     <DocumentContext.Provider value={contextValues}>
-      <div className="mt-5">
+      <div className="mt-2">
         <div className="card page-min-h d-flex p-2">
           <div className="row align-items-center">
             {/* Search */}

src/components/Documents/DocumentsList.jsx

@@ -82,9 +82,9 @@ const DocumentsList = ({
   if (isLoading || isFetching) return <DocumentTableSkeleton />;
   if (isError)
     return <div>Error: {error?.message || "Something went wrong"}</div>;
-  if (isInitialEmpty) return <div>No documents found yet.</div>;
+  if (isInitialEmpty) return <div className="py-12 my-12">No documents found yet.</div>;
-  if (isSearchEmpty) return <div>No results found for "{debouncedSearch}"</div>;
+  if (isSearchEmpty) return <div className="py-12 my-12">No results found for "{debouncedSearch}"</div>;
-  if (isFilterEmpty) return <div>No documents match your filter.</div>;
+  if (isFilterEmpty) return <div  className="py-12 my-12">No documents match your filter.</div>;
 
   const handleDelete = () => {
     ActiveInActive(
@@ -180,10 +180,10 @@ const DocumentsList = ({
         />
       )}
 
-      <div className="table-responsive">
+      <div className="table-responsive p-2">
         <table className="table border-top dataTable text-nowrap">
-          <thead>
+          <thead className="">
-            <tr className="shadow-sm">
+            <tr className="py-2 ">
               {DocumentColumns.map((col) => (
                 <th key={col.key} className={`sorting ${col.align}`}>
                   {col.label}

src/components/Employee/EmpAttendance.jsx

@@ -131,7 +131,7 @@ const EmpAttendance = ({ employee }) => {
           <AttendLogs Id={attendanceId} />
         </GlobalModel>
       )}
-      <div className="card px-4 mt-5 py-2 " style={{ minHeight: "500px" }}>
+      <div className="card px-4 mt-2 py-2 page-min-h ">
         <div
           className="dataTables_length text-start py-2 d-flex justify-content-between "
           id="DataTables_Table_0_length"

src/components/Employee/EmpDashboard.jsx

@@ -12,11 +12,11 @@ const EmpDashboard = ({ profile }) => {
   return (
     <>
       <div className="row">
-        <div className="col-12 col-sm-6 pt-5">
+        <div className="col-12 col-sm-6 pt-2">
           {" "}
           <EmpOverview profile={profile}></EmpOverview>
         </div>
-        <div className="col col-sm-6 pt-5">
+        {/* <div className="col col-sm-6 pt-5">
           <div className="card ">
             <div className="card-body">
               <small className="card-text text-uppercase text-body-secondary small text-start d-block">
@@ -29,7 +29,6 @@ const EmpDashboard = ({ profile }) => {
                     className="d-flex mb-4 align-items-start flex-wrap"
                     key={project.id}
                   >
-                    {/* Project Info */}
                     <div className="flex-grow-1">
                       <div className="d-flex flex-wrap align-items-center justify-content-between gap-2">
                         <div className="d-flex">
@@ -70,7 +69,6 @@ const EmpDashboard = ({ profile }) => {
                         </div>
                       </div>
 
-                      {/* Dates */}
 
                     </div>
                   </li>
@@ -79,7 +77,7 @@ const EmpDashboard = ({ profile }) => {
 
             </div>
           </div>
-        </div>
+        </div> */}
       </div>
     </>
   );

src/components/Employee/EmployeeNav.jsx

@@ -24,7 +24,7 @@ const EmployeeNav = ({ onPillClick, activePill }) => {
       icon: "bx bx-file",
       label: "Documents",
     },
-    { key: "activities", icon: "bx bx-grid-alt", label: "Activities" },
+    // { key: "activities", icon: "bx bx-grid-alt", label: "Activities" },
   ].filter(Boolean);
   return (
     <div className="col-md-12">

src/components/Employee/EmployeeSchema.jsx

@@ -90,7 +90,7 @@ export  const employeeSchema =
       .min(1, { message: "Phone Number is required" })
       .regex(mobileNumberRegex, { message: "Invalid phone number " }),
     jobRoleId: z.string().min(1, { message: "Role is required" }),
-    organizationId:z.string().min(1,{message:"Organization is required"}),
+    // organizationId:z.string().min(1,{message:"Organization is required"}),  // hide temp. for version 1
     hasApplicationAccess:z.boolean().default(false),
   }).refine((data) => {
   if (data.hasApplicationAccess) {
@@ -119,6 +119,6 @@ export const defatEmployeeObj = {
       permanentAddress:  "",
       phoneNumber:  "",
       jobRoleId: null,
-      organizationId:"",
+      // organizationId:"",
       hasApplicationAccess:false
     }

src/components/Employee/ManageEmployee.jsx

@@ -15,18 +15,18 @@ import {
 import Label from "../common/Label";
 import DatePicker from "../common/DatePicker";
 import { defatEmployeeObj, employeeSchema } from "./EmployeeSchema";
-import { useOrganizationsList } from "../../hooks/useOrganization";
+// import { useOrganizationsList } from "../../hooks/useOrganization";
 import { ITEMS_PER_PAGE } from "../../utils/constants";
 
 const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
   const dispatch = useDispatch();
   const { mutate: updateEmployee, isPending } = useUpdateEmployee();
-  const {
+  // const {
-    data: organzationList,
+  //   data: organzationList,
-    isLoading,
+  //   isLoading,
-    isError,
+  //   isError,
-    error: EempError,
+  //   error: EempError,
-  } = useOrganizationsList(ITEMS_PER_PAGE, 1, true);
+  // } = useOrganizationsList(ITEMS_PER_PAGE, 1, true);
   const {
     employee,
     error,
@@ -113,7 +113,7 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
             permanentAddress: currentEmployee.permanentAddress || "",
             phoneNumber: currentEmployee.phoneNumber || "",
             jobRoleId: currentEmployee.jobRoleId?.toString() || "",
-            organizationId: currentEmployee.organizationId || "",
+            // organizationId: currentEmployee.organizationId || "",     //   Hide temp. for version 1
             hasApplicationAccess: currentEmployee.hasApplicationAccess || false,
           }
         : {}
@@ -413,9 +413,10 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
           </div>
         </div>
 
-        {/* -------------- */}
+       
         <div className="row mb-3">
-          <div className="col-sm-6">
+           {/* -------------- Temp hide for Version---------------*/}
+          {/* <div className="col-sm-6">
             <Label className="form-text text-start" required>
               Organization
             </Label>
@@ -446,9 +447,10 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
                 {errors.organizationId.message}
               </div>
             )}
-          </div>
+          </div> */}
+          {/* --------------------------------------------------- */}
 
-          <div className="col-sm-6 d-flex align-items-center mt-2">
+          <div className="col-12 d-flex align-items-center mt-2">
             <label className="form-check-label d-flex align-items-center">
               <input
                 type="checkbox"
@@ -584,15 +586,14 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
             )}
           </div>
         </div>
-        <div className="row text-end">
+        <div className="d-flex flex-row gap-3 justify-content-end">
-          <div className="col-sm-12">
             <button
               aria-label="manage employee"
-              type="reset"
               className="btn btn-sm btn-label-secondary me-2"
               disabled={isPending}
+              onClick={()=>onClosed()}
             >
-              Clear
+              Close
             </button>
             <button
               aria-label="manage employee"
@@ -600,9 +601,8 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
               className="btn btn-sm btn-primary"
               disabled={isPending}
             >
-              {isPending ? "Please Wait..." : employeeId ? "Update" : "Create"}
+              {isPending ? "Please Wait..." : employeeId ? "Update" : "Submit"}
             </button>
-          </div>
         </div>
       </form>
     </>

src/components/Expenses/ActiveFilters.jsx

@@ -0,0 +1,50 @@
+const ActiveFilters = ({ filters, optionsLookup = {}, onRemove }) => {
+  const entries = Object.entries(filters || {});
+
+  return (
+    <div className="d-flex flex-wrap gap-2">
+      {entries.map(([key, value]) => {
+        if (!value || (Array.isArray(value) && value.length === 0)) return null;
+
+        if (Array.isArray(value)) {
+          return value.map((v) => {
+            const label = optionsLookup[key]?.[v] || v;
+            return (
+              <span
+                key={`${key}-${v}`}
+                className="badge bg-label-primary cursor-pointer"
+                onClick={() => onRemove(key, v)}
+              >
+                {label} <i className="bx bx-x ms-1"></i>
+              </span>
+            );
+          });
+        }
+
+        if (typeof value === "boolean") {
+          return (
+            <span
+              key={key}
+              className="badge bg-label-success cursor-pointer"
+              onClick={() => onRemove(key)}
+            >
+              {key}: {value ? "Yes" : "No"} <i className="bx bx-x ms-1"></i>
+            </span>
+          );
+        }
+
+        return (
+          <span className="badge bg-primary">
+            {data?.startDate && data?.endDate
+              ? `${formatUTCToLocalTime(
+                  data.startDate
+                )} - ${formatUTCToLocalTime(data.endDate)}`
+              : "No dates"}
+          </span>
+        );
+      })}
+    </div>
+  );
+};
+
+export default ActiveFilters;

src/components/Expenses/ExpenseFilterPanel.jsx

@@ -13,9 +13,11 @@ import { useSelector } from "react-redux";
 import moment from "moment";
 import { useExpenseFilter } from "../../hooks/useExpense";
 import { ExpenseFilterSkeleton } from "./ExpenseSkeleton";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
 
 const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
+  const { status, project } = useParams();
+  const navigate = useNavigate();
   const selectedProjectId = useSelector(
     (store) => store.localVariables.projectId
   );
@@ -34,12 +36,26 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
     ].sort((a, b) => a.name.localeCompare(b.name));
   }, []);
 
-  const [selectedGroup, setSelectedGroup] = useState(groupByList[0]);
+  const [selectedGroup, setSelectedGroup] = useState(groupByList[6]);
   const [resetKey, setResetKey] = useState(0);
 
+  const dynamicDefaultFilter = useMemo(() => {
+    return {
+      ...defaultFilter,
+      statusIds: status ? [status] : defaultFilter.statusIds || [],
+      projectIds: project ? [project] : defaultFilter.projectIds || [],
+      createdByIds: defaultFilter.createdByIds || [],
+      paidById: defaultFilter.paidById || [],
+      ExpenseTypeIds: defaultFilter.ExpenseTypeIds || [],
+      isTransactionDate: defaultFilter.isTransactionDate ?? true,
+      startDate: defaultFilter.startDate,
+      endDate: defaultFilter.endDate,
+    };
+  }, [status]);
+
   const methods = useForm({
     resolver: zodResolver(SearchSchema),
-    defaultValues: defaultFilter,
+    defaultValues: dynamicDefaultFilter,
   });
 
   const { control, handleSubmit, reset, setValue, watch } = methods;
@@ -71,14 +87,50 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
     onApply(defaultFilter);
     handleGroupBy(groupByList[0].id);
     closePanel();
+    if (status) {
+      navigate("/expenses", { replace: true });
+    }
   };
 
-  //  Close popup when navigating to another component
   const location = useLocation();
   useEffect(() => {
     closePanel();
   }, [location]);
 
+  const [appliedStatusId, setAppliedStatusId] = useState(null);
+
+  useEffect(() => {
+    if (!status && !project) return;
+
+    if (status !== appliedStatusId && data) {
+      const filterWithStatus = {
+        ...dynamicDefaultFilter,
+        startDate: dynamicDefaultFilter.startDate
+          ? moment
+            .utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY")
+            .toISOString()
+          : undefined,
+        endDate: dynamicDefaultFilter.endDate
+          ? moment.utc(dynamicDefaultFilter.endDate, "DD-MM-YYYY").toISOString()
+          : undefined,
+      };
+
+      onApply(filterWithStatus);
+      handleGroupBy(selectedGroup.id);
+
+      setAppliedStatusId(status);
+    }
+  }, [
+    status,
+    project,
+    data,
+    dynamicDefaultFilter,
+    onApply,
+    handleGroupBy,
+    selectedGroup.id,
+    appliedStatusId,
+  ]);
+
   if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
   if (isError && isFetched)
     return <div>Something went wrong Here- {error.message} </div>;
@@ -92,18 +144,16 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
               <div className="d-inline-flex border rounded-pill mb-1 overflow-hidden shadow-none">
                 <button
                   type="button"
-                  className={`btn px-2 py-1 rounded-0 text-tiny ${
+                  className={`btn px-2 py-1 rounded-0 text-tiny ${isTransactionDate ? "active btn-primary text-white" : ""
-                    isTransactionDate ? "active btn-primary text-white" : ""
+                    }`}
-                  }`}
                   onClick={() => setValue("isTransactionDate", true)}
                 >
                   Transaction Date
                 </button>
                 <button
                   type="button"
-                  className={`btn px-2 py-1 rounded-0 text-tiny ${
+                  className={`btn px-2 py-1 rounded-0 text-tiny ${!isTransactionDate ? "active btn-primary text-white" : ""
-                    !isTransactionDate ? "active btn-primary text-white" : ""
+                    }`}
-                  }`}
                   onClick={() => setValue("isTransactionDate", false)}
                 >
                   Submitted Date
@@ -117,6 +167,7 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
               endField="endDate"
               resetSignal={resetKey}
               defaultRange={false}
+              maxDate={new Date()}
             />
           </div>
 
@@ -142,6 +193,13 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
               labelKey={(item) => item.name}
               valueKey="id"
             />
+            <SelectMultiple
+              name="ExpenseTypeIds"
+              label="Category :"
+              options={data.expensesType}
+              labelKey={(item) => item.name}
+              valueKey="id"
+            />
 
             <div className="mb-3">
               <label className="form-label">Status :</label>

src/components/Expenses/ExpenseList.jsx

@@ -10,7 +10,11 @@ import {
   EXPENSE_REJECTEDBY,
   ITEMS_PER_PAGE,
 } from "../../utils/constants";
-import { getColorNameFromHex, useDebounce } from "../../utils/appUtils";
+import {
+  formatCurrency,
+  getColorNameFromHex,
+  useDebounce,
+} from "../../utils/appUtils";
 import { ExpenseTableSkeleton } from "./ExpenseSkeleton";
 import ConfirmModal from "../common/ConfirmModal";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
@@ -59,40 +63,61 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
   const groupByField = (items, field) => {
     return items.reduce((acc, item) => {
       let key;
+      let displayField;
+
       switch (field) {
         case "transactionDate":
-          key = item.transactionDate?.split("T")[0];
+          key = item?.transactionDate?.split("T")[0];
+          displayField = "Transaction Date";
           break;
         case "status":
-          key = item.status?.displayName || "Unknown";
+          key = item?.status?.displayName || "Unknown";
+          displayField = "Status";
           break;
         case "submittedBy":
-          key = `${item.createdBy?.firstName ?? ""} ${
+          key = `${item?.createdBy?.firstName ?? ""} ${
             item.createdBy?.lastName ?? ""
           }`.trim();
+          displayField = "Submitted By";
           break;
         case "project":
-          key = item.project?.name || "Unknown Project";
+          key = item?.project?.name || "Unknown Project";
+          displayField = "Project";
           break;
         case "paymentMode":
-          key = item.paymentMode?.name || "Unknown Mode";
+          key = item?.paymentMode?.name || "Unknown Mode";
+          displayField = "Payment Mode";
           break;
         case "expensesType":
-          key = item.expensesType?.name || "Unknown Type";
+          key = item?.expensesType?.name || "Unknown Type";
+          displayField = "Expense Type";
           break;
         case "createdAt":
-          key = item.createdAt?.split("T")[0] || "Unknown Type";
+          key = item?.createdAt?.split("T")[0] || "Unknown Date";
+          displayField = "Created Date";
           break;
         default:
           key = "Others";
+          displayField = "Others";
       }
-      if (!acc[key]) acc[key] = [];
+
-      acc[key].push(item);
+      const groupKey = `${field}_${key}`; // unique key for object property
+      if (!acc[groupKey]) {
+        acc[groupKey] = { key, displayField, items: [] };
+      }
+
+      acc[groupKey].items.push(item);
       return acc;
     }, {});
   };
 
   const expenseColumns = [
+    {
+      key: "expenseUId",
+      label: "Expense Id",
+      getValue: (e) => e.expenseUId || "N/A",
+      align: "text-start mx-2",
+    },
     {
       key: "expensesType",
       label: "Expense Type",
@@ -138,11 +163,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
     {
       key: "amount",
       label: "Amount",
-      getValue: (e) => (
+      getValue: (e) => <>{formatCurrency(e?.amount)}</>,
-        <>
-          <i className="bx bx-rupee b-xs"></i> {e?.amount}
-        </>
-      ),
       isAlwaysVisible: true,
       align: "text-end",
     },
@@ -163,23 +184,27 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
   ];
 
   if (isInitialLoading) return <ExpenseTableSkeleton />;
-  if (isError) return <div>{error.message}</div>;
+  if (isError) return <div>{error?.message}</div>;
 
   const grouped = groupBy
     ? groupByField(data?.data ?? [], groupBy)
     : { All: data?.data ?? [] };
-  const IsGroupedByDate = ["transactionDate", "createdAt"].includes(groupBy);
+  const IsGroupedByDate = [
+    { key: "transactionDate", displayField: "Transaction Date" },
+    { key: "createdAt", displayField: "created Date" },
+  ]?.includes(groupBy);
+
   const canEditExpense = (expense) => {
     return (
-      (expense.status.id === EXPENSE_DRAFT ||
+      (expense?.status?.id === EXPENSE_DRAFT ||
-        EXPENSE_REJECTEDBY.includes(expense.status.id)) &&
+        EXPENSE_REJECTEDBY.includes(expense?.status?.id)) &&
-      expense.createdBy?.id === SelfId
+      expense?.createdBy?.id === SelfId
     );
   };
 
   const canDetetExpense = (expense) => {
     return (
-      expense.status.id === EXPENSE_DRAFT && expense.createdBy.id === SelfId
+      expense?.status?.id === EXPENSE_DRAFT && expense?.createdBy?.id === SelfId
     );
   };
 
@@ -198,7 +223,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
         />
       )}
 
-      <div className="card px-0 px-sm-4">
+      <div className="card page-min-h px-sm-4">
         <div
           className="card-datatable table-responsive "
           id="horizontal-example"
@@ -226,18 +251,24 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
               </thead>
               <tbody>
                 {Object.keys(grouped).length > 0 ? (
-                  Object.entries(grouped).map(([group, expenses]) => (
+                  Object.values(grouped).map(({ key, displayField, items }) => (
-                    <React.Fragment key={group}>
+                    <React.Fragment key={key}>
                       <tr className="tr-group text-dark">
                         <td colSpan={8} className="text-start">
-                          <strong>
+                          <div className="d-flex align-items-center">
-                            {IsGroupedByDate
+                            {" "}
-                              ? formatUTCToLocalTime(group)
+                            <small className="fs-6 ">
-                              : group}
+                              {displayField} :{" "}
-                          </strong>
+                            </small>{" "}
+                            <small className="fs-6  ms-3">
+                              {IsGroupedByDate
+                                ? formatUTCToLocalTime(key)
+                                : key}
+                            </small>
+                          </div>
                         </td>
                       </tr>
-                      {expenses.map((expense) => (
+                      {items?.map((expense) => (
                         <tr key={expense.id}>
                           {expenseColumns.map(
                             (col) =>
@@ -263,27 +294,61 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
                                   })
                                 }
                               ></i>
-                              {canEditExpense(expense) && (
+                              {canDetetExpense(expense) &&
-                                <i
+                                canEditExpense(expense) && (
-                                  className="bx bx-edit text-secondary cursor-pointer"
+                                  <div className="dropdown z-2">
-                                  onClick={() =>
+                                    <button
-                                    setManageExpenseModal({
+                                      type="button"
-                                      IsOpen: true,
+                                      className="btn btn-xs btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0 m-0"
-                                      expenseId: expense.id,
+                                      data-bs-toggle="dropdown"
-                                    })
+                                      aria-expanded="false"
-                                  }
+                                    >
-                                ></i>
+                                      <i
-                              )}
+                                        className="bx bx-dots-vertical-rounded text-muted p-0"
+                                        data-bs-toggle="tooltip"
+                                        data-bs-offset="0,8"
+                                        data-bs-placement="top"
+                                        data-bs-custom-class="tooltip-dark"
+                                        title="More Action"
+                                      ></i>
+                                    </button>
+                                    <ul className="dropdown-menu dropdown-menu-end w-auto">
+                                      {canDetetExpense(expense) && (
+                                        <li
+                                          onClick={() =>
+                                            setManageExpenseModal({
+                                              IsOpen: true,
+                                              expenseId: expense.id,
+                                            })
+                                          }
+                                        >
+                                          <a className="dropdown-item px-2 cursor-pointer py-1">
+                                            <i className="bx bx-edit text-primary  bx-xs me-2"></i>
+                                            <span className="align-left ">
+                                              Modify
+                                            </span>
+                                          </a>
+                                        </li>
+                                      )}
 
-                              {canDetetExpense(expense) && (
+                                      {canDetetExpense(expense) && (
-                                <i
+                                        <li
-                                  className="bx bx-trash text-danger cursor-pointer"
+                                          onClick={() => {
-                                  onClick={() => {
+                                            setIsDeleteModalOpen(true);
-                                    setIsDeleteModalOpen(true);
+                                            setDeletingId(expense.id);
-                                    setDeletingId(expense.id);
+                                          }}
-                                  }}
+                                        >
-                                ></i>
+                                          <a className="dropdown-item  px-2 cursor-pointer py-1">
-                              )}
+                                            <i className="bx bx-trash text-danger  bx-xs me-2"></i>
+                                            <span className="align-left">
+                                              Delete
+                                            </span>
+                                          </a>
+                                        </li>
+                                      )}
+                                    </ul>
+                                  </div>
+                                )}
                             </div>
                           </td>
                         </tr>
@@ -292,8 +357,10 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
                   ))
                 ) : (
                   <tr>
-                    <td colSpan={8} className="text-center py-4">
+                    <td colSpan={8} className="text-center border-0 ">
-                      No Expense Found
+                      <div className="py-8">
+                        <p>No Expense Found</p>
+                      </div>
                     </td>
                   </tr>
                 )}

src/components/Expenses/ExpenseSchema.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { localToUtc } from "../../utils/appUtils";
 
 const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
 const ALLOWED_TYPES = [
@@ -17,15 +18,12 @@ export const ExpenseSchema = (expenseTypes) => {
         .min(1, { message: "Expense type is required" }),
       paymentModeId: z.string().min(1, { message: "Payment mode is required" }),
       paidById: z.string().min(1, { message: "Employee name is required" }),
-      transactionDate: z
+      transactionDate: z.string().min(1, { message: "Date is required" }),
-        .string()
-        .min(1, { message: "Date is required" })
-      ,
       transactionId: z.string().optional(),
       description: z.string().min(1, { message: "Description is required" }),
       location: z.string().min(1, { message: "Location is required" }),
       supplerName: z.string().min(1, { message: "Supplier name is required" }),
-      gstNumber :z.string().optional(),
+      gstNumber: z.string().optional(),
       amount: z.coerce
         .number({
           invalid_type_error: "Amount is required and must be a number",
@@ -54,8 +52,6 @@ export const ExpenseSchema = (expenseTypes) => {
           })
         )
         .nonempty({ message: "At least one file attachment is required" }),
-         
- 
     })
     .refine(
       (data) => {
@@ -68,9 +64,14 @@ export const ExpenseSchema = (expenseTypes) => {
         path: ["paidById"],
       }
     )
-   .superRefine((data, ctx) => {
+    .superRefine((data, ctx) => {
-      const expenseType = expenseTypes.find((et) => et.id === data.expensesTypeId);
+      const expenseType = expenseTypes.find(
-      if (expenseType?.noOfPersonsRequired && (!data.noOfPersons || data.noOfPersons < 1)) {
+        (et) => et.id === data.expensesTypeId
+      );
+      if (
+        expenseType?.noOfPersonsRequired &&
+        (!data.noOfPersons || data.noOfPersons < 1)
+      ) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: "No. of Persons is required and must be at least 1",
@@ -92,12 +93,14 @@ export const defaultExpense = {
   supplerName: "",
   amount: "",
   noOfPersons: "",
-  gstNumber:"",
+  gstNumber: "",
   billAttachments: [],
 };
 
-
+export const ExpenseActionScheam = (
-export const ExpenseActionScheam = (isReimbursement = false) => {
+  isReimbursement = false,
+  transactionDate
+) => {
   return z
     .object({
       comment: z.string().min(1, { message: "Please leave comment" }),
@@ -122,6 +125,15 @@ export const ExpenseActionScheam = (isReimbursement = false) => {
             message: "Reimburse Date is required",
           });
         }
+        // let reimburse_Date = localToUtc(data.reimburseDate);
+        // if (transactionDate > reimburse_Date) {
+        //   ctx.addIssue({
+        //     code: z.ZodIssueCode.custom,
+        //     path: ["reimburseDate"],
+        //     message:
+        //       "Reimburse Date must be greater than or equal to Expense created Date",
+        //   });
+        // }
         if (!data.reimburseById) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -133,7 +145,7 @@ export const ExpenseActionScheam = (isReimbursement = false) => {
     });
 };
 
-  export const defaultActionValues = {
+export const defaultActionValues = {
   comment: "",
   statusId: "",
 
@@ -142,13 +154,12 @@ export const ExpenseActionScheam = (isReimbursement = false) => {
   reimburseById: null,
 };
 
-
-
 export const SearchSchema = z.object({
   projectIds: z.array(z.string()).optional(),
   statusIds: z.array(z.string()).optional(),
   createdByIds: z.array(z.string()).optional(),
   paidById: z.array(z.string()).optional(),
+  ExpenseTypeIds: z.array(z.string()).optional(),
   startDate: z.string().optional(),
   endDate: z.string().optional(),
   isTransactionDate: z.boolean().default(true),
@@ -159,8 +170,8 @@ export const defaultFilter = {
   statusIds: [],
   createdByIds: [],
   paidById: [],
+  ExpenseTypeIds: [],
   isTransactionDate: true,
   startDate: null,
   endDate: null,
 };
-

src/components/Expenses/ManageExpense.jsx

@@ -28,6 +28,7 @@ import moment from "moment";
 import DatePicker from "../common/DatePicker";
 import ErrorPage from "../../pages/ErrorPage";
 import Label from "../common/Label";
+import EmployeeSearchInput from "../common/EmployeeSearchInput";
 
 const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   const {
@@ -57,7 +58,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   });
 
   const selectedproject = watch("projectId");
- 
+
   const {
     projectNames,
     loading: projectLoading,
@@ -142,8 +143,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   };
 
   useEffect(() => {
-    if (expenseToEdit && data ) {
+    if (expenseToEdit && data) {
-   
       reset({
         projectId: data.project.id || "",
         expensesTypeId: data.expensesType.id || "",
@@ -156,7 +156,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
         supplerName: data.supplerName || "",
         amount: data.amount || "",
         noOfPersons: data.noOfPersons || "",
-        gstNumber:data.gstNumber || "",
+        gstNumber: data.gstNumber || "",
         billAttachments: data.documents
           ? data.documents.map((doc) => ({
               fileName: doc.fileName,
@@ -183,8 +183,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   const onSubmit = (fromdata) => {
     let payload = {
       ...fromdata,
-      transactionDate: localToUtc(fromdata.transactionDate)
+      transactionDate: localToUtc(fromdata.transactionDate),
-
     };
     if (expenseToEdit) {
       const editPayload = { ...payload, id: data.id };
@@ -206,7 +205,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   if (StatusLoadding || projectLoading || ExpenseLoading || isLoading)
     return <ExpenseSkeleton />;
 
-
   return (
     <div className="container p-3">
       <h5 className="m-0">
@@ -215,7 +213,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
       <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
         <div className="row my-2 text-start">
           <div className="col-md-6">
-            <Label className="form-label" required>Select Project</Label>
+            <Label className="form-label" required>
+              Select Project
+            </Label>
             <select
               className="form-select form-select-sm"
               {...register("projectId")}
@@ -296,7 +296,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             )}
           </div>
 
-          <div className="col-md-6">
+          {/* <div className="col-md-6">
             <Label htmlFor="paidById" className="form-label" required>
               Paid By
             </Label>
@@ -322,6 +322,15 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             {errors.paidById && (
               <small className="danger-text">{errors.paidById.message}</small>
             )}
+          </div> */}
+
+          <div className="col-12 col-md-6 text-start">
+            <label className="form-label">Paid By </label>
+            <EmployeeSearchInput
+              control={control}
+              name="paidById"
+              projectId={null}
+            />
           </div>
         </div>
 
@@ -330,7 +339,11 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             <Label htmlFor="transactionDate" className="form-label" required>
               Transaction Date
             </Label>
-            <DatePicker name="transactionDate" control={control} maxDate={new Date()}/>
+            <DatePicker
+              name="transactionDate"
+              control={control}
+              maxDate={new Date()}
+            />
 
             {errors.transactionDate && (
               <small className="danger-text">
@@ -409,9 +422,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               </small>
             )}
           </div>
-              <div className="col-md-6">
+          <div className="col-md-6">
             <label htmlFor="statusId" className="form-label ">
-             GST Number
+              GST Number
             </label>
             <input
               type="text"
@@ -421,9 +434,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               {...register("gstNumber")}
             />
             {errors.gstNumber && (
-              <small className="danger-text">
+              <small className="danger-text">{errors.gstNumber.message}</small>
-                {errors.gstNumber.message}
-              </small>
             )}
           </div>
 
@@ -448,7 +459,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2 text-start">
           <div className="col-md-12">
-            <Label htmlFor="description" className="form-label" required>Description</Label>
+            <Label htmlFor="description" className="form-label" required>
+              Description
+            </Label>
             <textarea
               id="description"
               className="form-control form-control-sm"
@@ -465,7 +478,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2 text-start">
           <div className="col-md-12">
-            <Label className="form-label" required>Upload Bill </Label>
+            <Label className="form-label" required>
+              Upload Bill{" "}
+            </Label>
 
             <div
               className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
@@ -549,7 +564,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="d-flex justify-content-end gap-3">
           {" "}
-           <button
+          <button
             type="reset"
             disabled={isPending || createPending}
             onClick={handleClose}
@@ -568,7 +583,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               ? "Update"
               : "Submit"}
           </button>
-         
         </div>
       </form>
     </div>

src/components/Expenses/ViewExpense.jsx

@@ -9,7 +9,7 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { defaultActionValues, ExpenseActionScheam } from "./ExpenseSchema";
 import { useExpenseContext } from "../../pages/Expense/ExpensePage";
-import { getColorNameFromHex, getIconByFileType } from "../../utils/appUtils";
+import { getColorNameFromHex, getIconByFileType, localToUtc } from "../../utils/appUtils";
 import { ExpenseDetailsSkeleton } from "./ExpenseSkeleton";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import {
@@ -38,7 +38,7 @@ const ViewExpense = ({ ExpenseId }) => {
   const IsReview = useHasUserPermission(REVIEW_EXPENSE);
   const [imageLoaded, setImageLoaded] = useState({});
   const { setDocumentView } = useExpenseContext();
-  const ActionSchema = ExpenseActionScheam(IsPaymentProcess) ?? z.object({});
+  const ActionSchema = ExpenseActionScheam(IsPaymentProcess,data?.createdAt) ?? z.object({});
   const navigate = useNavigate();
   const {
     register,
@@ -91,9 +91,7 @@ const ViewExpense = ({ ExpenseId }) => {
   const onSubmit = (formData) => {
     const Payload = {
       ...formData,
-      reimburseDate: moment
+      reimburseDate:localToUtc(formData.reimburseDate),
-        .utc(formData.reimburseDate, "DD-MM-YYYY")
-        .toISOString(),
       expenseId: ExpenseId,
       comment: formData.comment,
     };
@@ -108,14 +106,12 @@ const ViewExpense = ({ ExpenseId }) => {
 
   return (
     <form className="container px-3" onSubmit={handleSubmit(onSubmit)}>
-      <div className="row mb-3">
+      <div className="row mb-1">
-        <div className="col-12 mb-3">
+        <div className="col-12 mb-1">
-          <h5 className="fw-semibold">Expense Details</h5>
+          <h5 className="fw-semibold m-0">Expense Details</h5>
           <hr />
         </div>
-        <div className="text-start mb-2">
+         <div className="col-12 text-start fw-semibold my-2">{data?.expenseUId}</div>
-          <div className="text-muted">{data?.description}</div>
-        </div>
         {/* Row 1 */}
         <div className="col-md-6 mb-3">
           <div className="d-flex">
@@ -279,7 +275,7 @@ const ViewExpense = ({ ExpenseId }) => {
               className="form-label me-2 mb-0 fw-semibold"
               style={{ minWidth: "130px" }}
             >
-              Paid By:
+              Paid By :
             </label>
             <div className="d-flex align-items-center ">
               <Avatar
@@ -296,6 +292,11 @@ const ViewExpense = ({ ExpenseId }) => {
             </div>
           </div>
         </div>
+        
+          <div className="text-start my-1">
+            <label className="fw-semibold form-label">Description : </label>
+          <div className="text-muted">{data?.description}</div>
+        </div>
       </div>
 
       <div className="col-12 text-start">
@@ -397,7 +398,8 @@ const ViewExpense = ({ ExpenseId }) => {
                 <DatePicker
                   name="reimburseDate"
                   control={control}
-                  minDate={data?.transactionDate}
+                  minDate={data?.createdAt}
+                  maxDate={new Date()}
                 />
                 {errors.reimburseDate && (
                   <small className="danger-text">
@@ -410,7 +412,7 @@ const ViewExpense = ({ ExpenseId }) => {
                 <EmployeeSearchInput
                   control={control}
                   name="reimburseById"
-                  projectId={null}
+                  projectId={null}                
                 />
               </div>
             </div>

src/components/Layout/Header.jsx

@@ -1,3 +1,4 @@
+import { useCallback, useEffect, useState,useMemo } from "react";
 import getGreetingMessage from "../../utils/greetingHandler";
 import {
   cacheData,
@@ -13,122 +14,103 @@ import { useProfile } from "../../hooks/useProfile";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
 import Avatar from "../../components/common/Avatar";
 import { useChangePassword } from "../Context/ChangePasswordContext";
-import { useProjects } from "../../hooks/useProjects";
+import {  useProjects } from "../../hooks/useProjects";
-import { useCallback, useEffect, useState } from "react";
 import { useProjectName } from "../../hooks/useProjects";
 import eventBus from "../../services/eventBus";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import { MANAGE_PROJECT } from "../../utils/constants";
+import { ALLOW_PROJECTSTATUS_ID, MANAGE_PROJECT, UUID_REGEX } from "../../utils/constants";
 import { useAuthModal, useLogout } from "../../hooks/useAuth";
 
 const Header = () => {
-  const { profile } = useProfile();
+ const { profile } = useProfile();
+  const { data: masterData } = useMaster();
   const location = useLocation();
   const dispatch = useDispatch();
-  const { data, loading } = useMaster();
   const navigate = useNavigate();
-  const {onOpen} = useAuthModal()
+
+  const { mutate: logout, isPending: logouting } = useLogout();
+  const { onOpen } = useAuthModal();
+  const { openChangePassword } = useChangePassword();
   const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
-  const { mutate : logout,isPending:logouting} = useLogout()
 
-  const isDashboardPath =
+  const pathname = location.pathname;
-    /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
-  const isProjectPath = /^\/projects$/.test(location.pathname);
 
-  const showProjectDropdown = (pathname) => {
+  // ======= MEMO CHECKS =======
-    const isDirectoryPath = /^\/directory$/.test(pathname);
+  const isDashboardPath = pathname === "/" || pathname === "/dashboard";
+  const isProjectPath = pathname === "/projects";
+  const isDirectory = pathname === "/directory";
+  const isEmployeeList = pathname === "/employees";
+  // const isExpense = pathname === "/expenses";
+  const isEmployeeProfile = UUID_REGEX.test(pathname);
 
-    // const isProfilePage = /^\/employee$/.test(location.pathname);
+  const hideDropPaths =
-    const isProfilePage =
+    isDirectory || isEmployeeList  || isEmployeeProfile;
-      /^\/employee\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
-        pathname
-      );
-    const isExpensePage = /^\/expenses$/.test(pathname);
 
-    return !(isDirectoryPath || isProfilePage || isExpensePage);
+  const showProjectDropdown = !hideDropPaths;
-  };
-  const allowedProjectStatusIds = [
-    "603e994b-a27f-4e5d-a251-f3d69b0498ba",
-    "cdad86aa-8a56-4ff4-b633-9c629057dfef",
-    "b74da4c2-d07e-46f2-9919-e75e49b12731",
-  ];
-
-  const getRole = (roles, joRoleId) => {
-    if (!Array.isArray(roles)) return "User";
-    let role = roles.find((role) => role.id === joRoleId);
-    return role ? role.name : "User";
-  };
-
- 
-
-  
-
-  const handleProfilePage = () => {
-    navigate(`/employee/${profile?.employeeInfo?.id}`);
-  };
 
+  // ===== Project Names & Selected Project =====
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
-
   const selectedProject = useSelectedProject();
 
-  const projectsForDropdown = isDashboardPath
+  const projectsForDropdown = useMemo(
-    ? projectNames
+    () =>
-    : projectNames?.filter((project) =>
+      isDashboardPath
-        allowedProjectStatusIds.includes(project.projectStatusId)
+        ? projectNames
-      );
+        : projectNames?.filter((project) =>
+            ALLOW_PROJECTSTATUS_ID.includes(project.projectStatusId)
+          ),
+    [projectNames, isDashboardPath]
+  );
 
-  let currentProjectDisplayName;
+  const currentProjectDisplayName = useMemo(() => {
-  if (projectLoading) {
+    if (projectLoading) return "Loading...";
-    currentProjectDisplayName = "Loading...";
+    if (!projectNames?.length) return "No Projects Assigned";
-  } else if (!projectNames || projectNames.length === 0) {
+    if (projectNames.length === 1) return projectNames[0].name;
-    currentProjectDisplayName = "No Projects Assigned";
+         if (selectedProject === null) return "All Projects";
-  } else if (projectNames.length === 1) {
+    const selectedObj = projectNames.find((p) => p.id === selectedProject);
-    currentProjectDisplayName = projectNames[0].name;
+    return selectedObj
-  } else {
+  ? selectedObj.name
-    if (selectedProject === null) {
+  : projectNames[0]?.name || "No Projects Assigned";
-      currentProjectDisplayName = "All Projects";
+  }, [projectLoading, projectNames, selectedProject]);
-    } else {
-      const selectedProjectObj = projectNames.find(
-        (p) => p?.id === selectedProject
-      );
-      currentProjectDisplayName = selectedProjectObj
-        ? selectedProjectObj.name
-        : "All Projects";
-    }
-  }
 
-  const { openChangePassword } = useChangePassword();
+  // ===== Role Helper =====
+  const getRole = (roles, joRoleId) => {
+    if (!Array.isArray(roles)) return "User";
+    return roles.find((r) => r.id === joRoleId)?.name || "User";
+  };
 
+  // ===== Navigate to Profile =====
+  const handleProfilePage = () =>
+    navigate(`/employee/${profile?.employeeInfo?.id}`);
+
+  // ===== Set default project on load =====
   useEffect(() => {
     if (
-      projectNames &&
+      projectNames?.length &&
-      projectNames.length > 0 &&
       selectedProject === undefined &&
       !getCachedData("hasReceived")
     ) {
       if (projectNames.length === 1) {
-        dispatch(setProjectId(projectNames[0]?.id || null));
+        dispatch(setProjectId(projectNames[0].id || null));
       } else {
         if (isDashboardPath) {
           dispatch(setProjectId(null));
         } else {
-          const firstAllowedProject = projectNames.find((project) =>
+          const firstAllowed = projectNames.find((project) =>
-            allowedProjectStatusIds.includes(project.projectStatusId)
+            ALLOW_PROJECTSTATUS_ID.includes(project.projectStatusId)
           );
-          dispatch(setProjectId(firstAllowedProject?.id || null));
+          dispatch(setProjectId(firstAllowed?.id || null));
         }
       }
     }
   }, [projectNames, selectedProject, dispatch, isDashboardPath]);
 
+  // ===== Event Handlers =====
   const handler = useCallback(
     async (data) => {
       if (!HasManageProjectPermission) {
         await fetchData();
-        const projectExist = data.projectIds.some(
+        if (data.projectIds?.includes(selectedProject)) {
-          (item) => item === selectedProject
-        );
-        if (projectExist) {
           cacheData("hasReceived", false);
         }
       }
@@ -138,14 +120,15 @@ const Header = () => {
 
   const newProjectHandler = useCallback(
     async (msg) => {
-      if (HasManageProjectPermission && msg.keyword === "Create_Project") {
+      if (
-        await fetchData();
+        msg.keyword === "Create_Project" ||
-      } else if (projectNames?.some((item) => item.id === msg.response.id)) {
+        projectNames?.some((p) => p.id === msg.response?.id)
+      ) {
         await fetchData();
+        cacheData("hasReceived", false);
       }
-      cacheData("hasReceived", false);
     },
-    [HasManageProjectPermission, projectNames, fetchData]
+    [projectNames, fetchData]
   );
 
   useEffect(() => {
@@ -162,10 +145,10 @@ const Header = () => {
     };
   }, [handler, newProjectHandler]);
 
-  const handleProjectChange = (project) => {
+  // ===== Project Change =====
-    dispatch(setProjectId(project));
+  const handleProjectChange = (projectId) => {
-
+    dispatch(setProjectId(projectId));
-    if (isProjectPath && project !== null) {
+    if (isProjectPath && projectId !== null) {
       navigate("/projects/details");
     }
   };
@@ -189,7 +172,7 @@ const Header = () => {
         className="navbar-nav-right d-flex align-items-center justify-content-between"
         id="navbar-collapse"
       >
-        {showProjectDropdown(location.pathname) && (
+        {showProjectDropdown && (
           <div className="align-items-center">
             <i className="rounded-circle bx bx-building-house bx-sm-lg bx-md me-2"></i>
             <div className="btn-group">
@@ -215,16 +198,14 @@ const Header = () => {
                     className="dropdown-menu"
                     style={{ overflow: "auto", maxHeight: "300px" }}
                   >
-                    {isDashboardPath && (
+
-                      <li>
+                     <li>
-                        <button
+                          <button
-                          className="dropdown-item"
+                            className="dropdown-item"
-                          onClick={() => handleProjectChange(null)}
+                            onClick={() => handleProjectChange(null)}
-                        >
+                          >All Project</button>
-                          All Projects
+                          </li>
-                        </button>
+                        
-                      </li>
-                    )}
                     {[...projectsForDropdown]
                       .sort((a, b) => a?.name?.localeCompare(b.name))
                       .map((project) => (
@@ -249,112 +230,9 @@ const Header = () => {
         )}
 
         <ul className="navbar-nav flex-row align-items-center ms-md-auto">
-          <li className="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
+          {/* {HasManageProjectPermission && ( */}
-            <a
+         
-              className="nav-link dropdown-toggle hide-arrow"
+          {/* )} */}
-              data-bs-toggle="dropdown"
-              data-bs-auto-close="true"
-              aria-expanded="false"
-            >
-              <i className="icon-base bx bx-grid-alt icon-md"></i>
-            </a>
-            <div className="dropdown-menu dropdown-menu-end p-0">
-              <div className="dropdown-menu-header border-bottom">
-                <div className="dropdown-header d-flex align-items-center py-3">
-                  <h6 className="mb-0 me-auto">Shortcuts</h6>
-                  <a
-                    className="dropdown-shortcuts-add py-2 cusror-pointer"
-                    data-bs-toggle="tooltip"
-                    data-bs-placement="top"
-                    aria-label="Add shortcuts"
-                    data-bs-original-title="Add shortcuts"
-                  >
-                    <i className="icon-base bx bx-plus-circle text-heading"></i>
-                  </a>
-                </div>
-              </div>
-              <div className="dropdown-shortcuts-list scrollable-container ps">
-                <div className="row row-bordered overflow-visible g-0">
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/dashboard`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bx-home icon-26px text-heading"></i>
-                      </span>
-                      Dashboard
-                    </a>
-                    <small>User Dashboard</small>
-                  </div>
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/projects`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bx-building-house icon-26px text-heading"></i>
-                      </span>
-                      Projects
-                    </a>
-                    <small>Projects List</small>
-                  </div>
-                </div>
-                <div className="row row-bordered overflow-visible g-0">
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/employees`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bxs-user-account icon-26px text-heading"></i>
-                      </span>
-                      Employees
-                    </a>
-                    <small>Manage Employees</small>
-                  </div>
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/activities/attendance`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bx-user-check icon-26px text-heading"></i>
-                      </span>
-                      Attendance
-                    </a>
-                    <small>Manage Attendance</small>
-                  </div>
-                </div>
-                <div className="row row-bordered overflow-visible g-0">
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/activities/task`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bxs-wrench icon-26px text-heading"></i>
-                      </span>
-                      Allocate Work
-                    </a>
-                    <small>Work Allocations</small>
-                  </div>
-                  <div className="dropdown-shortcuts-item col">
-                    <a
-                      onClick={() => navigate(`/activities/records`)}
-                      className="text-heading text-truncate cursor-pointer"
-                    >
-                      <span className="dropdown-shortcuts-icon rounded-circle mb-3">
-                        <i className="icon-base bx bx-list-ul icon-26px text-heading"></i>
-                      </span>
-                      Daily Work Log
-                    </a>
-                    <small>Daily Work Allocations</small>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </li>
           <li className="nav-item navbar-dropdown dropdown-user dropdown">
             <a
               aria-label="dropdown profile avatar"
@@ -386,7 +264,7 @@ const Header = () => {
                         {profile?.employeeInfo?.firstName}
                       </span>
                       <small className="text-muted">
-                        {getRole(data, profile?.employeeInfo?.joRoleId)}
+                        {getRole(masterData, profile?.employeeInfo?.joRoleId)}
                       </small>
                     </div>
                   </div>
@@ -395,15 +273,13 @@ const Header = () => {
               <li>
                 <div className="dropdown-divider"></div>
               </li>
-               <li onClick={()=>onOpen()}>
+              {/* <li onClick={() => onOpen()}>
                 {" "}
-                <a
+                <a className="dropdown-item cusor-pointer">
-                  className="dropdown-item cusor-pointer"
-                >
                   <i className="bx bx-transfer-alt me-2"></i>
                   <span className="align-middle">Switch Workspace</span>
                 </a>
-              </li>
+              </li> */}
               <li onClick={handleProfilePage}>
                 <a
                   aria-label="go to profile"
@@ -433,7 +309,6 @@ const Header = () => {
                 </a>
               </li>
 
-             
               <li>
                 <div className="dropdown-divider"></div>
               </li>
@@ -441,10 +316,17 @@ const Header = () => {
                 <a
                   aria-label="click to log out"
                   className="dropdown-item cusor-pointer"
-                  onClick={()=>logout()}
+                  onClick={() => logout()}
                 >
-                 {logouting ? "Please Wait":<> <i className="bx bx-log-out me-2"></i>
+                  {logouting ? (
-                  <span className="align-middle">SignOut</span></>}
+                    "Please Wait"
+                  ) : (
+                    <>
+                      {" "}
+                      <i className="bx bx-log-out me-2"></i>
+                      <span className="align-middle">SignOut</span>
+                    </>
+                  )}
                 </a>
               </li>
             </ul>
@@ -454,4 +336,4 @@ const Header = () => {
     </nav>
   );
 };
-export default Header;
+export default Header;

src/components/Project/ManageProjectInfo.jsx

@@ -5,7 +5,12 @@ import { zodResolver } from "@hookform/resolvers/zod";
 
 import Label from "../common/Label";
 import DatePicker from "../common/DatePicker";
-import { useCreateProject, useProjectDetails, useUpdateProject } from "../../hooks/useProjects";
+import {
+  useCreateProject,
+  useProjectDetails,
+  useProjectModal,
+  useUpdateProject,
+} from "../../hooks/useProjects";
 
 import {
   DEFAULT_EMPTY_STATUS_ID,
@@ -17,6 +22,7 @@ import {
   useOrganizationsList,
 } from "../../hooks/useOrganization";
 import { localToUtc } from "../../utils/appUtils";
+import Modal from "../common/Modal";
 
 const currentDate = new Date().toLocaleDateString("en-CA");
 const formatDate = (date) => {
@@ -37,13 +43,19 @@ const ManageProjectInfo = ({ project, onClose }) => {
   const ACTIVE_STATUS_ID = "b74da4c2-d07e-46f2-9919-e75e49b12731";
 
   const { projects_Details, loading } = useProjectDetails(project);
-  const { data, isLoading, isError, error } = useOrganizationsList(
+  // const { data, isLoading, isError, error } = useOrganizationsList(
-    ITEMS_PER_PAGE,
+  //   ITEMS_PER_PAGE,
-    1,
+  //   1,
-    true
+  //   true
+  // );
+  const { mutate: UpdateProject, isPending } = useUpdateProject(() => {
+    onClose?.();
+  });
+  const { mutate: CeateProject, isPending: isCreating } = useCreateProject(
+    () => {
+      onClose?.();
+    }
   );
-  const { mutate: UpdateProject, isPending } = useUpdateProject(() => {onClose?.()});
-  const {mutate:CeateProject,isPending:isCreating} = useCreateProject(()=>{onClose?.()})
 
   const {
     register,
@@ -70,11 +82,11 @@ const ManageProjectInfo = ({ project, onClose }) => {
         projectStatusId:
           String(projects_Details?.projectStatus?.id) ||
           DEFAULT_EMPTY_STATUS_IDF,
-        promoterId: projects_Details?.promoter?.id || "",
+        // promoterId: projects_Details?.promoter?.id || "",   // hide temp. for version 1
-        pmcId: projects_Details?.pmc?.id || "",
+        // pmcId: projects_Details?.pmc?.id || "",
       });
     setAddressLength(projects_Details?.projectAddress?.length || 0);
-  }, [project, projects_Details, reset,data]);
+  }, [project, projects_Details, reset]);
 
   const onSubmitForm = (formData) => {
     if (project) {
@@ -85,13 +97,13 @@ const ManageProjectInfo = ({ project, onClose }) => {
         id: project,
       };
       UpdateProject({ projectId: project, payload: payload });
-    }else{
+    } else {
-       let payload = {
+      let payload = {
         ...formData,
         startDate: localToUtc(formData.startDate),
         endDate: localToUtc(formData.endDate),
       };
-      CeateProject(payload)
+      CeateProject(payload);
     }
   };
 
@@ -104,7 +116,6 @@ const ManageProjectInfo = ({ project, onClose }) => {
     onOpen({ startStep: 2, flowType: "default" });
   };
 
-
   return (
     <div className="p-sm-2 p-2">
       <div className="text-center mb-2">
@@ -254,7 +265,7 @@ const ManageProjectInfo = ({ project, onClose }) => {
             </div>
           )}
         </div>
-        <div className="col-12 ">
+        {/* <div className="col-12 ">
           <label className="form-label" htmlFor="modalEditUserStatus">
             Promoter
           </label>
@@ -330,7 +341,7 @@ const ManageProjectInfo = ({ project, onClose }) => {
           <small className="cursor-pointer" onClick={handleOrganizaioFinder}>
             <i className="bx  bx-plus-circle text-primary"></i>
           </small>
-        </div>
+        </div> */}
 
         <div className="col-12 col-md-12">
           <Label htmlFor="projectAddress" required>
@@ -376,7 +387,11 @@ const ManageProjectInfo = ({ project, onClose }) => {
             className="btn btn-primary btn-sm"
             disabled={isPending || isCreating}
           >
-            {isPending||isCreating ? "Please Wait..." : project ? "Update" : "Submit"}
+            {isPending || isCreating
+              ? "Please Wait..."
+              : project
+              ? "Update"
+              : "Submit"}
           </button>
         </div>
       </form>
@@ -385,3 +400,15 @@ const ManageProjectInfo = ({ project, onClose }) => {
 };
 
 export default ManageProjectInfo;
+
+export const ProjectModal = () => {
+  const { isOpen, data, closeModal } = useProjectModal();
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      body={<ManageProjectInfo project={data} onClose={closeModal} />}
+      onClose={closeModal}
+    />
+  );
+};

src/components/Project/ProjectCard.jsx

@@ -35,6 +35,7 @@ const ProjectCard = ({ project }) => {
 
   const handleViewProject = () => {
     dispatch(setProjectId(project.id));
+    localStorage.setItem("lastActiveProjectTab","profile")
     navigate(`/projects/details`);
   };
   const handleViewActivities = () => {
@@ -54,7 +55,7 @@ const ProjectCard = ({ project }) => {
                     style={{ fontSize: "xx-large" }}
                   ></i>
                 </div>
-                <div className="me-2">
+                <div className="me-2 text-start">
                   <h5
                     className="mb-0 stretched-link text-heading text-start"
                     onClick={handleViewProject}
@@ -66,7 +67,7 @@ const ProjectCard = ({ project }) => {
                   </div>
                 </div>
               </div>
-              <div className={`ms-auto ${!ManageProject && "d-none"}`}>
+              <div className={`ms-auto `}>
                 <div className="dropdown z-2">
                   <button
                     type="button"
@@ -106,12 +107,6 @@ const ProjectCard = ({ project }) => {
                         <span className="align-left">Modify</span>
                       </a>
                     </li>
-                    <li onClick={handleViewActivities}>
-                      <a className="dropdown-item">
-                        <i className="bx bx-task me-2"></i>
-                        <span className="align-left">Activities</span>
-                      </a>
-                    </li>
                   </ul>
                 </div>
               </div>

src/components/Project/ProjectCardView.jsx

@@ -1,70 +1,62 @@
-import React from 'react'
+import React from "react";
-import { useProjects } from '../../hooks/useProjects'
+import { useProjects } from "../../hooks/useProjects";
-import Loader from '../common/Loader'
+import Loader from "../common/Loader";
-import ProjectCard from './ProjectCard'
+import ProjectCard from "./ProjectCard";
-
-const ProjectCardView = ({currentItems,setCurrentPage,totalPages }) => {
-
 
+const ProjectCardView = ({ currentItems, setCurrentPage, totalPages }) => {
   return (
+    <div className="row page-min-h">
+      {currentItems.length === 0 && (
+        <p className="text-center text-muted">No projects found.</p>
+      )}
 
-      <div className="row page-min-h">
+      {currentItems.map((project) => (
+        <ProjectCard key={project.id} project={project} />
+      ))}
 
-          { currentItems.length === 0 && (
+      {totalPages > 1 && (
-            <p className="text-center text-muted">No projects found.</p>
+        <nav>
-          )}
+          <ul className="pagination pagination-sm justify-content-end py-2">
-     
+            <li className={`page-item ${currentPage === 1 && "disabled"}`}>
-            {currentItems.map((project) => (
+              <button
-              <ProjectCard
+                className="page-link"
-                key={project.id}
+                onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
-                project={project}
+              >
-              />
+                &laquo;
-            ))}
+              </button>
-
+            </li>
-
+            {[...Array(totalPages)].map((_, i) => (
-             {  totalPages > 1 && (
-          <nav>
-            <ul className="pagination pagination-sm justify-content-end py-2">
-              <li className={`page-item ${currentPage === 1 && "disabled"}`}>
-                <button
-                  className="page-link"
-                  onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
-                >
-                  &laquo;
-                </button>
-              </li>
-              {[...Array(totalPages)].map((_, i) => (
-                <li
-                  key={i}
-                  className={`page-item ${currentPage === i + 1 && "active"}`}
-                >
-                  <button
-                    className="page-link"
-                    onClick={() => setCurrentPage(i + 1)}
-                  >
-                    {i + 1}
-                  </button>
-                </li>
-              ))}
               <li
-                className={`page-item ${currentPage === totalPages && "disabled"
+                key={i}
-                  }`}
+                className={`page-item ${currentPage === i + 1 && "active"}`}
               >
                 <button
                   className="page-link"
-                  onClick={() =>
+                  onClick={() => setCurrentPage(i + 1)}
-                    setCurrentPage((p) => Math.min(totalPages, p + 1))
-                  }
                 >
-                  &raquo;
+                  {i + 1}
                 </button>
               </li>
-            </ul>
+            ))}
-          </nav>
+            <li
-        )}
+              className={`page-item ${
-          </div>
+                currentPage === totalPages && "disabled"
-  
+              }`}
-  )
+            >
-}
+              <button
+                className="page-link"
+                onClick={() =>
+                  setCurrentPage((p) => Math.min(totalPages, p + 1))
+                }
+              >
+                &raquo;
+              </button>
+            </li>
+          </ul>
+        </nav>
+      )}
+    </div>
+  );
+};
 
-export default ProjectCardView
+export default ProjectCardView;

src/components/Project/ProjectListView.jsx

@@ -26,9 +26,8 @@ const ProjectListView = ({
   const navigate = useNavigate();
   const { setMangeProject } = useProjectContext();
   // const { data, isLoading, isError, error } = useProjects();
-
   //   check Permissions
-  const canManageProject = useHasUserPermission(MANAGE_PROJECT);
+  // const canManageProject = useHasUserPermission(MANAGE_PROJECT);
 
   const projectColumns = [
     {
@@ -125,11 +124,16 @@ const ProjectListView = ({
     },
   ];
 
-  const handleViewActivities = (project) => {
+  // const handleViewActivities = (project) => {
-    dispatch(setProjectId(project));
+  //   dispatch(setProjectId(project));
-    navigate(`/activities/records?project=${project}`);
+  //   navigate(`/activities/records?project=${project}`);
-  };
+  // };
 
+  const handleMoveDetails = (project) => {
+    dispatch(setProjectId(project));
+    localStorage.setItem("lastActiveProjectTab","profile")
+    navigate("/projects/details");
+  };
   return (
     <div className="card page-min-h py-4 px-6 shadow-sm">
       <table className="table  table-hover align-middle m-0">
@@ -158,11 +162,7 @@ const ProjectListView = ({
                     : project[col.key] || "N/A"}
                 </td>
               ))}
-              <td
+              <td className={`mx-2 ${"d-sm-table-cell"}`}>
-                className={`mx-2 ${
-                  canManageProject ? "d-sm-table-cell" : "d-none"
-                }`}
-              >
                 <div className="dropdown z-2">
                   <button
                     type="button"
@@ -180,7 +180,7 @@ const ProjectListView = ({
                     ></i>
                   </button>
                   <ul className="dropdown-menu dropdown-menu-end">
-                    <li>
+                    <li onClick={() => handleMoveDetails(project.id)}>
                       <a
                         aria-label="click to  View details"
                         className="dropdown-item cursor-pointer"
@@ -204,12 +204,12 @@ const ProjectListView = ({
                         <span className="align-left">Modify</span>
                       </a>
                     </li>
-                    <li onClick={() => handleViewActivities(project.id)}>
+                    {/* <li onClick={() => handleViewActivities(project.id)}>
                       <a className="dropdown-item cursor-pointer">
                         <i className="bx bx-task me-2"></i>
                         <span className="align-left">Activities</span>
                       </a>
-                    </li>
+                    </li> */}
                   </ul>
                 </div>
               </td>

src/components/Project/ProjectNav.jsx

@@ -27,13 +27,13 @@ const ProjectNav = ({ onPillClick, activePill }) => {
 
   const ProjectTab = [
     { key: "profile", icon: "bx bx-user", label: "Profile" },
-    { key: "teams", icon: "bx bx-group", label: "Teams" },
+    // { key: "teams", icon: "bx bx-group", label: "Teams" },
-    {
+    // {
-      key: "infra",
+    //   key: "infra",
-      icon: "bx bx-grid-alt",
+    //   icon: "bx bx-grid-alt",
-      label: "Infrastructure",
+    //   label: "Infrastructure",
-      hidden: !(HasViewInfraStructure || HasManageInfra || HasManageTask),
+    //   hidden: !(HasViewInfraStructure || HasManageInfra || HasManageTask),
-    },
+    // },
     {
       key: "directory",
       icon: "bx bxs-contact",
@@ -41,8 +41,8 @@ const ProjectNav = ({ onPillClick, activePill }) => {
       hidden: !(DirAdmin || DireManager || DirUser),
     },
     { key: "documents", icon: "bx bx-folder-open", label: "Documents",hidden:!(isViewDocuments || isModifyDocument || isUploadDocument) },
-    { key: "organization", icon: "bx bx-buildings", label: "Organization"},
+    // { key: "organization", icon: "bx bx-buildings", label: "Organization"},
-    { key: "setting", icon: "bx bxs-cog", label: "Setting",hidden:!isManageTeam },
+    // { key: "setting", icon: "bx bxs-cog", label: "Setting",hidden:!isManageTeam },
   ];
   return (
     <div className="nav-align-top">

src/components/Project/ProjectSchema.jsx

@@ -11,8 +11,8 @@ export const projectDefault = {
   startDate: currentDate.toISOString().split("T")[0],
   endDate: currentDate.toISOString().split("T")[0],
   projectStatusId: DEFAULT_EMPTY_STATUS_ID,
-  promoterId: "",
+  // promoterId: "",
-  pmcId: "",
+  // pmcId: "",
 };
 
 
@@ -39,8 +39,8 @@ export const projectSchema = z
       .min(1, { message: "End Date is required" })
       .default(projectDefault),
     projectStatusId: z.string().min(1, { message: "Status is required" }),
-    promoterId: z.string().min(1, { message: "Promoter is required" }),
+    // promoterId: z.string().min(1, { message: "Promoter is required" }),
-    pmcId: z.string().min(1, { message: "PMC is required" }),
+    // pmcId: z.string().min(1, { message: "PMC is required" }),
   })
   .refine(
     (data) => {

src/components/Tenant/OrganizationInfo.jsx

@@ -8,12 +8,14 @@ import { orgSize, reference } from "../../utils/constants";
 import moment from "moment";
 import { useGlobalServices } from "../../hooks/masterHook/useMaster";
 import SelectMultiple from "../common/SelectMultiple";
+import { useNavigate } from "react-router-dom";
 
 const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
   const { data, isError, isLoading: industryLoading } = useIndustries();
   const [logoPreview, setLogoPreview] = useState(null);
   const [logoName, setLogoName] = useState("");
   const { data: services, isLoading: serviceLoading } = useGlobalServices();
+  const navigate = useNavigate()
   const {
     register,
     control,
@@ -29,8 +31,8 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
     error,
     isPending,
   } = useCreateTenant(() => {
-    debugger
+    // onNext()
-    onNext()
+    navigate("/tenants");
   });
 
   const handleNext = async () => {
@@ -134,7 +136,6 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
           control={control}
           placeholder="DD-MM-YYYY"
           maxDate={new Date()}
-          className={errors.onBoardingDate ? "is-invalid" : ""}
         />
         {errors.onBoardingDate && (
           <div className="invalid-feedback">

src/components/common/DateRangePicker.jsx

@@ -85,6 +85,7 @@ export const DateRangePicker1 = ({
   resetSignal,
   defaultRange = true,
   maxDate = null,
+  sm,md,
   ...rest
 }) => {
   const inputRef = useRef(null);
@@ -168,11 +169,12 @@ export const DateRangePicker1 = ({
   const formattedValue = start && end ? `${start} To ${end}` : "";
 
   return (
-    <div className={`position-relative ${className}`}>
+      <div className={`col-${sm} col-sm-${md} px-1 position-relative`}>
       <input
         type="text"
-        className="form-control form-control-sm"
+        className="form-control form-control-sm ps-2 pe-5 me-4 cursor-pointer"
-        placeholder={placeholder}
+        placeholder="From to End"
+        id="flatpickr-range"
         defaultValue={formattedValue}
         ref={(el) => {
           inputRef.current = el;
@@ -181,12 +183,10 @@ export const DateRangePicker1 = ({
         readOnly={!allowText}
         autoComplete="off"
       />
-      <span
+      <i
-        className="position-absolute top-50 end-0 pe-1 translate-middle-y cursor-pointer"
+        className="bx bx-calendar calendar-icon cursor-pointer position-absolute top-50 end-0 translate-middle-y me-2"
         onClick={() => inputRef.current?._flatpickr?.open()}
-      >
+      ></i>
-        <i className="bx bx-calendar bx-sm fs-5 text-muted"></i>
-      </span>
     </div>
   );
 };

src/components/common/EmployeeSearchInput.jsx

@@ -1,13 +1,11 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
 import { useEmployeesName } from "../../hooks/useEmployees";
 import { useDebounce } from "../../utils/appUtils";
 import { useController } from "react-hook-form";
 import Avatar from "./Avatar";
 
 
-
+const EmployeeSearchInput = ({ control, name, projectId, placeholder }) => {
-
-const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
   const {
     field: { onChange, value, ref },
     fieldState: { error },
@@ -17,6 +15,8 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
   const [showDropdown, setShowDropdown] = useState(false);
   const debouncedSearch = useDebounce(search, 500);
 
+  const wrapperRef = useRef(null);
+
   const {
     data: employees,
     isLoading,
@@ -29,6 +29,19 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
     }
   }, [value, employees]);
 
+  useEffect(() => {
+    const handleClickOutside = (e) => {
+      if (wrapperRef.current && !wrapperRef.current.contains(e.target)) {
+        setShowDropdown(false);
+      }
+    };
+    document.addEventListener("mousedown", handleClickOutside);
+
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, []);
+
   const handleSelect = (employee) => {
     onChange(employee.id);
     setSearch(employee.firstName + " " + employee.lastName);
@@ -36,17 +49,17 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
   };
 
   return (
-    <div className="position-relative">
+    <div className="position-relative" ref={wrapperRef}>
       <input
         type="text"
         ref={ref}
-        className={`form-control form-control-sm`}
+        className="form-control form-control-sm"
         placeholder={placeholder}
         value={search}
         onChange={(e) => {
           setSearch(e.target.value);
           setShowDropdown(true);
-          onChange(""); 
+          onChange("");
         }}
         onFocus={() => {
           if (search) setShowDropdown(true);
@@ -55,34 +68,33 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
 
       {showDropdown && (employees?.data?.length > 0 || isLoading) && (
         <ul
-          className="list-group position-absolute bg-white w-100 shadow z-3 rounded-none px-0"
+          className="list-group position-absolute bg-white w-100 shadow z-3 px-0"
           style={{ maxHeight: 200, overflowY: "auto" }}
         >
           {isLoading ? (
             <li className="list-group-item">
               <a>Searching...</a>
-              
             </li>
           ) : (
             employees?.data?.map((emp) => (
-             <li
+              <li
-        key={emp.id}
+                key={emp.id}
-        className="list-group-item list-group-item-action py-1 px-1"
+                className="list-group-item list-group-item-action py-1 px-1"
-        style={{ cursor: "pointer" }}
+                style={{ cursor: "pointer" }}
-        onClick={() => handleSelect(emp)}
+                onClick={() => handleSelect(emp)}
-      >
+              >
-        <div className="d-flex align-items-center px-0">
+                <div className="d-flex align-items-center px-0">
-          <Avatar
+                  <Avatar
-            size="xs"
+                    size="xs"
-            classAvatar="m-0 me-2"
+                    classAvatar="m-0 me-2"
-            firstName={emp.firstName}
+                    firstName={emp.firstName}
-            lastName={emp.lastName}
+                    lastName={emp.lastName}
-          />
+                  />
-          <span className="text-muted">
+                  <span className="text-muted">
-            {`${emp?.firstName} ${emp?.lastName}`.trim()}
+                    {`${emp?.firstName} ${emp?.lastName}`.trim()}
-          </span>
+                  </span>
-        </div>
+                </div>
-      </li>
+              </li>
             ))
           )}
         </ul>
@@ -94,3 +106,4 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
 };
 
 export default EmployeeSearchInput;
+

src/components/common/SelectMultiple.jsx

@@ -4,21 +4,26 @@ import { createPortal } from "react-dom";
 import "./MultiSelectDropdown.css";
 import Label from "./Label";
 
+
+
+
 const SelectMultiple = ({
   name,
   options = [],
   label = "Select options",
-  labelKey = "name", 
+  labelKey = "name",
   valueKey = "id",
   placeholder = "Please select...",
-  IsLoading = false,required = false
+  IsLoading = false,
+  required = false,
 }) => {
-  const { setValue, watch,register } = useFormContext();
+  const { setValue, watch, register } = useFormContext();
-  useEffect(() => {
-  register(name, { value: [] });
-}, [register, name]);
 
-const selectedValues = watch(name) || [];
+  useEffect(() => {
+    register(name, { value: [] });
+  }, [register, name]);
+
+  const selectedValues = watch(name) || [];
 
   const [isOpen, setIsOpen] = useState(false);
   const [searchText, setSearchText] = useState("");
@@ -60,18 +65,20 @@ const selectedValues = watch(name) || [];
     const updated = selectedValues.includes(value)
       ? selectedValues.filter((v) => v !== value)
       : [...selectedValues, value];
-
     setValue(name, updated, { shouldValidate: true });
   };
 
   const filteredOptions = (options || []).filter((item) => {
-  const label = getLabel(item);
+    const label = getLabel(item);
-  return (
+    return typeof label === "string" && label.toLowerCase().includes(searchText.toLowerCase());
-    typeof label === "string" &&
+  });
-    label.toLowerCase().includes(searchText.toLowerCase())
-  );
-});
 
+  // Sort filtered options in ascending order
+  const sortedOptions = filteredOptions.sort((a, b) => {
+    const labelA = getLabel(a).toString().toLowerCase();
+    const labelB = getLabel(b).toString().toLowerCase();
+    return labelA.localeCompare(labelB);
+  });
 
   const dropdownElement = (
     <div
@@ -101,7 +108,7 @@ const selectedValues = watch(name) || [];
         />
       </div>
 
-      {filteredOptions.map((item) => {
+      {sortedOptions.map((item) => {
         const labelVal = getLabel(item);
         const valueVal = item[valueKey];
         const isChecked = selectedValues.includes(valueVal);
@@ -124,12 +131,12 @@ const selectedValues = watch(name) || [];
         );
       })}
 
-      {!IsLoading && filteredOptions.length === 0 && (
+      {!IsLoading && sortedOptions.length === 0 && (
         <div className="multi-select-dropdown-Not-found" style={{ padding: 8 }}>
           <label className="text-muted">Not Found {`'${searchText}'`}</label>
         </div>
       )}
-      {IsLoading && filteredOptions.length === 0 && (
+      {IsLoading && sortedOptions.length === 0 && (
         <div className="multi-select-dropdown-Not-found" style={{ padding: 8 }}>
           <label className="text-muted">Loading...</label>
         </div>
@@ -140,19 +147,14 @@ const selectedValues = watch(name) || [];
   return (
     <>
       <div ref={containerRef} className="multi-select-dropdown-container" style={{ position: "relative" }}>
-        <label className="form-label mb-1">{label}</label>
+        <Label  required={required}>{label}</Label>
-        <Label className={name} required={required}></Label>
 
         <div
           className="multi-select-dropdown-header"
           onClick={() => setIsOpen((prev) => !prev)}
           style={{ cursor: "pointer" }}
         >
-          <span
+          <span className={selectedValues.length > 0 ? "placeholder-style-selected" : "placeholder-style"}>
-            className={
-              selectedValues.length > 0 ? "placeholder-style-selected" : "placeholder-style"
-            }
-          >
             <div className="selected-badges-container">
               {selectedValues.length > 0 ? (
                 selectedValues.map((val) => {

src/components/common/TagInput.jsx

@@ -2,7 +2,7 @@ import { useFormContext, useWatch } from "react-hook-form";
 import React, { useEffect, useState } from "react";
 import Label from "./Label";
 
-const TagInput = ({ label, name, placeholder, color = "#e9ecef", options = [] }) => {
+const TagInput = ({ label, name, placeholder, color = "#e9ecef", options = [],require = false }) => {
   const { setValue, watch } = useFormContext();
   const tags = watch(name) || [];
   const [input, setInput] = useState("");
@@ -65,9 +65,9 @@ const handleChange = (e) => {
 
   return (
     <>
-      <label htmlFor={name} className="form-label">
+      <Label required={require}>
         {label}
-      </label>
+      </Label>
 
       <div
         className="form-control form-control-sm p-1"

src/components/master/Services/ServicesGroups.jsx

@@ -37,7 +37,6 @@ const ServiceGroups = ({ service }) => {
 
     <div className="w-100 my-2">
       
-      <p className="fs-5 fw-semibold">Manage Service</p>
       <div className="accordion" id="accordionExample">
         <div className="accordion-item active shadow-none">
           {/* Service Header */}

src/hooks/useAttendance.js

@@ -12,38 +12,9 @@ import { setDefaultDateRange } from "../slices/localVariablesSlice";
 // ----------------------------Query-----------------------------
 
 
-// export const useAttendance = (projectId) => {
-//   const dispatch = useDispatch()
-//   const {
-//     data: attendance = [],
-//     isLoading: loading,
-//     error,
-//     refetch: recall,
-//     isFetching
-//   } = useQuery({
-//     queryKey: ["attendance", projectId],
-//     queryFn: async () => {
-//       const response = await AttendanceRepository.getAttendance(projectId);
-//       return response.data;
-//     },
-//     enabled: !!projectId,
-//     onError: (error) => {
-//       showToast(error.message || "Error while fetching Attendance", "error");
-//     },
-//   });
-
-//   return {
-//     attendance,
-//     loading,
-//     error,
-//     recall,
-//     isFetching
-//   };
-// };
-
 export const useAttendance = (projectId, organizationId, includeInactive = false, date = null) => {
   const dispatch = useDispatch();
-
+// queryKey: ["attendance", projectId, organizationId, includeInactive, date], 
   const {
     data: attendance = [],
     isLoading: loading,
@@ -51,7 +22,7 @@ export const useAttendance = (projectId, organizationId, includeInactive = false
     refetch: recall,
     isFetching,
   } = useQuery({
-    queryKey: ["attendance", projectId, organizationId, includeInactive, date], // include filters in cache key
+    queryKey: ["attendance", projectId ], 
     queryFn: async () => {
       const response = await AttendanceRepository.getAttendance(
         projectId,
@@ -61,7 +32,7 @@ export const useAttendance = (projectId, organizationId, includeInactive = false
       );
       return response.data;
     },
-    enabled: !!projectId, // only run if projectId exists
+    enabled: !!projectId, 
     onError: (error) => {
       showToast(error.message || "Error while fetching Attendance", "error");
     },
@@ -142,31 +113,6 @@ export const useAttendanceByEmployee = (employeeId, fromDate, toDate) => {
   });
 };
 
-// export const useRegularizationRequests = (projectId) => {
-//   const {
-//     data: regularizes = [],
-//     isLoading: loading,
-//     error,
-//     refetch,
-//   } = useQuery({
-//     queryKey: ["regularizedList", projectId],
-//     queryFn: async () => {
-//       const response = await AttendanceRepository.getRegularizeList(projectId);
-//       return response.data;
-//     },
-//     enabled: !!projectId,
-//     onError: (error) => {
-//       showToast(error.message || "Error while fetching Regularization Requests", "error");
-//     },
-//   });
-
-//   return {
-//     regularizes,
-//     loading,
-//     error,
-//     refetch,
-//   };
-// };
 
 export const useRegularizationRequests = (projectId, organizationId, IncludeInActive = false) => {
   const dispatch = useDispatch();
@@ -218,10 +164,11 @@ export const useMarkAttendance = () => {
           emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
         );
       });
+      // queryClient.invalidateQueries({queryKey:["attendance"]})
     }else if(variables.forWhichTab == 2){
-    //   queryClient.invalidateQueries({
+      queryClient.invalidateQueries({
-    //     queryKey: ["attendanceLogs"], 
+        queryKey: ["attendanceLogs"], 
-    //  });
+     });
      queryClient.setQueryData(["attendanceLogs",selectedProject,selectedDateRange.startDate,selectedDateRange.endDate], (oldData) => {
         if (!oldData) return oldData;
         return oldData.map((record) =>

src/hooks/useDashboard_Data.jsx

@@ -155,32 +155,32 @@ export const useDashboard_Data = ({ days, FromDate, projectId }) => {
 // };
 
 
-export const useAttendanceOverviewData = (projectId, days) => {
+// export const useAttendanceOverviewData = (projectId, days) => {
-  const [attendanceOverviewData, setAttendanceOverviewData] = useState([]);
+//   const [attendanceOverviewData, setAttendanceOverviewData] = useState([]);
-  const [loading, setLoading] = useState(false);
+//   const [loading, setLoading] = useState(false);
-  const [error, setError] = useState("");
+//   const [error, setError] = useState("");
 
-  useEffect(() => {
+//   useEffect(() => {
-    if (!projectId || !days) return;
+//     if (!projectId || !days) return;
-    const fetchAttendanceOverview = async () => {
+//     const fetchAttendanceOverview = async () => {
-      setLoading(true);
+//       setLoading(true);
-      setError("");
+//       setError("");
 
-      try {
+//       try {
-        const response = await GlobalRepository.getAttendanceOverview(projectId, days);
+//         const response = await GlobalRepository.getAttendanceOverview(projectId, days);
-        setAttendanceOverviewData(response.data);
+//         setAttendanceOverviewData(response.data);
-      } catch (err) {
+//       } catch (err) {
-        setError("Failed to fetch attendance overview data.");
+//         setError("Failed to fetch attendance overview data.");
-      } finally {
+//       } finally {
-        setLoading(false);
+//         setLoading(false);
-      }
+//       }
-    };
+//     };
 
-    fetchAttendanceOverview();
+//     fetchAttendanceOverview();
-  }, [projectId, days]);
+//   }, [projectId, days]);
 
-  return { attendanceOverviewData, loading, error };
+//   return { attendanceOverviewData, loading, error };
-};
+// };
 
 
 // -------------------Query----------------------------
@@ -232,16 +232,17 @@ export const useDashboardTasksCardData = (projectId) => {
     }
   })
 }
-// export const useAttendanceOverviewData = (projectId, days) => {
+export const useAttendanceOverviewData = (projectId, days) => {
-//    return useQuery({
+   return useQuery({
-//     queryKey:["dashboardAttendanceOverView",projectId],
+    queryKey:["dashboardAttendanceOverView",projectId,days],
-//     queryFn:async()=> {
+    queryFn:async()=> {
      
-//      const resp =  await GlobalRepository.getAttendanceOverview(projectId, days);
+     const resp =  await GlobalRepository.getAttendanceOverview(projectId, days);
-//      return resp.data;
+     return resp.data;
-//     }
+    },
-//   })
+    enabled:!!projectId
-// }
+  })
+}
 
 export const useDashboardProjectsCardData = () => {
     return useQuery({
@@ -252,4 +253,44 @@ export const useDashboardProjectsCardData = () => {
      return resp.data;
     }
   })
-}
+}
+
+export const useExpenseAnalysis = (projectId, startDate, endDate) => {
+   const hasBothDates = !!startDate && !!endDate;
+  const noDatesSelected = !startDate && !endDate;
+
+  const shouldFetch =
+    noDatesSelected ||
+    hasBothDates;
+  return useQuery({
+    queryKey: ["expenseAnalysis", projectId, startDate, endDate],
+    queryFn: async () => {
+      const resp = await GlobalRepository.getExpenseData(projectId, startDate, endDate);
+      return resp.data; 
+    },
+    enabled:shouldFetch,       
+    refetchOnWindowFocus: true,   // refetch when you come back
+    refetchOnMount: "always",     // always refetch on remount
+    staleTime: 0,   
+  });
+};
+export const useExpenseStatus = (projectId)=>{
+  return useQuery({
+    queryKey:["expense_stauts",projectId],
+    queryFn: async()=>{
+      const resp = await GlobalRepository.getExpenseStatus(projectId);
+      return resp.data;
+    }
+  })
+}
+
+export const useExpenseDataByProject = (projectId, categoryId, months) => {  
+  return useQuery({
+    queryKey: ["expenseByProject", projectId, categoryId, months],
+    queryFn: async () => {
+      const resp = await GlobalRepository.getExpenseDataByProject(projectId, categoryId, months);
+      return resp.data;
+    },
+    
+  });
+};

src/hooks/useDirectory.js

@@ -399,7 +399,6 @@ export const useUpdateBucket = (onSuccessCallBack) => {
     mutationFn: async ({ bucketId, BucketPayload }) =>
       await DirectoryRepository.UpdateBuckets(bucketId, BucketPayload),
     onSuccess: (_, variables) => {
-      debugger;
       queryClient.invalidateQueries({ queryKey: ["bucketList"] });
       showToast("Bucket updated successfully", "success");
       if (onSuccessCallBack) onSuccessCallBack();
@@ -415,7 +414,7 @@ export const useUpdateBucket = (onSuccessCallBack) => {
   });
 };
 
-export const useAssignEmpToBucket = () => {
+export const useAssignEmpToBucket = (onSuccessCallBack) => {
   return useMutation({
     mutationFn: async ({ bucketId, EmployeePayload }) =>
       await DirectoryRepository.AssignedBuckets(bucketId, EmployeePayload),
@@ -464,6 +463,7 @@ export const useCreateContact = (onSuccessCallBack) => {
       await DirectoryRepository.CreateContact(contactPayload),
     onSuccess: (_, variables) => {
       queryClient.invalidateQueries({ queryKey: ["contacts"] });
+      queryClient.invalidateQueries({ queryKey: ["bucketList"] });
       showToast("Contact created Successfully", "success");
       if (onSuccessCallBack) onSuccessCallBack();
     },
@@ -483,6 +483,7 @@ export const useUpdateContact = (onSuccessCallBack) => {
     mutationFn: async ({ contactId, contactPayload }) =>
       await DirectoryRepository.UpdateContact(contactId, contactPayload),
     onSuccess: (_, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["Contact"] });
       queryClient.invalidateQueries({ queryKey: ["contacts"] });
       showToast("Contact updated Successfully", "success");
       if (onSuccessCallBack) onSuccessCallBack();

src/hooks/useDocument.js

@@ -120,7 +120,7 @@ export const useUploadDocument = (onSuccessCallBack) => {
       DocumentRepository.uploadDocument(DocumentPayload),
     onSuccess: (data, variables) => {
       queryClient.invalidateQueries({ queryKey: ["DocumentList"] });
-
+      queryClient.invalidateQueries({ queryKey: ["Document"] });
       if (onSuccessCallBack) onSuccessCallBack();
     },
     onError: (error) => {
@@ -141,7 +141,7 @@ export const useUpdateDocument = (onSuccessCallBack) => {
     onSuccess: (data, variables) => {
       const { documentId } = variables;
       queryClient.invalidateQueries({ queryKey: ["DocumentList"] });
-      queryClient.invalidateQueries({ queryKey: ["Document", documentId] });
+      queryClient.invalidateQueries({ queryKey: ["Document"] });
       if (onSuccessCallBack) onSuccessCallBack();
     },
     onError: (error) => {
@@ -187,6 +187,7 @@ export const useActiveInActiveDocument = ()=>{
     onSuccess: (data, variables) => {
       const {isActive} = variables;
      queryClient.invalidateQueries({ queryKey: ["DocumentList"] });
+     queryClient.invalidateQueries({ queryKey: ["Document"] });
       showToast(`Document ${isActive ? "restored":"Deleted"} successfully`,"success")
     },
     onError: (error) => {

src/hooks/useEmployees.js

@@ -12,14 +12,14 @@ import { queryClient } from "../layouts/AuthLayout";
 // Query ---------------------------------------------------------------------------
 
 export const useEmployee = (employeeId) => {
-  return  useQuery({
+  return useQuery({
     queryKey: ["employeeProfile", employeeId],
     queryFn: async () => {
-      const res = await EmployeeRepository.getEmployeeProfile(employeeId)
+      const res = await EmployeeRepository.getEmployeeProfile(employeeId);
       return res.data;
     },
-    enabled:!!employeeId
+    enabled: !!employeeId,
-  });  
+  });
 };
 
 export const useAllEmployees = (showInactive) => {
@@ -208,9 +208,6 @@ export const useEmployeesNameByProject = (projectId) => {
 
 // Mutation------------------------------------------------------------------
 
-
-
-
 export const useUpdateEmployee = () => {
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
@@ -218,14 +215,15 @@ export const useUpdateEmployee = () => {
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (employeeData) =>
+    mutationFn: async (employeeData) =>
-      EmployeeRepository.manageEmployee(employeeData),
+      await EmployeeRepository.manageEmployee(employeeData),
     onSuccess: (_, variables) => {
+      debugger;
       const id = variables?.id || variables?.employeeId;
       const isAllEmployee = variables.IsAllEmployee;
 
       // Cache invalidation
-      queryClient.invalidateQueries({ queryKey: ["employeeProfile",id] });
+      queryClient.invalidateQueries({ queryKey: ["employeeProfile"] });
       queryClient.invalidateQueries({ queryKey: ["allEmployees"] });
       // queryClient.invalidateQueries(['employeeProfile', id]);
       queryClient.invalidateQueries({ queryKey: ["projectEmployees"] });
@@ -247,7 +245,6 @@ export const useUpdateEmployee = () => {
   });
 };
 
-
 export const useSuspendEmployee = ({
   setIsDeleteModalOpen,
   setemployeeLodaing,
@@ -300,7 +297,6 @@ export const useSuspendEmployee = ({
   });
 };
 
-
 export const useUpdateEmployeeRoles = ({
   onClose,
   resetForm,
@@ -334,4 +330,4 @@ export const useUpdateEmployeeRoles = ({
     isError: mutation.isError,
     error: mutation.error,
   };
-};
+};

src/hooks/useExpense.js

@@ -10,7 +10,7 @@ import moment from "moment";
 const cleanFilter = (filter) => {
   const cleaned = { ...filter };
 
-  ["projectIds", "statusIds", "createdByIds", "paidById"].forEach((key) => {
+  ["projectIds", "statusIds", "createdByIds", "paidById","ExpenseTypeIds"].forEach((key) => {
     if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
       delete cleaned[key];
     }

src/hooks/useHasUserPermission.js

@@ -8,19 +8,20 @@ export const useHasUserPermission = (permission) => {
     data: projectPermissions = [],
     isLoading,
     isError,
-  } = useAllProjectLevelPermissions(selectedProject);
+  } = useAllProjectLevelPermissions();
-
+  // set selectedProject to call api- selectedProject
   if (isLoading || !permission) return false;
 
   const globalPerms = profile?.featurePermissions ?? [];
-  const projectPerms = projectPermissions ?? [];
+  // const projectPerms = projectPermissions ?? [];
-  if (selectedProject) {
+  // if (selectedProject) {
-    if (projectPerms.length === 0) {
+  //   if (projectPerms.length === 0) {
-      return projectPerms.includes(permission);
+  //     return projectPerms.includes(permission);
-    } else {
+  //   } else {
-      return projectPerms.includes(permission);
+  //     return projectPerms.includes(permission);
-    }
+  //   }
-  } else {
+  // } else {
-    return globalPerms.includes(permission);
+  //   return globalPerms.includes(permission);
-  }
+  // }
+  return globalPerms.includes(permission);
 };

src/hooks/useProjectAccess.js

@@ -14,7 +14,6 @@ export const useProjectAccess = (projectId) => {
   const canView = useHasUserPermission(VIEW_PROJECTS); 
 
   const loading = isLoading || !isFetched;
-   debugger
   useEffect(() => {
     if (projectId && !loading && !canView) {
       showToast("You don't have permission to view project details", "warning");

src/hooks/useProjects.js

@@ -3,7 +3,7 @@ import { cacheData, getCachedData } from "../slices/apiDataManager";
 import ProjectRepository from "../repositories/ProjectRepository";
 import { useProfile } from "./useProfile";
 import { useDispatch, useSelector } from "react-redux";
-import { setProjectId } from "../slices/localVariablesSlice";
+import { closeProjectModal, openProjectModal, setProjectId } from "../slices/localVariablesSlice";
 import EmployeeList from "../components/Directory/EmployeeList";
 import eventBus from "../services/eventBus";
 import {
@@ -18,6 +18,18 @@ export const useCurrentService = () => {
   return useSelector((store) => store.globalVariables.selectedServiceId);
 };
 
+export const useProjectModal = () => {
+  const dispatch = useDispatch();
+  const { isOpen, data } = useSelector((state) => state.localVariables.ProjectModal);
+
+  return {
+    isOpen,
+    data,
+    openModal: (payload = null) => dispatch(openProjectModal(payload)),
+    closeModal: () => dispatch(closeProjectModal()),
+  };
+};
+
 // ------------------------------Query-------------------
 
 export const useProjects = () => {

src/hooks/useTenant.js

@@ -6,6 +6,7 @@ import { useDispatch } from "react-redux";
 import { setCurrentTenant } from "../slices/globalVariablesSlice";
 import { ITEMS_PER_PAGE } from "../utils/constants";
 import moment from "moment";
+import { queryClient } from "../layouts/AuthLayout";
 
 const cleanFilter = (filter) => {
   const cleaned = { ...filter };
@@ -71,6 +72,7 @@ export const useSubscriptionPlan = (freq) => {
 // ------------Mutation---------------------
 
 export const useCreateTenant = (onSuccessCallback) => {
+  const clinet = queryClient()
   const dispatch = useDispatch();
   return useMutation({
     mutationFn: async (tenantPayload) => {
@@ -87,6 +89,9 @@ export const useCreateTenant = (onSuccessCallback) => {
         operationMode = 2; // tenant exists but subscription not added yet
       }
 
+     clinet.invalidateQueries({queryKey:["Tenants"]})
+
+
       dispatch(setCurrentTenant({ operationMode, data }));
 
       if (onSuccessCallback) onSuccessCallback();

src/pages/Activities/AttendancePage.jsx

@@ -174,7 +174,7 @@ const AttendancePage = () => {
               {/* Search + Organization filter */}
               <div className="col-12 col-md-auto mt-2 mt-md-0 ms-md-auto d-flex gap-2 align-items-center">
                 {/* Organization Dropdown */}
-                <select
+                {/* <select
                   className="form-select form-select-sm"
                   style={{ minWidth: "180px" }}
                   value={appliedFilters.selectedOrganization}
@@ -192,7 +192,7 @@ const AttendancePage = () => {
                       {org.name}
                     </option>
                   ))}
-                </select>
+                </select> */}
 
                 {/* Search Input */}
                 <input

src/pages/Directory/ContactsPage.jsx

@@ -9,18 +9,24 @@ import { defaultContactFilter } from "../../components/Directory/DirectorySchema
 import { useDebounce } from "../../utils/appUtils";
 import Pagination from "../../components/common/Pagination";
 import ListViewContact from "../../components/Directory/ListViewContact";
-import { CardViewContactSkeleton, ListViewContactSkeleton } from "../../components/Directory/DirectoryPageSkeleton";
+import {
+  CardViewContactSkeleton,
+  ListViewContactSkeleton,
+} from "../../components/Directory/DirectoryPageSkeleton";
+import Loader from "../../components/common/Loader";
 
 // Utility function to format contacts for CSV export
 const formatExportData = (contacts) => {
-  return contacts.map(contact => ({
+  return contacts.map((contact) => ({
-    Email: contact.contactEmails?.map(e => e.emailAddress).join(", ") || "",
+    Email: contact.contactEmails?.map((e) => e.emailAddress).join(", ") || "",
-    Phone: contact.contactPhones?.map(p => p.phoneNumber).join(", ") || "",
+    Phone: contact.contactPhones?.map((p) => p.phoneNumber).join(", ") || "",
-    Created: contact.createdAt ? new Date(contact.createdAt).toLocaleString() : "",
+    Created: contact.createdAt
+      ? new Date(contact.createdAt).toLocaleString()
+      : "",
     Location: contact.address || "",
     Organization: contact.organization || "",
     Category: contact.contactCategory?.name || "",
-    Tags: contact.tags?.map(t => t.name).join(", ") || "",
+    Tags: contact.tags?.map((t) => t.name).join(", ") || "",
     Buckets: contact.bucketIds?.join(", ") || "",
   }));
 };
@@ -75,8 +81,21 @@ const ContactsPage = ({ projectId, searchText, onExport }) => {
     <div className="row mt-5">
       {gridView ? (
         <>
+          {isLoading && (
+            <div>
+              <Loader />
+            </div>
+          )}
+
+
+          {data?.data?.length === 0 && (<div className="py-12 ">
+            {searchText ? `No contact found for "${searchText}"`:"No contacts found" }
+          </div>)}
           {data?.data?.map((contact) => (
-            <div key={contact.id} className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4">
+            <div
+              key={contact.id}
+              className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4"
+            >
               <CardViewContact IsActive={showActive} contact={contact} />
             </div>
           ))}
@@ -95,6 +114,7 @@ const ContactsPage = ({ projectId, searchText, onExport }) => {
         <div className="col-12">
           <ListViewContact
             data={data?.data}
+            isLoading={isLoading}
             Pagination={
               <Pagination
                 currentPage={currentPage}

src/pages/Directory/DirectoryPage.jsx

@@ -44,7 +44,7 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
   const [searchNote, setSearchNote] = useState("");
   const [activeTab, setActiveTab] = useState("notes");
   const { setActions } = useFab();
-  const [gridView, setGridView] = useState(false);
+  const [gridView, setGridView] = useState(true);
   const [isOpenBucket, setOpenBucket] = useState(false);
   const [isManageContact, setManageContact] = useState({
     isOpen: false,
@@ -133,7 +133,7 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
               ]}
             ></Breadcrumb>
           )}
-          <div className="card">
+          <div className="card ">
             <div className="d-flex-row px-2">
               <div className="d-flex justify-content-between align-items-center mb-1">
                 <ul className="nav nav-tabs">
@@ -185,14 +185,7 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                             value={searchContact}
                             onChange={(e) => setsearchContact(e.target.value)}
                           />
-                          <button
+                         
-                            className={`btn btn-sm p-1 ${
-                              !gridView ? "btn-primary" : "btn-outline-primary"
-                            }`}
-                            onClick={() => setGridView(false)}
-                          >
-                            <i className="bx bx-list-ul"></i>
-                          </button>
 
                           <button
                             className={`btn btn-sm p-1 ${
@@ -202,9 +195,18 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                           >
                             <i className="bx bx-grid-alt"></i>
                           </button>
+
+                           <button
+                            className={`btn btn-sm p-1 ${
+                              !gridView ? "btn-primary" : "btn-outline-primary"
+                            }`}
+                            onClick={() => setGridView(false)}
+                          >
+                            <i className="bx bx-list-ul"></i>
+                          </button>
                         </div>
 
-                        <div className="form-check form-switch d-flex align-items-center">
+                        <div className="form-check form-switch d-flex align-items-center m-0">
                           <input
                             type="checkbox"
                             className="form-check-input"

src/pages/Directory/NoteFilterPanel.jsx

@@ -60,12 +60,12 @@ const NoteFilterPanel = ({ onApply, clearFilter }) => {
         <div className="d-flex justify-content-end py-3 gap-2">
           <button
             type="button"
-            className="btn btn-label-secondary btn-xs"
+            className="btn btn-label-secondary btn-sm"
             onClick={handleClose}
           >
             Clear
           </button>
-          <button type="submit" className="btn btn-primary btn-xs">
+          <button type="submit" className="btn btn-primary btn-sm">
             Apply
           </button>
         </div>

src/pages/Expense/ExpensePage.jsx

@@ -129,6 +129,7 @@ const ExpensePage = () => {
                   </div>
 
                   <div className="col-6  text-end mt-2 mt-sm-0">
+   
                     {IsCreatedAble && (
                       <button
                         className="btn btn-sm btn-primary"

src/pages/Home/SwaperBlogContent.jsx

@@ -5,37 +5,37 @@ const SwaperBlogContent = ({
   ContentAlign = "right",
 }) => {
   return (
-    <div class="swiper-slide">
+    <div className="swiper-slide">
-      <div class="card h-100">
+      <div className="card h-100">
-        <div class="card-body text-body d-flex flex-column justify-content-between h-100">
+        <div className="card-body text-body d-flex flex-column justify-content-between h-100">
-          <div class="mb-4">
+          <div className="mb-4">
             <img
               src={ImageUrl}
               alt="client logo"
-              class="client-logo img-fluid"
+              className="client-logo img-fluid"
               style={{ width: "580px", height: "100px" }}
             />
             <h5>{Title}</h5>
           </div>
           <p>{Body}</p>
-          <div class="text-warning mb-4">
+          <div className="text-warning mb-4">
-            <i class="bx bxs-star"></i>
+            <i className="bx bxs-star"></i>
-            <i class="bx bxs-star"></i>
+            <i className="bx bxs-star"></i>
-            <i class="bx bxs-star"></i>
+            <i className="bx bxs-star"></i>
-            <i class="bx bxs-star"></i>
+            <i className="bx bxs-star"></i>
-            <i class="bx bxs-star"></i>
+            <i className="bx bxs-star"></i>
           </div>
-          <div class="d-flex align-items-center">
+          <div className="d-flex align-items-center">
-            <div class="avatar me-3 avatar-sm">
+            <div className="avatar me-3 avatar-sm">
               <img
                 src="../../assets/img/avatars/1.png"
                 alt="Avatar"
-                class="rounded-circle"
+                className="rounded-circle"
               />
             </div>
             <div>
-              <h6 class="mb-0">Cecilia Payne</h6>
+              <h6 className="mb-0">Cecilia Payne</h6>
-              <p class="small text-muted mb-0">CEO of Airbnb</p>
+              <p className="small text-muted mb-0">CEO of Airbnb</p>
             </div>
           </div>
         </div>

src/pages/Tenant/TenantPage.jsx

@@ -127,7 +127,7 @@ const TenantPage = () => {
             <div className="p-0">
               <div className="row align-items-center">
                 {/* Search */}
-                <div className="col-6 col-md-6 col-lg-2 mb-md-0">
+                <div className="col-6 col-md-6 col-lg-3 mb-md-0">
                   <input
                     type="search"
                     value={searchText}
@@ -138,7 +138,7 @@ const TenantPage = () => {
                 </div>
 
                 {/* Actions */}
-                <div className="col-6 col-md-6 col-lg-10 text-end">
+                <div className="col-6 col-md-6 col-lg-9 text-end">
                   <button
                     className="btn btn-sm btn-primary"
                     type="button"

src/pages/authentication/LoginPage.jsx

@@ -41,21 +41,24 @@ const LoginPage = () => {
           password: data.password,
         };
         const response = await AuthRepository.login(userCredential);
-        if (data.rememberMe) {
+        // if (data.rememberMe) {
-          localStorage.setItem("jwtToken", response.data.token);
+        //   localStorage.setItem("jwtToken", response.data.token);
-          localStorage.setItem("refreshToken", response.data.refreshToken);
+        //   localStorage.setItem("refreshToken", response.data.refreshToken);
-        } else {
+        // } else {
-          sessionStorage.setItem("jwtToken", response.data.token);
+        //   sessionStorage.setItem("jwtToken", response.data.token);
-          sessionStorage.setItem("refreshToken", response.data.refreshToken);
+        //   sessionStorage.setItem("refreshToken", response.data.refreshToken);
-        }
+        // }
         setLoading(false);
-        navigate("/auth/switch/org");
+                  localStorage.setItem("jwtToken", response.data.token);
+          localStorage.setItem("refreshToken", response.data.refreshToken);
+        navigate("/dashboard",{ replace: true });
       } else {
         await AuthRepository.sendOTP({ email: data.username });
         showToast("OTP has been sent to your email.", "success");
         localStorage.setItem("otpUsername", data.username);
         localStorage.setItem("otpSentTime", now.toString());
-        navigate("/auth/login-otp");
+        // navigate("/auth/login-otp");
+         navigate("/dashboard",{ replace: true });
       }
     } catch (err) {
       showToast("Invalid username or password.", "error");

src/pages/employee/EmployeeList.jsx

@@ -36,31 +36,26 @@ import GlobalModel from "../../components/common/GlobalModel";
 import usePagination from "../../hooks/usePagination";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import Pagination from "../../components/common/Pagination";
 
 const EmployeeList = () => {
-  const selectedProjectId = useSelector(
+  // const selectedProjectId = useSelector(
-    (store) => store.localVariables.projectId
+  //   (store) => store.localVariables.projectId
-  );
+  // );
-  const { projectNames, loading: projectLoading, fetchData } = useProjectName();
+  // const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
   const dispatch = useDispatch();
 
   const [showInactive, setShowInactive] = useState(false);
-  const [showAllEmployees, setShowAllEmployees] = useState(false);
+  const [showAllEmployees, setShowAllEmployees] = useState(true);
   const Manage_Employee = useHasUserPermission(MANAGE_EMPLOYEES);
 
   const { employees, loading, setLoading, error, recallEmployeeData } =
-    useEmployeesAllOrByProjectId(
+    useEmployeesAllOrByProjectId(showAllEmployees, null, showInactive);
-      showAllEmployees,
-      selectedProjectId,
-      showInactive
-    );
 
   const [employeeList, setEmployeeList] = useState([]);
   const [modelConfig, setModelConfig] = useState();
   const [EmpForManageRole, setEmpForManageRole] = useState(null);
-  // const [currentPage, setCurrentPage] = useState(1);
-  // const [itemsPerPage] = useState(ITEMS_PER_PAGE);
   const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
   const [searchText, setSearchText] = useState("");
   const [filteredData, setFilteredData] = useState([]);
@@ -78,11 +73,11 @@ const EmployeeList = () => {
     }
   );
 
-  useEffect(() => {
+  // useEffect(() => {
-    if (selectedProjectId === null) {
+  //   if (selectedProjectId === null) {
-      dispatch(setProjectId(projectNames[0]?.id));
+  //     dispatch(setProjectId(projectNames[0]?.id));
-    }
+  //   }
-  }, [selectedProjectId]);
+  // }, [selectedProjectId]);
   const navigate = useNavigate();
 
   const applySearchFilter = (data, text) => {
@@ -205,25 +200,16 @@ const EmployeeList = () => {
 
       setCurrentPage((prevPage) => (prevPage !== 1 ? 1 : prevPage));
     }
-  }, [loading, employees, selectedProjectId, showAllEmployees]);
+  }, [loading, employees, showAllEmployees]);
-
-  useEffect(() => {
-    if (!showAllEmployees) {
-      recallEmployeeData(showInactive, selectedProjectId);
-    }
-  }, [selectedProjectId, showInactive, showAllEmployees, recallEmployeeData]);
 
   const handler = useCallback(
     (msg) => {
       if (employees.some((item) => item.id == msg.employeeId)) {
         setEmployeeList([]);
-        recallEmployeeData(
+        recallEmployeeData(showInactive, null, showAllEmployees);
-          showInactive,
-          showAllEmployees ? null : selectedProjectId
-        ); // Use selectedProjectId here
       }
     },
-    [employees, showInactive, showAllEmployees, selectedProjectId] // Add all relevant dependencies
+    [employees, showInactive, showAllEmployees]
   );
 
   useEffect(() => {
@@ -293,18 +279,16 @@ const EmployeeList = () => {
 
         {ViewTeamMember ? (
           // <div className="row">
-          <div className="card p-1">
+          <div className="card page-min-h ">
-            <div className="card-datatable table-responsive pt-5 mx-5 py-10">
+            <div
-              <div
+              id="DataTables_Table_0_wrapper"
-                id="DataTables_Table_0_wrapper"
+              className="dataTables_wrapper dt-bootstrap5 no-footer p-1 pt-5 mx-5 py-10"
-                className="dataTables_wrapper dt-bootstrap5 no-footer"
+            >
-                style={{ width: "100%" }}
+              <div className="d-flex flex-wrap align-items-center justify-content-between gap-3 mb-3">
-              >
+                {/* Switches: All Employees + Inactive */}
-                <div className="d-flex flex-wrap align-items-center justify-content-between gap-3 mb-3">
+                <div className="d-flex flex-wrap align-items-center gap-3">
-                  {/* Switches: All Employees + Inactive */}
+                  {/* All Employees Switch */}
-                  <div className="d-flex flex-wrap align-items-center gap-3">
+                  {/* {ViewAllEmployee && (
-                    {/* All Employees Switch */}
-                    {ViewAllEmployee && (
                       <div className="form-check form-switch text-start">
                         <input
                           type="checkbox"
@@ -321,433 +305,382 @@ const EmployeeList = () => {
                           Show All Employees
                         </label>
                       </div>
-                    )}
+                    )} */}
 
-                    {/* Show Inactive Employees Switch */}
+                  {/* Show Inactive Employees Switch */}
-                    {showAllEmployees && (
+                  {/* {showAllEmployees && ( */}
-                      <div className="form-check form-switch text-start">
+                  <div className="form-check form-switch text-start">
-                        <input
+                    <input
-                          type="checkbox"
+                      type="checkbox"
-                          className="form-check-input"
+                      className="form-check-input"
-                          role="switch"
+                      role="switch"
-                          id="inactiveEmployeesCheckbox"
+                      id="inactiveEmployeesCheckbox"
-                          checked={showInactive}
+                      checked={showInactive}
-                          onChange={(e) => setShowInactive(e.target.checked)}
+                      onChange={(e) => setShowInactive(e.target.checked)}
-                        />
+                    />
-                        <label
+                    <label
-                          className="form-check-label ms-0"
+                      className="form-check-label ms-0"
-                          htmlFor="inactiveEmployeesCheckbox"
+                      htmlFor="inactiveEmployeesCheckbox"
-                        >
+                    >
-                          Show Inactive Employees
+                      Show Inactive Employees
-                        </label>
+                    </label>
-                      </div>
-                    )}
-                  </div>
-
-                  {/* Right side: Search + Export + Add Employee */}
-                  <div className="d-flex flex-wrap align-items-center justify-content-end gap-3 flex-grow-1">
-                    {/* Search Input - ALWAYS ENABLED */}
-                    <div className="dataTables_filter">
-                      <label className="mb-0">
-                        <input
-                          type="search"
-                          value={searchText}
-                          onChange={handleSearch}
-                          className="form-control form-control-sm"
-                          placeholder="Search Employee"
-                          aria-controls="DataTables_Table_0"
-                        />
-                      </label>
-                    </div>
-
-                    {/* Export Dropdown */}
-                    <div className="dropdown">
-                      <button
-                        aria-label="Click me"
-                        className="btn btn-sm btn-label-secondary dropdown-toggle"
-                        type="button"
-                        data-bs-toggle="dropdown"
-                        aria-expanded="false"
-                      >
-                        <i className="bx bx-export me-2 bx-sm"></i>Export
-                      </button>
-                      <ul className="dropdown-menu">
-                        <li>
-                          <a
-                            className="dropdown-item"
-                            href="#"
-                            onClick={() => handleExport("print")}
-                          >
-                            <i className="bx bx-printer me-1"></i> Print
-                          </a>
-                        </li>
-                        <li>
-                          <a
-                            className="dropdown-item"
-                            href="#"
-                            onClick={() => handleExport("csv")}
-                          >
-                            <i className="bx bx-file me-1"></i> CSV
-                          </a>
-                        </li>
-                        <li>
-                          <a
-                            className="dropdown-item"
-                            href="#"
-                            onClick={() => handleExport("excel")}
-                          >
-                            <i className="bx bxs-file-export me-1"></i> Excel
-                          </a>
-                        </li>
-                        <li>
-                          <a
-                            className="dropdown-item"
-                            href="#"
-                            onClick={() => handleExport("pdf")}
-                          >
-                            <i className="bx bxs-file-pdf me-1"></i> PDF
-                          </a>
-                        </li>
-                      </ul>
-                    </div>
-
-                    {/* Add Employee Button */}
-                    {Manage_Employee && (
-                      <button
-                        className="btn btn-sm btn-primary"
-                        type="button"
-                        onClick={() => handleEmployeeModel(null)}
-                      >
-                        <i className="bx bx-plus-circle me-2"></i>
-                        <span className="d-none d-md-inline-block">
-                          Add New Employee
-                        </span>
-                      </button>
-                    )}
                   </div>
+                  {/* )} */}
                 </div>
 
-                <table
+                {/* Right side: Search + Export + Add Employee */}
-                  className="datatables-users table border-top dataTable no-footer dtr-column text-nowrap"
+                <div className="d-flex flex-wrap align-items-center justify-content-end gap-3 flex-grow-1">
-                  id="DataTables_Table_0"
+                  {/* Search Input - ALWAYS ENABLED */}
-                  aria-describedby="DataTables_Table_0_info"
+                  <div className="dataTables_filter">
-                  style={{ width: "100%" }}
+                    <label className="mb-0">
-                  ref={tableRef}
+                      <input
-                >
+                        type="search"
-                  <thead>
+                        value={searchText}
-                    <tr>
+                        onChange={handleSearch}
-                      <th
+                        className="form-control form-control-sm"
-                        className="sorting sorting_desc"
+                        placeholder="Search Employee"
-                        tabIndex="0"
                         aria-controls="DataTables_Table_0"
-                        rowSpan="1"
+                      />
-                        colSpan="2"
+                    </label>
-                        aria-label="User: activate to sort column ascending"
+                  </div>
-                        aria-sort="descending"
-                      >
-                        <div className="text-start ms-6">Name</div>
-                      </th>
-                      <th
-                        className="sorting sorting_desc d-none d-sm-table-cell"
-                        tabIndex="0"
-                        aria-controls="DataTables_Table_0"
-                        rowSpan="1"
-                        colSpan="1"
-                        aria-label="User: activate to sort column ascending"
-                        aria-sort="descending"
-                      >
-                        <div className="text-start ms-5">Email</div>
-                      </th>
-                      <th
-                        className="sorting sorting_desc d-none d-sm-table-cell"
-                        tabIndex="0"
-                        aria-controls="DataTables_Table_0"
-                        rowSpan="1"
-                        colSpan="1"
-                        aria-label="User: activate to sort column ascending"
-                        aria-sort="descending"
-                      >
-                        <div className="text-start ms-5">Contact</div>
-                      </th>
-                      <th
-                        className="sorting sorting_desc  d-none  d-sm-table-cell"
-                        tabIndex="0"
-                        aria-controls="DataTables_Table_0"
-                        rowSpan="1"
-                        colSpan="1"
-                        aria-label="User: activate to sort column ascending"
-                        aria-sort="descending"
-                      >
-                        <div className="text-start ms-5">Designation</div>
-                      </th>
 
-                      <th
+                  {/* Export Dropdown */}
-                        className="sorting  d-none  d-md-table-cell"
+                  <div className="dropdown">
-                        tabIndex="0"
+                    <button
-                        aria-controls="DataTables_Table_0"
+                      aria-label="Click me"
-                        rowSpan="1"
+                      className="btn btn-sm btn-label-secondary dropdown-toggle"
-                        colSpan="1"
+                      type="button"
-                        aria-label="Plan: activate to sort column ascending"
+                      data-bs-toggle="dropdown"
-                      >
+                      aria-expanded="false"
-                        Joining Date
+                    >
-                      </th>
+                      <i className="bx bx-export me-2 bx-sm"></i>Export
-                      <th
+                    </button>
-                        className="sorting"
+                    <ul className="dropdown-menu">
-                        tabIndex="0"
+                      <li>
-                        aria-controls="DataTables_Table_0"
+                        <a
-                        rowSpan="1"
+                          className="dropdown-item"
-                        colSpan="1"
+                          href="#"
-                        aria-label="Billing: activate to sort column ascending"
+                          onClick={() => handleExport("print")}
-                      >
-                        Status
-                      </th>
-                      <th
-                        className={`sorting_disabled  ${
-                          !Manage_Employee && "d-none"
-                        }`}
-                        rowSpan="1"
-                        colSpan="1"
-                        style={{ width: "50px" }}
-                        aria-label="Actions"
-                      >
-                        Actions
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {loading && (
-                      <tr>
-                        <td colSpan={8}>
-                          <p>Loading...</p>
-                        </td>
-                      </tr>
-                    )}
-                    {/* Conditional messages for no data or no search results */}
-                    {!loading &&
-                    displayData?.length === 0 &&
-                    searchText &&
-                    !showAllEmployees ? (
-                      <tr>
-                        <td colSpan={8}>
-                          <small className="muted">
-                            '{searchText}' employee not found
-                          </small>{" "}
-                        </td>
-                      </tr>
-                    ) : null}
-                    {!loading &&
-                    displayData?.length === 0 &&
-                    (!searchText || showAllEmployees) ? (
-                      <tr>
-                        <td
-                          colSpan={8}
-                          style={{ paddingTop: "20px", textAlign: "center" }}
                         >
-                          No Data Found
+                          <i className="bx bx-printer me-1"></i> Print
-                        </td>
+                        </a>
-                      </tr>
+                      </li>
-                    ) : null}
+                      <li>
+                        <a
+                          className="dropdown-item"
+                          href="#"
+                          onClick={() => handleExport("csv")}
+                        >
+                          <i className="bx bx-file me-1"></i> CSV
+                        </a>
+                      </li>
+                      <li>
+                        <a
+                          className="dropdown-item"
+                          href="#"
+                          onClick={() => handleExport("excel")}
+                        >
+                          <i className="bx bxs-file-export me-1"></i> Excel
+                        </a>
+                      </li>
+                      <li>
+                        <a
+                          className="dropdown-item"
+                          href="#"
+                          onClick={() => handleExport("pdf")}
+                        >
+                          <i className="bx bxs-file-pdf me-1"></i> PDF
+                        </a>
+                      </li>
+                    </ul>
+                  </div>
 
-                    {/* Render current items */}
+                  {/* Add Employee Button */}
-                    {currentItems &&
+                  {Manage_Employee && (
-                      !loading &&
+                    <button
-                      currentItems.map((item) => (
+                      className="btn btn-sm btn-primary"
-                        <tr className="odd" key={item.id}>
+                      type="button"
-                          <td className="sorting_1" colSpan={2}>
+                      onClick={() => handleEmployeeModel(null)}
-                            <div className="d-flex justify-content-start align-items-center user-name">
+                    >
-                              <Avatar
+                      <i className="bx bx-plus-circle me-2"></i>
-                                firstName={item.firstName}
+                      <span className="d-none d-md-inline-block">
-                                lastName={item.lastName}
+                        Add New Employee
-                              ></Avatar>
+                      </span>
-                              <div className="d-flex flex-column">
+                    </button>
-                                <a
+                  )}
+                </div>
+              </div>
+
+              <table
+                className="datatables-users table border-top dataTable no-footer dtr-column text-nowrap"
+                id="DataTables_Table_0"
+                aria-describedby="DataTables_Table_0_info"
+                style={{ width: "100%" }}
+                ref={tableRef}
+              >
+                <thead>
+                  <tr>
+                    <th
+                      className="sorting sorting_desc"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="2"
+                      aria-label="User: activate to sort column ascending"
+                      aria-sort="descending"
+                    >
+                      <div className="text-start ms-6">Name</div>
+                    </th>
+                    <th
+                      className="sorting sorting_desc d-none d-sm-table-cell"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="1"
+                      aria-label="User: activate to sort column ascending"
+                      aria-sort="descending"
+                    >
+                      <div className="text-start ms-5">Email</div>
+                    </th>
+                    <th
+                      className="sorting sorting_desc d-none d-sm-table-cell"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="1"
+                      aria-label="User: activate to sort column ascending"
+                      aria-sort="descending"
+                    >
+                      <div className="text-start ms-5">Contact</div>
+                    </th>
+                    <th
+                      className="sorting sorting_desc  d-none  d-sm-table-cell"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="1"
+                      aria-label="User: activate to sort column ascending"
+                      aria-sort="descending"
+                    >
+                      <div className="text-start ms-5">Designation</div>
+                    </th>
+
+                    <th
+                      className="sorting  d-none  d-md-table-cell"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="1"
+                      aria-label="Plan: activate to sort column ascending"
+                    >
+                      Joining Date
+                    </th>
+                    <th
+                      className="sorting"
+                      tabIndex="0"
+                      aria-controls="DataTables_Table_0"
+                      rowSpan="1"
+                      colSpan="1"
+                      aria-label="Billing: activate to sort column ascending"
+                    >
+                      Status
+                    </th>
+                    <th
+                      className={`sorting_disabled  ${
+                        !Manage_Employee && "d-none"
+                      }`}
+                      rowSpan="1"
+                      colSpan="1"
+                      style={{ width: "50px" }}
+                      aria-label="Actions"
+                    >
+                      Actions
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {loading && (
+                    <tr>
+                      <td colSpan={8}>
+                        <p>Loading...</p>
+                      </td>
+                    </tr>
+                  )}
+                  {/* Conditional messages for no data or no search results */}
+                  {!loading &&
+                  displayData?.length === 0 &&
+                  searchText  ? (
+                    <tr>
+                      <td colSpan={8} className="border-0">
+                             <div className="py-12">
+                                 <small className="muted">
+                          '{searchText}' employee not found
+                        </small>{" "}
+                             </div>
+                      </td>
+                    </tr>
+                  ) : null}
+                  {!loading &&
+                  displayData?.length === 0 &&
+                  (!searchText ) ? (
+                    <tr>
+                      <td colSpan={8} className="border-0">
+                        <div className="py-12">{showInactive ? "No In-active Employeee Found"  : "No Employeee Found" }</div>
+                      </td>
+                    </tr>
+                  ) : null}
+
+                  {/* Render current items */}
+                  {currentItems &&
+                    !loading &&
+                    currentItems.map((item) => (
+                      <tr className="odd" key={item.id}>
+                        <td className="sorting_1" colSpan={2}>
+                          <div className="d-flex justify-content-start align-items-center user-name">
+                            <Avatar
+                              firstName={item.firstName}
+                              lastName={item.lastName}
+                            ></Avatar>
+                            <div className="d-flex flex-column">
+                              <a
+                                onClick={() => navigate(`/employee/${item.id}`)}
+                                className="text-heading text-truncate cursor-pointer"
+                              >
+                                <span className="fw-normal">
+                                  {item.firstName} {item.middleName}{" "}
+                                  {item.lastName}
+                                </span>
+                              </a>
+                            </div>
+                          </div>
+                        </td>
+                        <td className="text-start  d-none  d-sm-table-cell">
+                          {item.email ? (
+                            <span className="text-truncate">
+                              <i className="bx bxs-envelope text-primary me-2"></i>
+                              {item.email}
+                            </span>
+                          ) : (
+                            <span className="text-truncate text-italic">-</span>
+                          )}
+                        </td>
+                        <td className="text-start  d-none  d-sm-table-cell">
+                          <span className="text-truncate">
+                            <i className="bx bxs-phone-call text-primary me-2"></i>
+                            {item.phoneNumber}
+                          </span>
+                        </td>
+                        <td className=" d-none  d-sm-table-cell text-start">
+                          <span className="text-truncate">
+                            <i className="bx bxs-wrench text-success  me-2"></i>
+                            {item.jobRole || "Not Assign Yet"}
+                          </span>
+                        </td>
+
+                        <td className=" d-none  d-md-table-cell">
+                          {moment(item.joiningDate)?.format("DD-MMM-YYYY")}
+                        </td>
+                        <td>
+                          {showInactive ? (
+                            <span
+                              className="badge bg-label-danger"
+                              text-capitalized=""
+                            >
+                              Inactive
+                            </span>
+                          ) : (
+                            <span
+                              className="badge bg-label-success"
+                              text-capitalized=""
+                            >
+                              Active
+                            </span>
+                          )}
+                        </td>
+                        {Manage_Employee && (
+                          <td className="text-end">
+                            <div className="dropdown">
+                              <button
+                                className="btn btn-icon dropdown-toggle hide-arrow"
+                                data-bs-toggle="dropdown"
+                              >
+                                <i className="bx bx-dots-vertical-rounded bx-md"></i>
+                              </button>
+                              <div className="dropdown-menu dropdown-menu-end">
+                                {/* View always visible */}
+                                <button
                                   onClick={() =>
                                     navigate(`/employee/${item.id}`)
                                   }
-                                  className="text-heading text-truncate cursor-pointer"
+                                  className="dropdown-item py-1"
                                 >
-                                  <span className="fw-normal">
+                                  <i className="bx bx-detail bx-sm"></i> View
-                                    {item.firstName} {item.middleName}{" "}
+                                </button>
-                                    {item.lastName}
+
-                                  </span>
+                                {/* If ACTIVE employee */}
-                                </a>
+                                {item.isActive && (
+                                  <>
+                                    <button
+                                      className="dropdown-item py-1"
+                                      onClick={() =>
+                                        handleEmployeeModel(item.id)
+                                      }
+                                    >
+                                      <i className="bx bx-edit bx-sm"></i> Edit
+                                    </button>
+
+                                    {/* Suspend only when active */}
+                                    {item.isActive && (
+                                      <button
+                                        className="dropdown-item py-1"
+                                        onClick={() => handleOpenDelete(item)}
+                                      >
+                                        <i className="bx bx-task-x bx-sm"></i>{" "}
+                                        Suspend
+                                      </button>
+                                    )}
+
+                                    <button
+                                      className="dropdown-item py-1"
+                                      type="button"
+                                      data-bs-toggle="modal"
+                                      data-bs-target="#managerole-modal"
+                                      onClick={() =>
+                                        setEmpForManageRole(item.id)
+                                      }
+                                    >
+                                      <i className="bx bx-cog bx-sm"></i> Manage
+                                      Role
+                                    </button>
+                                  </>
+                                )}
+
+                                {/* If INACTIVE employee AND inactive toggle is ON */}
+                                {!item.isActive && showInactive && (
+                                  <button
+                                    className="dropdown-item py-1"
+                                    onClick={() => handleOpenDelete(item)}
+                                  >
+                                    <i className="bx bx-refresh bx-sm me-1"></i>{" "}
+                                    Re-activate
+                                  </button>
+                                )}
                               </div>
                             </div>
                           </td>
-                          <td className="text-start  d-none  d-sm-table-cell">
+                        )}
-                            {item.email ? (
+                      </tr>
-                              <span className="text-truncate">
+                    ))}
-                                <i className="bx bxs-envelope text-primary me-2"></i>
+                </tbody>
-                                {item.email}
+              </table>
-                              </span>
-                            ) : (
-                              <span className="text-truncate text-italic">
-                                -
-                              </span>
-                            )}
-                          </td>
-                          <td className="text-start  d-none  d-sm-table-cell">
-                            <span className="text-truncate">
-                              <i className="bx bxs-phone-call text-primary me-2"></i>
-                              {item.phoneNumber}
-                            </span>
-                          </td>
-                          <td className=" d-none  d-sm-table-cell text-start">
-                            <span className="text-truncate">
-                              <i className="bx bxs-wrench text-success  me-2"></i>
-                              {item.jobRole || "Not Assign Yet"}
-                            </span>
-                          </td>
 
-                          <td className=" d-none  d-md-table-cell">
+              {displayData.length > 0 && (
-                            {moment(item.joiningDate)?.format("DD-MMM-YYYY")}
+                <Pagination
-                          </td>
+                  currentPage={currentPage}
-                          <td>
+                  totalPages={totalPages}
-                            {showInactive ? (
+                  onPageChange={paginate}
-                              <span
+                />
-                                className="badge bg-label-danger"
+              )}
-                                text-capitalized=""
-                              >
-                                Inactive
-                              </span>
-                            ) : (
-                              <span
-                                className="badge bg-label-success"
-                                text-capitalized=""
-                              >
-                                Active
-                              </span>
-                            )}
-                          </td>
-                          {Manage_Employee && (
-                            <td className="text-end">
-                              <div className="dropdown">
-                                <button
-                                  className="btn btn-icon dropdown-toggle hide-arrow"
-                                  data-bs-toggle="dropdown"
-                                >
-                                  <i className="bx bx-dots-vertical-rounded bx-md"></i>
-                                </button>
-                                <div className="dropdown-menu dropdown-menu-end">
-                                  {/* View always visible */}
-                                  <button
-                                    onClick={() =>
-                                      navigate(`/employee/${item.id}`)
-                                    }
-                                    className="dropdown-item py-1"
-                                  >
-                                    <i className="bx bx-detail bx-sm"></i> View
-                                  </button>
-
-                                  {/* If ACTIVE employee */}
-                                  {item.isActive && (
-                                    <>
-                                      <button
-                                        className="dropdown-item py-1"
-                                        onClick={() =>
-                                          handleEmployeeModel(item.id)
-                                        }
-                                      >
-                                        <i className="bx bx-edit bx-sm"></i>{" "}
-                                        Edit
-                                      </button>
-
-                                      {/* Suspend only when active */}
-                                      {item.isActive && (
-                                        <button
-                                          className="dropdown-item py-1"
-                                          onClick={() => handleOpenDelete(item)}
-                                        >
-                                          <i className="bx bx-task-x bx-sm"></i>{" "}
-                                          Suspend
-                                        </button>
-                                      )}
-
-                                      <button
-                                        className="dropdown-item py-1"
-                                        type="button"
-                                        data-bs-toggle="modal"
-                                        data-bs-target="#managerole-modal"
-                                        onClick={() =>
-                                          setEmpForManageRole(item.id)
-                                        }
-                                      >
-                                        <i className="bx bx-cog bx-sm"></i>{" "}
-                                        Manage Role
-                                      </button>
-                                    </>
-                                  )}
-
-                                  {/* If INACTIVE employee AND inactive toggle is ON */}
-                                  {!item.isActive && showInactive && (
-                                    <button
-                                      className="dropdown-item py-1"
-                                      onClick={() => handleOpenDelete(item)}
-                                    >
-                                      <i className="bx bx-refresh bx-sm me-1"></i>{" "}
-                                      Re-activate
-                                    </button>
-                                  )}
-                                </div>
-                              </div>
-                            </td>
-                          )}
-                        </tr>
-                      ))}
-                  </tbody>
-                </table>
-
-                <div style={{ width: "1%" }}></div>
-
-                {/* Pagination */}
-                {!loading && displayData.length > ITEMS_PER_PAGE && (
-                  <nav aria-label="Page">
-                    <ul className="pagination pagination-sm justify-content-end py-1">
-                      <li
-                        className={`page-item ${
-                          currentPage === 1 ? "disabled" : ""
-                        }`}
-                      >
-                        <button
-                          className="page-link btn-xs"
-                          onClick={() => paginate(currentPage - 1)}
-                        >
-                          &laquo;
-                        </button>
-                      </li>
-
-                      {[...Array(totalPages)]?.map((_, index) => (
-                        <li
-                          key={index}
-                          className={`page-item ${
-                            currentPage === index + 1 ? "active" : ""
-                          }`}
-                        >
-                          <button
-                            className="page-link"
-                            onClick={() => paginate(index + 1)}
-                          >
-                            {index + 1}
-                          </button>
-                        </li>
-                      ))}
-
-                      <li
-                        className={`page-item ${
-                          currentPage === totalPages ? "disabled" : ""
-                        }`}
-                      >
-                        <button
-                          className="page-link"
-                          onClick={() => paginate(currentPage + 1)}
-                        >
-                          &raquo;
-                        </button>
-                      </li>
-                    </ul>
-                  </nav>
-                )}
-              </div>
             </div>
           </div>
         ) : (

src/pages/master/MasterPage.jsx

@@ -161,8 +161,8 @@ const MasterPage = () => {
           data={[{ label: "Home", link: "/dashboard" }, { label: "Masters" }]}
         />
 
-        <div className="row">
+
-          <div className="card">
+          <div className="card page-min-h">
             <div
               className="card-datatable table-responsive py-10 mx-5 "
               style={{ overflow: "hidden" }}
@@ -221,7 +221,6 @@ const MasterPage = () => {
                 handleModalData={handleModalData}
               />
             </div>
-          </div>
         </div>
       </div>
      </MasterContext.Provider>

src/pages/master/MasterTable.jsx

@@ -109,11 +109,11 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
             {currentItems.length > 0 ? (
               currentItems.map((item, index) => (
                 <tr key={index}>
-                  <td style={{ width: "20px" }}>
+                  <td style={{ width: "20px", }} className="py-5">
-                    <i className="bx bx-right-arrow-alt"></i>
+                    <div className="py-2 px-3"><i className="bx bx-right-arrow-alt"></i></div>
                   </td>
                   {updatedColumns.map((col) => (
-                    <td className="text-start mx-2" key={col.key}>
+                    <td className="text-start mx-2 p-3" key={col.key} style={{ padding: "12px 16px" }} >
                       {col.key === "description" ? (
                         item[col.key] !== undefined &&
                         item[col.key] !== null ? (

src/pages/project/ProjectDetails.jsx

@@ -15,12 +15,12 @@ import { useProjectDetails, useProjectName } from "../../hooks/useProjects";
 import { ComingSoonPage } from "../Misc/ComingSoonPage";
 import eventBus from "../../services/eventBus";
 import ProjectProgressChart from "../../components/Dashboard/ProjectProgressChart";
-import AttendanceOverview from "../../components/Dashboard/AttendanceChart";
+import AttendanceOverview from "../../components/Dashboard/AttendanceOverview";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import ProjectDocuments from "../../components/Project/ProjectDocuments";
 import ProjectSetting from "../../components/Project/ProjectSetting";
 import DirectoryPage from "../Directory/DirectoryPage";
-import { useProjectAccess } from "../../hooks/useProjectAccess"; 
+import { useProjectAccess } from "../../hooks/useProjectAccess";
 
 import "./ProjectDetails.css";
 import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
@@ -30,10 +30,13 @@ const ProjectDetails = () => {
   const dispatch = useDispatch();
 
   const { projectNames } = useProjectName();
-  const { projects_Details, loading: projectLoading, refetch } =
+  const {
-    useProjectDetails(projectId);
+    projects_Details,
+    loading: projectLoading,
+    refetch,
+  } = useProjectDetails(projectId);
 
-  const { canView, loading: permsLoading } = useProjectAccess(projectId);
+  // const { canView, loading: permsLoading } = useProjectAccess(projectId);
 
   useEffect(() => {
     if (!projectId && projectNames.length > 0) {
@@ -47,7 +50,10 @@ const ProjectDetails = () => {
 
   const handler = useCallback(
     (msg) => {
-      if (msg.keyword === "Update_Project" && projects_Details?.id === msg.response.id) {
+      if (
+        msg.keyword === "Update_Project" &&
+        projects_Details?.id === msg.response.id
+      ) {
         refetch();
       }
     },
@@ -64,7 +70,7 @@ const ProjectDetails = () => {
     localStorage.setItem("lastActiveProjectTab", pillKey);
   };
 
-  if (projectLoading || permsLoading || !projects_Details) {
+  if (projectLoading ||  !projects_Details) {
     return <Loader />;
   }
 
@@ -75,13 +81,10 @@ const ProjectDetails = () => {
           <div className="row">
             <div className="col-lg-4 col-md-5 mt-2">
               <AboutProject />
-              <ProjectOverview project={projectId} />
+              {/* <ProjectOverview project={projectId} /> */}
             </div>
-            <div className="col-lg-8 col-md-7 mt-5">
+            <div className="col-lg-8 col-md-7 mt-2">
-              <ProjectProgressChart ShowAllProject="false" DefaultRange="1M" />
+              <AttendanceOverview />
-              <div className="mt-5">
-                <AttendanceOverview />
-              </div>
             </div>
           </div>
         );

src/pages/project/ProjectPage.jsx

@@ -1,6 +1,10 @@
 import React, { createContext, useContext, useEffect, useState } from "react";
 import Breadcrumb from "../../components/common/Breadcrumb";
-import { ITEMS_PER_PAGE, MANAGE_PROJECT, PROJECT_STATUS } from "../../utils/constants";
+import {
+  ITEMS_PER_PAGE,
+  MANAGE_PROJECT,
+  PROJECT_STATUS,
+} from "../../utils/constants";
 import ProjectListView from "../../components/Project/ProjectListView";
 import GlobalModel from "../../components/common/GlobalModel";
 import ManageProjectInfo from "../../components/Project/ManageProjectInfo";
@@ -95,9 +99,18 @@ const ProjectPage = () => {
     }
   }, [data, isLoading, selectedStatuses]);
 
-
+  if (isLoading)
-  if(isLoading) return <div className="page-min-h"><Loader/></div>
+    return (
-   if(isError) return <div className="page-min-h d-flex justify-content-center align-items-center"><p>{error.message}</p></div>
+      <div className="page-min-h">
+        <Loader />
+      </div>
+    );
+  if (isError)
+    return (
+      <div className="page-min-h d-flex justify-content-center align-items-center">
+        <p>{error.message}</p>
+      </div>
+    );
   return (
     <ProjectContext.Provider value={contextDispatcher}>
       <div className="container-fluid">
@@ -181,7 +194,8 @@ const ProjectPage = () => {
               </div>
 
               <div>
-              {HasManageProject && (  <button
+                {/* {HasManageProject && (  */}
+                <button
                   className="btn btn-sm btn-primary"
                   type="button"
                   onClick={() =>
@@ -192,7 +206,8 @@ const ProjectPage = () => {
                   <span className="d-none d-md-inline-block">
                     Add New Project
                   </span>
-                </button>)}
+                </button>
+                {/* )} */}
               </div>
             </div>
           </div>
@@ -209,7 +224,11 @@ const ProjectPage = () => {
             isLoading={isLoading}
           />
         ) : (
-          <ProjectCardView currentItems={currentItems} setCurrentPage={setCurrentPage} totalPages={totalPages} />
+          <ProjectCardView
+            currentItems={currentItems}
+            setCurrentPage={setCurrentPage}
+            totalPages={totalPages}
+          />
         )}
 
         {/* ------------------ */}

src/repositories/AuthRepository.jsx

@@ -2,12 +2,12 @@ import { api } from "../utils/axiosClient";
 
 const AuthRepository = {
   //  Public routes (no auth token required)
-  login: (data) => api.postPublic("/api/auth/login", data),
+  login: (data) => api.postPublic("/api/auth/login/v1", data),
   refreshToken: (data) => api.postPublic("/api/auth/refresh-token", data),
   forgotPassword: (data) => api.postPublic("/api/auth/forgot-password", data),
   resetPassword: (data) => api.postPublic("/api/auth/reset-password", data),
   sendOTP: (data) => api.postPublic("/api/auth/send-otp", data),
-  verifyOTP: (data) => api.postPublic("/api/auth/login-otp", data),
+  verifyOTP: (data) => api.postPublic("/api/auth/login-otp/v1", data),
   register: (data) => api.postPublic("/api/auth/register", data),
   sendMail: (data) => api.postPublic("/api/auth/sendmail", data),
 

src/repositories/GlobalRepository.jsx

@@ -41,7 +41,56 @@ const GlobalRepository = {
   return api.get(url);
 },
 
- getAttendanceOverview:(projectId,days)=>api.get(`/api/dashboard/attendance-overview/${projectId}?days=${days}`)
+ getAttendanceOverview:(projectId,days)=>api.get(`/api/dashboard/attendance-overview/${projectId}?days=${days}`),
+
+
+   getExpenseData: (projectId, startDate, endDate) => {
+    let url =  `api/Dashboard/expense/type`
+      
+  const queryParams = [];
+
+    if (projectId) {
+      queryParams.push(`projectId=${projectId}`);
+    }
+
+    if (startDate) {
+      queryParams.push(`startDate=${startDate}`);
+    }
+     if (endDate) {
+      queryParams.push(`endDate=${endDate}`);
+    }
+
+    if (queryParams.length > 0) {
+      url += `?${queryParams.join("&")}`;
+    }
+
+    return api.get(url  );
+  },
+
+  getExpenseStatus:(projectId)=>api.get(`/api/Dashboard/expense/pendings${projectId ? `?projectId=${projectId}`:""}`),
+
+   getExpenseDataByProject: (projectId, categoryId, months) => {
+    let url = `api/Dashboard/expense/monthly`
+
+    const queryParams = [];
+
+    if (projectId) {
+      queryParams.push(`projectId=${projectId}`);
+    }
+
+    if (categoryId) {
+      queryParams.push(`categoryId=${categoryId}`);
+    }
+    if (months) {
+      queryParams.push(`months=${months}`);
+    }
+
+    if (queryParams.length > 0) {
+      url += `?${queryParams.join("&")}`;
+    }
+
+    return api.get(url);
+  },
 
 };
 

src/router/AppRoutes.jsx

@@ -94,7 +94,7 @@ const router = createBrowserRouter(
             { path: "/activities/task", element: <TaskPlannng /> },
             { path: "/activities/reports", element: <Reports /> },
             { path: "/gallary", element: <ComingSoonPage /> },
-            { path: "/expenses", element: <ExpensePage /> },
+            { path: "/expenses/:status?/:project?", element: <ExpensePage /> },
             { path: "/masters", element: <MasterPage /> },
             { path: "/tenants", element: <TenantPage /> },
             { path: "/tenants/new-tenant", element: <CreateTenant /> },

src/router/ProtectedRoute.jsx

@@ -59,7 +59,7 @@ const attemptTokenRefresh = async (storedRefreshToken) => {
 
     return true;
   } catch (error) {
-    console.error("Token refresh failed:", error);
+    removeSession()
     return false;
   }
 };

src/services/signalRService.js

@@ -22,7 +22,7 @@ export function startSignalR(loggedUser) {
       accessTokenFactory: () => jwtToken,
       transport: signalR.HttpTransportType.LongPolling,
       withCredentials: false,
-    })
+    })                      
     .withAutomaticReconnect()
     .build();
   const todayDate = new Date();
@@ -32,100 +32,104 @@ export function startSignalR(loggedUser) {
     .toISOString()
     .split("T")[0];
   connection.on("NotificationEventHandler", (data) => {
-    if (data.loggedInUserId != loggedUser?.employeeInfo.id) {
+  const { loggedInUserId, keyword, response, employeeList, numberOfImages } = data;
-      // console.log("Notification received:", data);
+  const loggedInId = loggedUser?.employeeInfo?.id;
-      // if action taken on attendance module
-      if (data.keyword == "Attendance") {
-        const checkIn = data.response.checkInTime.substring(0, 10);
-        if (today === checkIn) {
-          eventBus.emit("attendance", data);
-        }
-        var onlyDate = Number(checkIn.substring(8, 10));
 
-        var afterTwoDay =
+  if (loggedInUserId === loggedInId) return;
-          checkIn.substring(0, 8) + (onlyDate + 2).toString().padStart(2, "0");
-        if (
-          afterTwoDay <= today &&
-          (data.response.activity == 4 || data.response.activity == 5)
-        ) {
-          eventBus.emit("regularization", data);
-        }
-        eventBus.emit("attendance_log", data);
-      }
-         if(data.keyword == "Expanse"){
-        queryClient.invalidateQueries({queryKey:["Expenses"]})
-      }
-      // if create or update project
-      if (
-        data.keyword == "Create_Project" ||
-        data.keyword == "Update_Project"
-      ) {
-        // clearCacheKey("projectslist");
-        queryClient.invalidateQueries(['projectslist']);  
-        eventBus.emit("project", data);
-      }
 
-      // if assign or deassign employee to any project
+  // ---- Handlers for invalidate or remove ----
-      if (data.keyword == "Assign_Project") {
+  const queryInvalidators = {
-        if (
+    Expanse: () => {
-          data.employeeList.some((item) => item === loggedUser?.employeeInfo.id)
+      queryClient.invalidateQueries({ queryKey: ["Expenses"] }),
-        ) {
+      queryClient.invalidateQueries({ queryKey: ["Expense"] })
-          try {
+    },
-            cacheData("hasReceived", false);
+    Create_Project: () => queryClient.invalidateQueries(["projectslist"]),
-            eventBus.emit("assign_project_one", data);
+    Update_Project: () => queryClient.invalidateQueries(["projectslist"]),
-          } catch (e) {
+    Infra: () => queryClient.removeQueries({ queryKey: ["ProjectInfra"] }),
-            // console.error("Error in cacheData:", e);
+    Task_Report: () => queryClient.invalidateQueries({ queryKey: ["Infra"] }),
-          }
+    WorkItem: () => queryClient.invalidateQueries({ queryKey: ["WorkItems"] }),
-        }
+    Directory_Notes:()=>{
-        eventBus.emit("assign_project_all", data);
+      queryClient.invalidateQueries({queryKey:["directoryNotes"]})
-      }
+      queryClient.invalidateQueries({queryKey:["Notes"]})
-      // if created or updated infra
+    },
-      if (data.keyword == "Infra") {
+    Directory_Buckets:()=>{
-        queryClient.removeQueries({queryKey:["ProjectInfra"]})
+      queryClient.invalidateQueries({queryKey:["bucketList"]})
-        // eventBus.emit("infra", data);
+    },
-      }
+    Directory:()=>{
-      if (data.keyword == "Task_Report") {
+      queryClient.invalidateQueries({queryKey:["contacts"]})
-        queryClient.removeQueries({queryKey:["Infra"]})
+      queryClient.invalidateQueries({queryKey:["Contact"]})
-        // eventBus.emit("infra", data);
+      queryClient.invalidateQueries({queryKey:["ContactProfile"]})
-      }
-
-      if ( data.keyword == "WorkItem" )
-      {
-        queryClient.removeQueries({queryKey:["WorkItems"]})
-      }
-
-      // if created or updated Employee
-      if (data.keyword == "Employee") {
-        // clearCacheKey("employeeListByProject");
-        // clearCacheKey("allEmployeeList");
-        // clearCacheKey("allInactiveEmployeeList");
-        // clearCacheKey("employeeProfile");
-        clearCacheKey("Attendance");
-        clearCacheKey("regularizedList")
-        clearCacheKey("AttendanceLogs")
-
-        // ---we can do also----
-        // queryClient.removeQueries(['allEmployee', true]);
-        //  but best practies is refetch
-          queryClient.invalidateQueries(['allEmployee', true]);  
-          queryClient.invalidateQueries(['allEmployee', false]); 
-          queryClient.invalidateQueries(['employeeProfile', data.response?.employeeId]);
-          queryClient.invalidateQueries(['employeeListByProject']); // optional if scope
-          eventBus.emit("employee", data);
-      }
-
-      if (data.keyword == "Task_Report") {
-        if(data.numberOfImages > 0){
-        eventBus.emit("image_gallery", data);
-        }
-      }
-      if (data.keyword == "Task_Comment") {
-        if(data.numberOfImages > 0){
-        eventBus.emit("image_gallery", data);
-        }
-      }
     }
-  });
+
+  };
+
+  // ---- Keyword based event emitters ----
+  const emitters = {
+    employee: () => eventBus.emit("employee", data),
+    project: () => eventBus.emit("project", data),
+    infra: () => eventBus.emit("infra", data),
+    assign_project_all: () => eventBus.emit("assign_project_all", data),
+    image_gallery: () => eventBus.emit("image_gallery", data),
+  };
+
+  // ---- Handle Attendance ----
+  if (keyword === "Attendance") {
+    const checkIn = response.checkInTime.substring(0, 10);
+    if (today === checkIn) eventBus.emit("attendance", data);
+
+    const onlyDate = Number(checkIn.substring(8, 10));
+    const afterTwoDay =
+      checkIn.substring(0, 8) + (onlyDate + 2).toString().padStart(2, "0");
+
+    if (
+      afterTwoDay <= today &&
+      (response.activity === 4 || response.activity === 5)
+    ) {
+      eventBus.emit("regularization", data);
+    }
+    eventBus.emit("attendance_log", data);
+  }
+
+  // ---- Invalidate/Remove cache by keywords ----
+  if (queryInvalidators[keyword]) {
+    queryInvalidators[keyword]();
+  }
+
+  // ---- Project creation/update ----
+  if (keyword === "Create_Project" || keyword === "Update_Project") {
+    emitters.project();
+  }
+
+  // ---- Assign/deassign project ----
+  if (keyword === "Assign_Project") {
+    if (employeeList?.includes(loggedInId)) {
+      try {
+        cacheData("hasReceived", false);
+        eventBus.emit("assign_project_one", data);
+      } catch {}
+    }
+    emitters.assign_project_all();
+  }
+
+  // ---- Employee update ----
+  if (keyword === "Employee") {
+    clearCacheKey("Attendance");
+    clearCacheKey("regularizedList");
+    clearCacheKey("AttendanceLogs");
+
+    queryClient.invalidateQueries(["allEmployee", true]);
+    queryClient.invalidateQueries(["allEmployee", false]);
+    queryClient.invalidateQueries(["employeeProfile", response?.employeeId]);
+    queryClient.invalidateQueries(["employeeListByProject"]);
+
+    emitters.employee();
+  }
+
+  // ---- Image related events ----
+  if (["Task_Report", "Task_Comment"].includes(keyword) && numberOfImages > 0) {
+    emitters.image_gallery();
+  }
+});
 
   connection
     .start();

src/slices/localVariablesSlice.jsx

@@ -19,6 +19,10 @@ const localVariablesSlice = createSlice({
       startStep: 1,
       flowType: "default",
     },
+    ProjectModal:{
+       isOpen: false,
+       data: null,
+    },
 
     AuthModal: {
       isOpen: false,
@@ -70,6 +74,17 @@ const localVariablesSlice = createSlice({
     closeAuthModal: (state, action) => {
       state.AuthModal.isOpen = false;
     },
+
+
+    // project modal 
+    openProjectModal: (state, action) => {
+      state.ProjectModal.isOpen = true;
+      state.ProjectModal.data = action.payload || null;
+    },
+    closeProjectModal: (state) => {
+      state.ProjectModal.isOpen = false;
+      state.ProjectModal.data = null;
+    },
   },
 });
 
@@ -84,5 +99,6 @@ export const {
   toggleOrgModal,
   openAuthModal,
   closeAuthModal,
+  openProjectModal, closeProjectModal
 } = localVariablesSlice.actions;
 export default localVariablesSlice.reducer;

src/utils/appUtils.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { format, parseISO } from "date-fns";
+import { parseISO, formatISO } from "date-fns";
 export const formatFileSize = (bytes) => {
   if (bytes < 1024) return bytes + " B";
   else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
@@ -69,15 +69,41 @@ export const normalizeAllowedContentTypes = (allowedContentType) => {
     return allowedContentType.split(",");
   return [];
 };
-export function localToUtc(localDateString) {
+export function localToUtc(dateString) {
-  if (!localDateString || typeof localDateString !== "string") return null;
+  if (!dateString || typeof dateString !== "string") return null;
 
-  const [year, month, day] = localDateString.trim().split("-");
+  const parts = dateString.trim().split("-");
+  if (parts.length !== 3) return null;
 
-  if (!year || !month || !day) return null;
+  let day, month, year;
 
+  if (parts[0].length === 4) {
+    // Format: yyyy-mm-dd
+    [year, month, day] = parts;
+  } else {
+    // Format: dd-mm-yyyy
+    [day, month, year] = parts;
+  }
 
-  const date = new Date(Number(year), Number(month) - 1, Number(day), 0, 0, 0);
+  if (!day || !month || !year) return null;
 
+  const date = new Date(
+    Date.UTC(Number(year), Number(month) - 1, Number(day), 0, 0, 0)
+  );
   return isNaN(date.getTime()) ? null : date.toISOString();
 }
+
+export const formatCurrency = (amount, currency = "INR", locale = "en-US") => {
+  return new Intl.NumberFormat(locale, {
+    style: "currency",
+    notation: "compact",
+    compactDisplay: "short",
+    currency: currency,
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+  }).format(amount);
+};
+
+export const countDigit = (num) => {
+  return Math.abs(num).toString().length;
+};

src/utils/axiosClient.jsx

@@ -4,6 +4,7 @@ import axiosRetry from "axios-retry";
 import showToast from "../services/toastService";
 import { startSignalR, stopSignalR } from "../services/signalRService";
 import { BASE_URL } from "./constants";
+import { removeSession } from "./authUtils";
 const base_Url = BASE_URL;
 
 export const axiosClient = axios.create({
@@ -77,8 +78,10 @@ axiosClient.interceptors.response.use(
           if (
             !refreshToken ||
             error.response.data?.errors === "Invalid or expired refresh token."
+           
           ) {
             redirectToLogin();
+             removeSession()
             return Promise.reject(error);
           }
 
@@ -107,6 +110,7 @@ axiosClient.interceptors.response.use(
             originalRequest.headers["Authorization"] = `Bearer ${token}`;
             return axiosClient(originalRequest);
           } catch (refreshError) {
+             removeSession()
             redirectToLogin();
             return Promise.reject(refreshError);
           }

src/utils/constants.jsx

@@ -1,3 +1,8 @@
+export const BASE_URL = process.env.VITE_BASE_URL;
+
+// export const BASE_URL = "https://api.marcoaiot.com";
+
+
 export const THRESH_HOLD = 48; //  hours
 export const DURATION_TIME = 10; // minutes
 export const ITEMS_PER_PAGE = 20;
@@ -140,8 +145,25 @@ export const PROJECT_STATUS = [
     label: "Completed",
   },
 ];
+
+
+export const EXPENSE_STATUS = {
+  daft:"297e0d8f-f668-41b5-bfea-e03b354251c8",
+  review_pending:"6537018f-f4e9-4cb3-a210-6c3b2da999d7",
+  payment_pending:"f18c5cfd-7815-4341-8da2-2c2d65778e27",
+  approve_pending:"4068007f-c92f-4f37-a907-bc15fe57d4d8",
+
+}
+
+export const UUID_REGEX =
+  /^\/employee\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
+
+export const ALLOW_PROJECTSTATUS_ID = [
+  "603e994b-a27f-4e5d-a251-f3d69b0498ba",
+  "cdad86aa-8a56-4ff4-b633-9c629057dfef",
+  "b74da4c2-d07e-46f2-9919-e75e49b12731",
+];
+
 export const DEFAULT_EMPTY_STATUS_ID = "00000000-0000-0000-0000-000000000000";
 
-export const BASE_URL = process.env.VITE_BASE_URL;
 
-// export const BASE_URL = "https://api.marcoaiot.com";

src/utils/dateUtils.jsx

@@ -1,5 +1,6 @@
 import moment from "moment";
 import { ActiveTenant } from "./constants";
+import {format} from 'date-fns'
 
 export const getDateDifferenceInDays = (startDate, endDate) => {
   if (!startDate || !endDate) {
@@ -93,6 +94,15 @@ export  const getCompletionPercentage = (completedWork, plannedWork)=> {
   return clamped.toFixed(2); 
 }
 
+export const formatDate_DayMonth = (monthName, year) => {
+  if (!monthName || !year) return "";
+  try {
+    const shortMonth = monthName.substring(0, 3); 
+    return `${shortMonth} ${year}`;
+  } catch {
+    return "";
+  }
+};
 export const getTenantStatus =(statusId)=>{
   return ActiveTenant === statusId ? " bg-label-success":"bg-label-secondary"
 }