index.html

@@ -27,6 +27,7 @@
   <link rel="stylesheet" href="/assets/vendor/css/theme-default.css" class="template-customizer-theme-css" />
   <link rel="stylesheet" href="/assets/css/core-extend.css" />
   <link rel="stylesheet" href="/assets/css/default.css" />
+  <link rel="stylesheet" href="/assets/css/skeleton.css" />
 
   <link rel="stylesheet" href="/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.css" />
 

public/assets/css/skeleton.css

@@ -0,0 +1,32 @@
+/* skeleton.css */
+.skeleton {
+  background-color: #e2e8f0;  /* Tailwind's gray-300 */
+  border-radius: 0.25rem;     /* Tailwind's rounded */
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton::after {
+  content: '';
+  display: block;
+  position: absolute;
+  top: 0; left: -150px;
+  height: 100%;
+  width: 150px;
+  background: linear-gradient(
+    90deg,
+    transparent,
+    rgba(255, 255, 255, 0.4),
+    transparent
+  );
+  animation: pulse 1.5s infinite;
+}
+
+@keyframes pulse {
+  0% {
+    left: -150px;
+  }
+  100% {
+    left: 100%;
+  }
+}

public/assets/vendor/css/core.css

@@ -20473,7 +20473,10 @@ li:not(:first-child) .dropdown-item,
   word-wrap: break-word !important;
   word-break: break-word !important;
 }
-
+/* text-size */
+.text-tiny{
+  font-size: 13px;
+}
 /* rtl:end:remove */
 .text-primary {
   --bs-text-opacity: 1;

src/Context/FabContext.jsx

@@ -4,9 +4,30 @@ const FabContext = createContext();
 
 export const FabProvider = ({ children }) => {
   const [actions, setActions] = useState([]);
+  const [showTrigger, setShowTrigger] = useState(true);
+    const [isOffcanvasOpen, setIsOffcanvasOpen] = useState(false); 
+    const [offcanvas, setOffcanvas] = useState({
+    isOpen: false,
+    title: "",
+    content: null,
+  });
+
+  const openOffcanvas = (title, content) => {
+    setOffcanvas({ isOpen: true, title, content });
+    setTimeout(() => {
+      const offcanvasElement = document.getElementById("globalOffcanvas");
+      if (offcanvasElement) {
+        const bsOffcanvas = new window.bootstrap.Offcanvas(offcanvasElement);
+        bsOffcanvas.show();
+      }
+    }, 100); 
+  };
+const setOffcanvasContent = (title, content) => {
+  setOffcanvas(prev => ({ ...prev, title, content }));
+};
 
   return (
-    <FabContext.Provider value={{ actions, setActions }}>
+    <FabContext.Provider value={{ actions, setActions, offcanvas, openOffcanvas, showTrigger, setShowTrigger,isOffcanvasOpen, setIsOffcanvasOpen, setOffcanvasContent,  }}>
       {children}
     </FabContext.Provider>
   );

src/components/Activities/Attendance.jsx

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

src/components/Activities/AttendcesLogs.jsx

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

src/components/Activities/CheckCheckOutForm.jsx

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

src/components/Activities/Regularization.jsx

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

src/components/Dashboard/Dashboard.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React,{useEffect} from "react";
 import { useSelector } from "react-redux";
 import {
     useDashboardProjectsCardData,
@@ -14,16 +14,25 @@ import ProjectCompletionChart from "./ProjectCompletionChart";
 import ProjectProgressChart from "./ProjectProgressChart";
 import ProjectOverview from "../Project/ProjectOverview";
 import AttendanceOverview from "./AttendanceChart";
+import { useFab } from "../../Context/FabContext";
 
 const Dashboard = () => {
     const { projectsCardData } = useDashboardProjectsCardData();
     const { teamsCardData } = useDashboardTeamsCardData();
     const { tasksCardData } = useDashboardTasksCardData();
+    const {setShowTrigger} = useFab()
 
     // Get the selected project ID from Redux store
     const projectId = useSelector((store) => store.localVariables.projectId);
     const isAllProjectsSelected = projectId === null;
 
+
+     useEffect(() => {
+    setShowTrigger(false);          
+    console.log("OffCanvas")
+    return () => setShowTrigger(true);
+  }, [setShowTrigger])
+
     return (
         <div className="container-fluid mt-5">
             <div className="row gy-4">

src/components/Expenses/ExpenseFilterPanel.jsx

@@ -0,0 +1,197 @@
+import React, { useEffect, useState,useMemo } from "react";
+import { FormProvider, useForm, Controller } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { defaultFilter, SearchSchema } from "./ExpenseSchema";
+
+import DateRangePicker, { DateRangePicker1 } from "../common/DateRangePicker";
+import SelectMultiple from "../common/SelectMultiple";
+
+import { useProjectName } from "../../hooks/useProjects";
+import { useExpenseStatus } from "../../hooks/masterHook/useMaster";
+import { useEmployeesAllOrByProjectId } from "../../hooks/useEmployees";
+import { useSelector } from "react-redux";
+import moment from "moment";
+import { useExpenseFilter } from "../../hooks/useExpense";
+import { ExpenseFilterSkeleton } from "./ExpenseSkeleton";
+
+
+
+const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
+  const selectedProjectId = useSelector((store) => store.localVariables.projectId);
+  const { data, isLoading,isError,error,isFetching , isFetched} = useExpenseFilter();
+
+  const groupByList = useMemo(() => [
+    { id: "transactionDate", name: "Transaction Date" },
+    { id: "status", name: "Status" },
+    { id: "paidBy", name: "Paid By" },
+    { id: "project", name: "Project" },
+    { id: "paymentMode", name: "Payment Mode" },
+    { id: "expensesType", name: "Expense Type" },
+    {id: "createdAt",name:"Submitted"}
+  ], []);
+
+  const [selectedGroup, setSelectedGroup] = useState(groupByList[0]);
+  const [resetKey, setResetKey] = useState(0);
+
+  const methods = useForm({
+    resolver: zodResolver(SearchSchema),
+    defaultValues: defaultFilter,
+  });
+
+  const { control, register, handleSubmit, reset, watch } = methods;
+  const isTransactionDate = watch("isTransactionDate");
+
+  const closePanel = () => {
+    document.querySelector(".offcanvas.show .btn-close")?.click();
+  };
+
+  const handleGroupChange = (e) => {
+    const group = groupByList.find((g) => g.id === e.target.value);
+    if (group) setSelectedGroup(group);
+  };
+
+  const onSubmit = (formData) => {
+    onApply({
+      ...formData,
+      startDate: moment.utc(formData.startDate, "DD-MM-YYYY").toISOString(),
+      endDate: moment.utc(formData.endDate, "DD-MM-YYYY").toISOString(),
+    });
+    handleGroupBy(selectedGroup.id);
+    closePanel();
+  };
+
+  const onClear = () => {
+    reset(defaultFilter);
+    setResetKey((prev) => prev + 1);
+    setSelectedGroup(groupByList[0]);
+    onApply(defaultFilter);
+    handleGroupBy(groupByList[0].id);
+    closePanel();
+  };
+
+  if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
+  if(isError && isFetched) return <div>Something went wrong Here- {error.message} </div>
+  return (
+    <>
+
+      <FormProvider {...methods}>
+        <form onSubmit={handleSubmit(onSubmit)} className="p-2 text-start">
+          <div className="mb-3 w-100">
+            <div className="d-flex align-items-center mb-2">
+              <label className="form-label me-2">Choose Date:</label>
+              <div className="form-check form-switch m-0">
+                <input
+                  className="form-check-input"
+                  type="checkbox"
+                  id="switchOption1"
+                  {...register("isTransactionDate")}
+                />
+              </div>
+              <label className="form-label mb-0 ms-2">
+                {isTransactionDate ? "Submitted": "Transaction" }
+              </label>
+            </div>
+
+            <DateRangePicker1
+              placeholder="DD-MM-YYYY To DD-MM-YYYY"
+              startField="startDate"
+              endField="endDate"
+              resetSignal={resetKey}
+            />
+          </div>
+
+          <div className="row g-2">
+            <SelectMultiple
+              name="projectIds"
+              label="Projects :"
+              options={data.projects}
+              labelKey="name"
+              valueKey="id"
+            />
+            <SelectMultiple
+              name="createdByIds"
+              label="Submitted By :"
+              options={data.createdBy}
+              labelKey={(item) => item.name}
+              valueKey="id"
+            />
+            <SelectMultiple
+              name="paidById"
+              label="Paid By :"
+              options={data.paidBy}
+              labelKey={(item) => item.name}
+              valueKey="id"
+            />
+
+            <div className="mb-3">
+              <label className="form-label">Status :</label>
+              <div className="row flex-wrap">
+                {data?.status
+                  ?.slice()
+                  .sort((a, b) => a.name.localeCompare(b.name))
+                  .map((status) => (
+                    <div className="col-6" key={status.id}>
+                      <Controller
+                        control={control}
+                        name="statusIds"
+                        render={({ field: { value = [], onChange } }) => (
+                          <div className="d-flex align-items-center me-3 mb-2">
+                            <input
+                              type="checkbox"
+                              className="form-check-input"
+                              value={status.id}
+                              checked={value.includes(status.id)}
+                              onChange={(e) => {
+                                const checked = e.target.checked;
+                                onChange(
+                                  checked
+                                    ? [...value, status.id]
+                                    : value.filter((v) => v !== status.id)
+                                );
+                              }}
+                            />
+                            <label className="ms-2 mb-0">{status.name}</label>
+                          </div>
+                        )}
+                      />
+                    </div>
+                  ))}
+              </div>
+            </div>
+          </div>
+            <div className="mb-2 text-start ">
+        <label htmlFor="groupBySelect" className="form-label">Group By :</label>
+        <select
+          id="groupBySelect"
+          className="form-select form-select-sm"
+          value={selectedGroup?.id || ""}
+          onChange={handleGroupChange}
+        >
+          {groupByList.map((group) => (
+            <option key={group.id} value={group.id}>
+              {group.name}
+            </option>
+          ))}
+        </select>
+      </div>
+
+          <div className="d-flex justify-content-end py-3 gap-2">
+            <button
+              type="button"
+              className="btn btn-secondary btn-xs"
+              onClick={onClear}
+            >
+              Clear
+            </button>
+            <button type="submit" className="btn btn-primary btn-xs">
+              Apply
+            </button>
+          </div>
+        </form>
+      </FormProvider>
+      
+    </>
+  );
+};
+
+export default ExpenseFilterPanel;

src/components/Expenses/ExpenseList.jsx

@@ -0,0 +1,321 @@
+import React, { useState } from "react";
+import { useDeleteExpense, useExpenseList } from "../../hooks/useExpense";
+import Avatar from "../common/Avatar";
+import { useExpenseContext } from "../../pages/Expense/ExpensePage";
+import { formatDate, formatUTCToLocalTime } from "../../utils/dateUtils";
+import Pagination from "../common/Pagination";
+import { APPROVE_EXPENSE, EXPENSE_DRAFT, EXPENSE_REJECTEDBY } from "../../utils/constants";
+import { getColorNameFromHex, useDebounce } from "../../utils/appUtils";
+import { ExpenseTableSkeleton } from "./ExpenseSkeleton";
+import ConfirmModal from "../common/ConfirmModal";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import { useSelector } from "react-redux";
+
+const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => {
+  const [deletingId, setDeletingId] = useState(null);
+  const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const { setViewExpense, setManageExpenseModal } = useExpenseContext();
+  const IsExpenseEditable = useHasUserPermission();
+  const IsExpesneApprpve = useHasUserPermission(APPROVE_EXPENSE);
+  const [currentPage, setCurrentPage] = useState(1);
+  const pageSize = 20;
+  const debouncedSearch = useDebounce(searchText, 500);
+
+  const { mutate: DeleteExpense, isPending } = useDeleteExpense();
+  const { data, isLoading, isError, isInitialLoading, error } = useExpenseList(
+    pageSize,
+    currentPage,
+    filters,
+    debouncedSearch
+  );
+
+  const SelfId = useSelector(
+    (store) => store?.globalVariables?.loginUser?.employeeInfo?.id
+  );
+
+  const handleDelete = (id) => {
+    setDeletingId(id);
+    DeleteExpense(
+      { id },
+      {
+        onSettled: () => {
+          setDeletingId(null);
+          setIsDeleteModalOpen(false);
+        },
+      }
+    );
+  };
+
+  const paginate = (page) => {
+    if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+      setCurrentPage(page);
+    }
+  };
+
+  const groupByField = (items, field) => {
+    return items.reduce((acc, item) => {
+      let key;
+      switch (field) {
+        case "transactionDate":
+          key = item.transactionDate?.split("T")[0];
+          break;
+        case "status":
+          key = item.status?.displayName || "Unknown";
+          break;
+        case "paidBy":
+          key = `${item.paidBy?.firstName ?? ""} ${
+            item.paidBy?.lastName ?? ""
+          }`.trim();
+          break;
+        case "project":
+          key = item.project?.name || "Unknown Project";
+          break;
+        case "paymentMode":
+          key = item.paymentMode?.name || "Unknown Mode";
+          break;
+        case "expensesType":
+          key = item.expensesType?.name || "Unknown Type";
+          break;
+         case "createdAt":
+          key = item.createdAt?.split("T")[0] || "Unknown Type";
+          break;
+        default:
+          key = "Others";
+      }
+      if (!acc[key]) acc[key] = [];
+      acc[key].push(item);
+      return acc;
+    }, {});
+  };
+
+  const expenseColumns = [
+    {
+      key: "expensesType",
+      label: "Expense Type",
+      getValue: (e) => e.expensesType?.name || "N/A",
+      align: "text-start",
+    },
+    {
+      key: "paymentMode",
+      label: "Payment Mode",
+      getValue: (e) => e.paymentMode?.name || "N/A",
+      align: "text-start",
+    },
+    {
+      key: "paidBy",
+      label: "Paid By",
+      align: "text-start",
+      getValue: (e) =>
+        `${e.paidBy?.firstName ?? ""} ${e.paidBy?.lastName ?? ""}`.trim() ||
+        "N/A",
+      customRender: (e) => (
+        <div className="d-flex align-items-center">
+          <Avatar
+            size="xs"
+            classAvatar="m-0"
+            firstName={e.paidBy?.firstName}
+            lastName={e.paidBy?.lastName}
+          />
+          <span>
+            {`${e.paidBy?.firstName ?? ""} ${
+              e.paidBy?.lastName ?? ""
+            }`.trim() || "N/A"}
+          </span>
+        </div>
+      ),
+    },
+    {
+      key: "submitted",
+      label: "Submitted",
+      getValue: (e) => formatUTCToLocalTime(e?.createdAt),
+      isAlwaysVisible: true,
+    },
+    {
+      key: "amount",
+      label: "Amount",
+      getValue: (e) => (
+        <>
+          <i className="bx bx-rupee b-xs"></i> {e?.amount}
+        </>
+      ),
+      isAlwaysVisible: true,
+      align: "text-end",
+    },
+    {
+      key: "status",
+      label: "Status",
+      align: "text-center",
+      getValue: (e) => (
+        <span
+          className={`badge bg-label-${
+            getColorNameFromHex(e?.status?.color) || "secondary"
+          }`}
+        >
+          {e.status?.name || "Unknown"}
+        </span>
+      ),
+    },
+  ];
+
+  if (isInitialLoading) return <ExpenseTableSkeleton />;
+  if (isError) return <div>{error}</div>;
+
+  const grouped = groupBy
+    ? groupByField(data?.data ?? [], groupBy)
+    : { All: data?.data ?? [] };
+  const IsGroupedByDate = ["transactionDate", "createdAt"].includes(groupBy);
+const canEditExpense = (expense) => {
+  return (
+    (expense.status.id === EXPENSE_DRAFT ||
+      EXPENSE_REJECTEDBY.includes(expense.status.id)) &&
+    expense.createdBy?.id === SelfId
+  );
+};
+
+const canDetetExpense = (expense)=>{
+  return (expense.status.id === EXPENSE_DRAFT && expense.createdBy.id === SelfId )
+}
+
+                              
+  return (
+    <>
+      {IsDeleteModalOpen && (
+        <div
+          className={`modal fade show`}
+          tabIndex="-1"
+          role="dialog"
+          style={{
+            display: "block",
+            backgroundColor: "rgba(0,0,0,0.5)",
+          }}
+          aria-hidden="false"
+        >
+          <ConfirmModal
+            type="delete"
+            header="Delete Expense"
+            message="Are you sure you want delete?"
+            onSubmit={handleDelete}
+            onClose={() => setIsDeleteModalOpen(false)}
+            loading={isPending}
+            paramData={deletingId}
+          />
+        </div>
+      )}
+
+      <div className="card px-0 px-sm-4">
+        <div
+          className="card-datatable table-responsive "
+          id="horizontal-example"
+        >
+          <div className="dataTables_wrapper no-footer px-2 ">
+            <table className="table border-top dataTable text-nowrap">
+              <thead>
+                <tr>
+                  {expenseColumns.map(
+                    (col) =>
+                      (col.isAlwaysVisible || groupBy !== col.key) && (
+                        <th
+                          key={col.key}
+                          className={`sorting d-table-cell`}
+                          aria-sort="descending"
+                        >
+                          <div className={`${col.align}`}>{col.label}</div>
+                        </th>
+                      )
+                  )}
+                  <th className="sticky-action-column bg-white text-center">
+                    Action
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {Object.keys(grouped).length > 0 ? (
+                  Object.entries(grouped).map(([group, expenses]) => (
+                    <React.Fragment key={group}>
+                      <tr className="tr-group text-dark">
+                        <td colSpan={8} className="text-start">
+                          <strong>
+                            {IsGroupedByDate
+                              ? formatUTCToLocalTime(group)
+                              : group}
+                          </strong>
+                        </td>
+                      </tr>
+                      {expenses.map((expense) => (
+                        <tr key={expense.id}>
+                          {expenseColumns.map(
+                            (col) =>
+                              (col.isAlwaysVisible || groupBy !== col.key) && (
+                                <td
+                                  key={col.key}
+                                  className={`d-table-cell ${col.align ?? ""}`}
+                                >
+                                  {col.customRender
+                                    ? col.customRender(expense)
+                                    : col.getValue(expense)}
+                                </td>
+                              )
+                          )}
+                          <td className="sticky-action-column bg-white">
+                            <div className="d-flex justify-content-center gap-2">
+                              <i
+                                className="bx bx-show text-primary cursor-pointer"
+                                onClick={() =>
+                                  setViewExpense({
+                                    expenseId: expense.id,
+                                    view: true,
+                                  })
+                                }
+                              ></i>
+                             {canEditExpense(expense) && (
+  <i
+    className="bx bx-edit text-secondary cursor-pointer"
+    onClick={() =>
+      setManageExpenseModal({
+        IsOpen: true,
+        expenseId: expense.id,
+      })
+    }
+  ></i>
+)}
+ 
+                                  {canDetetExpense(expense) && (
+                                        <i
+                                    className="bx bx-trash text-danger cursor-pointer"
+                                    onClick={() => {
+                                      setIsDeleteModalOpen(true);
+                                      setDeletingId(expense.id);
+                                    }}
+                                  ></i>
+                                  )}
+
+                            </div>
+                          </td>
+                        </tr>
+                      ))}
+                    </React.Fragment>
+                  ))
+                ) : (
+                  <tr>
+                    <td colSpan={8} className="text-center py-4">
+                      No Expense Found
+                    </td>
+                  </tr>
+                )}
+              </tbody>
+            </table>
+            {data?.data?.length > 0 && (
+              <Pagination
+                currentPage={currentPage}
+                totalPages={data.totalPages}
+                onPageChange={paginate}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default ExpenseList;

src/components/Expenses/ExpenseSchema.js

@@ -0,0 +1,164 @@
+import { z } from "zod";
+
+const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
+const ALLOWED_TYPES = [
+  "application/pdf",
+  "image/png",
+  "image/jpg",
+  "image/jpeg",
+];
+
+export const ExpenseSchema = (expenseTypes) => {
+  return z
+    .object({
+      projectId: z.string().min(1, { message: "Project is required" }),
+      expensesTypeId: z
+        .string()
+        .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
+        .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" }),
+      amount: z.coerce
+        .number({
+          invalid_type_error: "Amount is required and must be a number",
+        })
+        .min(1, "Amount must be Enter")
+        .refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
+          message: "Amount must have at most 2 decimal places",
+        }),
+      noOfPersons: z.coerce.number().optional(),
+      billAttachments: z
+        .array(
+          z.object({
+            fileName: z.string().min(1, { message: "Filename is required" }),
+            base64Data: z.string().nullable(),
+            contentType: z
+              .string()
+              .refine((val) => ALLOWED_TYPES.includes(val), {
+                message: "Only PDF, PNG, JPG, or JPEG files are allowed",
+              }),
+            documentId: z.string().optional(),
+            fileSize: z.number().max(MAX_FILE_SIZE, {
+              message: "File size must be less than or equal to 5MB",
+            }),
+            description: z.string().optional(),
+            isActive: z.boolean().default(true),
+          })
+        )
+        .nonempty({ message: "At least one file attachment is required" }),
+         
+ 
+    })
+    .refine(
+      (data) => {
+        return (
+          !data.projectId || (data.paidById && data.paidById.trim() !== "")
+        );
+      },
+      {
+        message: "Please select who paid (employee)",
+        path: ["paidById"],
+      }
+    )
+   .superRefine((data, ctx) => {
+      const expenseType = expenseTypes.find((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",
+          path: ["noOfPersons"],
+        });
+      }
+    });
+};
+
+export const defaultExpense = {
+  projectId: "",
+  expensesTypeId: "",
+  paymentModeId: "",
+  paidById: "",
+  transactionDate: "",
+  transactionId: "",
+  description: "",
+  location: "",
+  supplerName: "",
+  amount: "",
+  noOfPersons: "",
+  billAttachments: [],
+};
+
+
+export const ExpenseActionScheam = (isReimbursement = false) => {
+  return z
+    .object({
+      comment: z.string().min(1, { message: "Please leave comment" }),
+      statusId: z.string().min(1, { message: "Please select a status" }),
+      reimburseTransactionId: z.string().nullable().optional(),
+      reimburseDate: z.string().nullable().optional(),
+      reimburseById: z.string().nullable().optional(),
+    })
+    .superRefine((data, ctx) => {
+      if (isReimbursement) {
+        if (!data.reimburseTransactionId?.trim()) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["reimburseTransactionId"],
+            message: "Reimburse Transaction ID is required",
+          });
+        }
+        if (!data.reimburseDate) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["reimburseDate"],
+            message: "Reimburse Date is required",
+          });
+        }
+        if (!data.reimburseById) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["reimburseById"],
+            message: "Reimburse By is required",
+          });
+        }
+      }
+    });
+};
+
+  export const defaultActionValues = {
+  comment: "",
+  statusId: "",
+
+  reimburseTransactionId: null,
+  reimburseDate: null,
+  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(),
+  startDate: z.string().optional(),
+  endDate: z.string().optional(),
+  isTransactionDate: z.boolean().default(true),
+});
+
+export const defaultFilter = {
+  projectIds: [],
+  statusIds: [],
+  createdByIds: [],
+  paidById: [],
+  isTransactionDate: true,
+  startDate: null,
+  endDate: null,
+};
+

src/components/Expenses/ExpenseSkeleton.jsx

@@ -0,0 +1,283 @@
+import React from "react";
+
+
+const SkeletonLine = ({ height = 20, width = "100%", className = "" }) => (
+  <div
+    className={`skeleton mb-2 ${className}`}
+    style={{
+      height,
+      width,
+    }}
+  ></div>
+);
+
+
+const ExpenseSkeleton = () => {
+  return (
+    <div className="container p-3">
+<div className="d-flex justify-content-center">
+  <SkeletonLine height={20} width="200px" />
+</div>
+
+      {[...Array(5)].map((_, idx) => (
+        <div className="row my-2" key={idx}>
+          <div className="col-md-6">
+            <SkeletonLine />
+          </div>
+          <div className="col-md-6">
+            <SkeletonLine />
+          </div>
+        </div>
+      ))}
+
+      <div className="row my-2">
+        <div className="col-md-12">
+          <SkeletonLine height={60} />
+        </div>
+      </div>
+
+      <div className="row my-2">
+        <div className="col-md-12">
+          <SkeletonLine height={120} />
+        </div>
+      </div>
+
+      <div className="d-flex justify-content-center gap-2 mt-3">
+        <SkeletonLine height={35} width="100px" />
+        <SkeletonLine height={35} width="100px" />
+      </div>
+    </div>
+  );
+};
+
+export default ExpenseSkeleton;
+
+
+
+
+export const ExpenseDetailsSkeleton = () => {
+  return (
+      <div className="container px-3">
+      <div className="row mb-3">
+        <div className="d-flex justify-content-center mb-3">
+          <SkeletonLine height={20} width="180px" className="mb-2" />
+        </div>
+
+        {[...Array(3)].map((_, i) => (
+          <div className="col-12 col-md-4 mb-3" key={`row-1-${i}`}>
+            <SkeletonLine height={14}  className="mb-1" />
+            <SkeletonLine />
+          </div>
+        ))}
+
+        {[...Array(6)].map((_, i) => (
+          <div className="col-12 col-md-4 mb-3" key={`row-2-${i}`}>
+            <SkeletonLine height={14} className="mb-1" />
+            <SkeletonLine />
+          </div>
+        ))}
+
+     
+
+        <div className="col-12 my-2">
+          <SkeletonLine height={14} width="100px" className="mb-2" />
+          {[...Array(2)].map((_, i) => (
+            <div
+              className="list-group-item d-flex align-items-center mb-2"
+              key={i}
+            >
+              <div
+                className="rounded me-2"
+                style={{
+                  height: "50px",
+                  width: "80px",
+                  backgroundColor: "#dcdcdc",
+                  borderRadius: "4px",
+                }}
+              />
+              <div className="w-100">
+                <SkeletonLine height={14} width="60%" className="mb-1" />
+                <SkeletonLine height={14} width="20%" />
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <hr className="divider my-1" />
+
+        <div className="col-12 mb-3">
+          <SkeletonLine height={14} width="80px" className="mb-1" />
+          <SkeletonLine height={60} className="mb-2" />
+          <div className="d-flex gap-2 flex-wrap">
+            {[...Array(2)].map((_, i) => (
+              <SkeletonLine
+                key={i}
+                height={30}
+                width="100px"
+                className="rounded"
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+const SkeletonCell = ({ width = "100%", height = 20, className = "", style = {} }) => (
+  <div
+    className={`skeleton ${className}`}
+    style={{
+      width,
+      height,
+      borderRadius: 4,
+      ...style,
+    }}
+  />
+);
+
+export const ExpenseTableSkeleton = ({ groups = 3, rowsPerGroup = 3 }) => {
+  return (
+  <div className="card px-2">
+      <table
+      className="card-body table border-top dataTable no-footer dtr-column text-nowrap"
+      aria-describedby="DataTables_Table_0_info"
+      id="horizontal-example"
+    >
+      <thead>
+        <tr>
+          <th className="d-none d-sm-table-cell">
+            <div className="text-start ms-5">Expense Type</div>
+          </th>
+          <th className="d-none d-sm-table-cell">
+            <div className="text-start ms-5">Payment Mode</div>
+          </th>
+          <th className="d-none d-sm-table-cell">Paid By</th>
+          <th className="d-none d-md-table-cell">Amount</th>
+          <th>Status</th>
+          <th>Action</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        {[...Array(groups)].map((_, groupIdx) => (
+          <React.Fragment key={`group-${groupIdx}`}>
+            {/* Fake Date Group Header Row */}
+            <tr className="bg-light">
+              <td colSpan={8}>
+                <SkeletonCell width="150px" height={20} />
+              </td>
+            </tr>
+
+            {/* Rows under this group */}
+            {[...Array(rowsPerGroup)].map((__, rowIdx) => (
+              <tr key={`row-${groupIdx}-${rowIdx}`} className={rowIdx % 2 === 0 ? "odd" : "even"}>
+                {/* Expense Type */}
+                <td className="text-start d-none d-sm-table-cell ms-5">
+                  <SkeletonCell width="90px" height={16} />
+                </td>
+
+                {/* Payment Mode */}
+                <td className="text-start d-none d-sm-table-cell ms-5">
+                  <SkeletonCell width="90px" height={16} />
+                </td>
+
+                {/* Paid By (Avatar + name) */}
+                <td className="text-start d-none d-sm-table-cell ms-5">
+                  <div className="d-flex align-items-center gap-2">
+                    <SkeletonCell width="30px" height={30} className="rounded-circle" />
+                    <SkeletonCell width="80px" height={16} />
+                  </div>
+                </td>
+
+                {/* Amount */}
+                <td className="d-none d-md-table-cell text-end">
+                  <SkeletonCell width="60px" height={16} />
+                </td>
+
+                {/* Status */}
+                <td>
+                  <SkeletonCell width="80px" height={22} className="rounded" />
+                </td>
+
+                {/* Action */}
+                <td>
+                  <div className="d-flex justify-content-center align-items-center gap-2">
+                    {[...Array(3)].map((__, i) => (
+                      <SkeletonCell
+                        key={i}
+                        width={20}
+                        height={20}
+                        className="rounded"
+                        style={{ display: "inline-block" }}
+                      />
+                    ))}
+                  </div>
+                </td>
+              </tr>
+            ))}
+          </React.Fragment>
+        ))}
+      </tbody>
+    </table>
+  </div>
+  );
+};
+
+
+export const ExpenseFilterSkeleton = () => {
+  return (
+    <div className="p-3 text-start">
+      {/* Created Date Label and Skeleton */}
+      <div className="mb-3 w-100">
+        <SkeletonLine height={14} width="120px" className="mb-1" />
+        <SkeletonLine height={36} />
+      </div>
+
+      <div className="row g-2">
+        {/* Project Select */}
+        <div className="col-12 col-md-4 mb-3">
+          <SkeletonLine height={14} width="80px" className="mb-1" />
+          <SkeletonLine height={36} />
+        </div>
+
+        {/* Submitted By Select */}
+        <div className="col-12 col-md-4 mb-3">
+          <SkeletonLine height={14} width="100px" className="mb-1" />
+          <SkeletonLine height={36} />
+        </div>
+
+        {/* Paid By Select */}
+        <div className="col-12 col-md-4 mb-3">
+          <SkeletonLine height={14} width="70px" className="mb-1" />
+          <SkeletonLine height={36} />
+        </div>
+
+        {/* Status Checkboxes */}
+        <div className="col-12 mb-3">
+          <SkeletonLine height={14} width="80px" className="mb-2" />
+          <div className="d-flex flex-wrap">
+            {[...Array(3)].map((_, i) => (
+              <div className="d-flex align-items-center me-3 mb-2" key={i}>
+                <div
+                  className="form-check-input bg-secondary me-2"
+                  style={{
+                    height: "16px",
+                    width: "16px",
+                    borderRadius: "3px",
+                  }}
+                />
+                <SkeletonLine height={14} width="60px" />
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+
+      {/* Buttons */}
+      <div className="d-flex justify-content-end py-3 gap-2">
+        <SkeletonLine height={30} width="80px" className="rounded" />
+        <SkeletonLine height={30} width="80px" className="rounded" />
+      </div>
+    </div>
+  );
+};

src/components/Expenses/ExpenseStatusLogs.jsx

@@ -0,0 +1,64 @@
+import { useState } from "react";
+import Avatar from "../common/Avatar";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+
+const ExpenseStatusLogs = ({ data }) => {
+  const [visibleCount, setVisibleCount] = useState(4);
+
+  const logsToShow = data?.expenseLogs?.slice(0, visibleCount) || [];
+
+  const handleShowMore = () => {
+    setVisibleCount((prev) => prev + 4);
+  };
+
+  return (
+    <>
+      <div className="row g-2">
+        {logsToShow.map((log, index) => (
+          <div
+            key={log.id}
+            className="col-12 d-flex align-items-start mb-2"
+          >
+            <Avatar
+              size="xs"
+              firstName={log.updatedBy.firstName}
+              lastName={log.updatedBy.lastName}
+            />
+
+            <div className="flex-grow-1">
+              <div className="d-flex justify-content-start">
+                <div className="text-start">
+                  <div >
+                    <div className="flex">
+                      <span>{`${log.updatedBy.firstName} ${log.updatedBy.lastName}`}</span>
+                      <small className="text-secondary text-tiny ms-2">
+                        <em>{log.action}</em>
+                      </small>
+                      <span className="text-tiny text-secondary d-block small">{formatUTCToLocalTime(log?.updateAt)}</span>
+                    </div>
+                  </div>
+                  <div className="d-flex align-items-center text-muted small mt-1">
+                    <span className="small">{log.comment}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        ))}
+      </div>
+
+      {data?.expenseLogs?.length > visibleCount && (
+        <div className="text-center my-1">
+          <button
+            className="btn btn-xs btn-outline-primary"
+            onClick={handleShowMore}
+          >
+            Show More
+          </button>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default ExpenseStatusLogs;

src/components/Expenses/ManageExpense.jsx

@@ -0,0 +1,554 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import React, { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { defaultExpense, ExpenseSchema } from "./ExpenseSchema";
+import { formatFileSize } from "../../utils/appUtils";
+import { useProjectName } from "../../hooks/useProjects";
+import { useDispatch, useSelector } from "react-redux";
+import { changeMaster } from "../../slices/localVariablesSlice";
+import useMaster, {
+  useExpenseStatus,
+  useExpenseType,
+  usePaymentMode,
+} from "../../hooks/masterHook/useMaster";
+import {
+  useEmployeesAllOrByProjectId,
+  useEmployeesByProject,
+  useEmployeesName,
+  useEmployeesNameByProject,
+} from "../../hooks/useEmployees";
+import Avatar from "../common/Avatar";
+import {
+  useCreateExpnse,
+  useExpense,
+  useUpdateExpense,
+} from "../../hooks/useExpense";
+import ExpenseSkeleton from "./ExpenseSkeleton";
+import moment from "moment";
+import DatePicker from "../common/DatePicker";
+import ErrorPage from "../../pages/ErrorPage";
+
+const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
+  const {
+    data,
+    isLoading,
+    error: ExpenseErrorLoad,
+  } = useExpense(expenseToEdit);
+  console.log(data)
+  const [ExpenseType, setExpenseType] = useState();
+  const dispatch = useDispatch();
+  const {
+    ExpenseTypes,
+    loading: ExpenseLoading,
+    error: ExpenseError,
+  } = useExpenseType();
+  const schema = ExpenseSchema(ExpenseTypes);
+  const {
+    register,
+    handleSubmit,
+    watch,
+    setValue,
+    reset,
+    control,
+    formState: { errors },
+  } = useForm({
+    resolver: zodResolver(schema),
+    defaultValues: defaultExpense,
+  });
+
+  const selectedproject = watch("projectId");
+ 
+  const {
+    projectNames,
+    loading: projectLoading,
+    error,
+    isError: isProjectError,
+  } = useProjectName();
+
+  const {
+    PaymentModes,
+    loading: PaymentModeLoading,
+    error: PaymentModeError,
+  } = usePaymentMode();
+  const {
+    ExpenseStatus,
+    loading: StatusLoadding,
+    error: stausError,
+  } = useExpenseStatus();
+  const {
+    data: employees,
+    isLoading: EmpLoading,
+    isError: isEmployeeError,
+  } = useEmployeesNameByProject(selectedproject);
+  const files = watch("billAttachments");
+  const onFileChange = async (e) => {
+    const newFiles = Array.from(e.target.files);
+    if (newFiles.length === 0) return;
+
+    const existingFiles = watch("billAttachments") || [];
+
+    const parsedFiles = await Promise.all(
+      newFiles.map(async (file) => {
+        const base64Data = await toBase64(file);
+        return {
+          fileName: file.name,
+          base64Data,
+          contentType: file.type,
+          fileSize: file.size,
+          description: "",
+          isActive: true,
+        };
+      })
+    );
+
+    const combinedFiles = [
+      ...existingFiles,
+      ...parsedFiles.filter(
+        (newFile) =>
+          !existingFiles.some(
+            (f) =>
+              f.fileName === newFile.fileName && f.fileSize === newFile.fileSize
+          )
+      ),
+    ];
+
+    setValue("billAttachments", combinedFiles, {
+      shouldDirty: true,
+      shouldValidate: true,
+    });
+  };
+
+  const toBase64 = (file) =>
+    new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = () => resolve(reader.result.split(",")[1]);
+      reader.onerror = (error) => reject(error);
+    });
+  const removeFile = (index) => {
+    if (expenseToEdit) {
+      const newFiles = files.map((file, i) => {
+        if (file.documentId !== index) return file;
+        return {
+          ...file,
+          isActive: false,
+        };
+      });
+      setValue("billAttachments", newFiles, { shouldValidate: true });
+    } else {
+      const newFiles = files.filter((_, i) => i !== index);
+      setValue("billAttachments", newFiles, { shouldValidate: true });
+    }
+  };
+
+  useEffect(() => {
+    if (expenseToEdit && data ) {
+   
+      reset({
+        projectId: data.project.id || "",
+        expensesTypeId: data.expensesType.id || "",
+        paymentModeId: data.paymentMode.id || "",
+        paidById: data.paidBy.id || "",
+        transactionDate: data.transactionDate?.slice(0, 10) || "",
+        transactionId: data.transactionId || "",
+        description: data.description || "",
+        location: data.location || "",
+        supplerName: data.supplerName || "",
+        amount: data.amount || "",
+        noOfPersons: data.noOfPersons || "",
+        billAttachments: data.documents
+          ? data.documents.map((doc) => ({
+              fileName: doc.fileName,
+              base64Data: null,
+              contentType: doc.contentType,
+              documentId: doc.documentId,
+              fileSize: 0,
+              description: "",
+              preSignedUrl: doc.preSignedUrl,
+              isActive: doc.isActive ?? true,
+            }))
+          : [],
+      });
+    }
+  }, [data, reset, employees]);
+  const { mutate: ExpenseUpdate, isPending } = useUpdateExpense(() =>
+    handleClose()
+  );
+  const { mutate: CreateExpense, isPending: createPending } = useCreateExpnse(
+    () => {
+      handleClose();
+    }
+  );
+  const onSubmit = (payload) => {
+    if (expenseToEdit) {
+      const editPayload = { ...payload, id: data.id };
+      ExpenseUpdate({ id: data.id, payload: editPayload });
+    } else {
+      CreateExpense(payload);
+    }
+  };
+  const ExpenseTypeId = watch("expensesTypeId");
+
+  useEffect(() => {
+    setExpenseType(ExpenseTypes?.find((type) => type.id === ExpenseTypeId));
+  }, [ExpenseTypeId]);
+
+  const handleClose = () => {
+    reset();
+    closeModal();
+  };
+  if (StatusLoadding || projectLoading || ExpenseLoading || isLoading)
+    return <ExpenseSkeleton />;
+
+
+  return (
+    <div className="container p-3">
+      <h5 className="m-0">
+        {expenseToEdit ? "Update Expense " : "Create New Expense"}
+      </h5>
+      <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
+        <div className="row my-2">
+          <div className="col-md-6">
+            <label className="form-label">Select Project</label>
+            <select
+              className="form-select form-select-sm"
+              {...register("projectId")}
+            >
+              <option value="">Select Project</option>
+              {projectLoading ? (
+                <option>Loading...</option>
+              ) : (
+                projectNames?.map((project) => (
+                  <option key={project.id} value={project.id}>
+                    {project.name}
+                  </option>
+                ))
+              )}
+            </select>
+            {errors.projectId && (
+              <small className="danger-text">{errors.projectId.message}</small>
+            )}
+          </div>
+
+          <div className="col-md-6">
+            <label htmlFor="expensesTypeId" className="form-label ">
+              Expense Type
+            </label>
+            <select
+              className="form-select form-select-sm"
+              id="expensesTypeId"
+              {...register("expensesTypeId")}
+            >
+              <option value="" disabled>
+                Select Type
+              </option>
+              {ExpenseLoading ? (
+                <option disabled>Loading...</option>
+              ) : (
+                ExpenseTypes?.map((expense) => (
+                  <option key={expense.id} value={expense.id}>
+                    {expense.name}
+                  </option>
+                ))
+              )}
+            </select>
+            {errors.expensesTypeId && (
+              <small className="danger-text">
+                {errors.expensesTypeId.message}
+              </small>
+            )}
+          </div>
+        </div>
+
+        <div className="row my-2">
+          <div className="col-md-6">
+            <label htmlFor="paymentModeId" className="form-label ">
+              Payment Mode
+            </label>
+            <select
+              className="form-select form-select-sm"
+              id="paymentModeId"
+              {...register("paymentModeId")}
+            >
+              <option value="" disabled>
+                Select Mode
+              </option>
+              {PaymentModeLoading ? (
+                <option disabled>Loading...</option>
+              ) : (
+                PaymentModes?.map((payment) => (
+                  <option key={payment.id} value={payment.id}>
+                    {payment.name}
+                  </option>
+                ))
+              )}
+            </select>
+            {errors.paymentModeId && (
+              <small className="danger-text">
+                {errors.paymentModeId.message}
+              </small>
+            )}
+          </div>
+
+          <div className="col-md-6">
+            <label htmlFor="paidById" className="form-label ">
+              Paid By
+            </label>
+            <select
+              className="form-select form-select-sm"
+              id="paymentModeId"
+              {...register("paidById")}
+              disabled={!selectedproject}
+            >
+              <option value="" disabled>
+                Select Person
+              </option>
+              {EmpLoading ? (
+                <option disabled>Loading...</option>
+              ) : (
+                employees?.map((emp) => (
+                  <option key={emp.id} value={emp.id}>
+                    {`${emp.firstName} ${emp.lastName} `}
+                  </option>
+                ))
+              )}
+            </select>
+            {errors.paidById && (
+              <small className="danger-text">{errors.paidById.message}</small>
+            )}
+          </div>
+        </div>
+
+        <div className="row my-2">
+          <div className="col-md-6">
+            <label htmlFor="transactionDate" className="form-label ">
+              Transaction Date
+            </label>
+            <DatePicker name="transactionDate" control={control} />
+
+            {errors.transactionDate && (
+              <small className="danger-text">
+                {errors.transactionDate.message}
+              </small>
+            )}
+          </div>
+
+          <div className="col-md-6">
+            <label htmlFor="amount" className="form-label ">
+              Amount
+            </label>
+            <input
+              type="number"
+              id="amount"
+              className="form-control form-control-sm"
+              min="1"
+              step="0.01"
+              inputMode="decimal"
+              {...register("amount", { valueAsNumber: true })}
+            />
+            {errors.amount && (
+              <small className="danger-text">{errors.amount.message}</small>
+            )}
+          </div>
+        </div>
+
+        <div className="row my-2">
+          <div className="col-md-6">
+            <label htmlFor="supplerName" className="form-label ">
+              Supplier Name/Transporter Name/Other
+            </label>
+            <input
+              type="text"
+              id="supplerName"
+              className="form-control form-control-sm"
+              {...register("supplerName")}
+            />
+            {errors.supplerName && (
+              <small className="danger-text">
+                {errors.supplerName.message}
+              </small>
+            )}
+          </div>
+
+          <div className="col-md-6">
+            <label htmlFor="location" className="form-label ">
+              Location
+            </label>
+            <input
+              type="text"
+              id="location"
+              className="form-control form-control-sm"
+              {...register("location")}
+            />
+            {errors.location && (
+              <small className="danger-text">{errors.location.message}</small>
+            )}
+          </div>
+        </div>
+        <div className="row my-2">
+          <div className="col-md-6">
+            <label htmlFor="statusId" className="form-label ">
+              TransactionId
+            </label>
+            <input
+              type="text"
+              id="transactionId"
+              className="form-control form-control-sm"
+              min="1"
+              {...register("transactionId")}
+            />
+            {errors.transactionId && (
+              <small className="danger-text">
+                {errors.transactionId.message}
+              </small>
+            )}
+          </div>
+
+          {ExpenseType?.noOfPersonsRequired && (
+            <div className="col-md-6">
+              <label>No. of Persons</label>
+              <input
+                type="number"
+                id="noOfPersons"
+                className="form-control form-control-sm"
+                {...register("noOfPersons")}
+                inputMode="numeric"
+              />
+              {errors.noOfPersons && (
+                <small className="danger-text">
+                  {errors.noOfPersons.message}
+                </small>
+              )}
+            </div>
+          )}
+        </div>
+
+        <div className="row my-2">
+          <div className="col-md-12">
+            <label htmlFor="description">Description</label>
+            <textarea
+              id="description"
+              className="form-control form-control-sm"
+              {...register("description")}
+              rows="2"
+            ></textarea>
+            {errors.description && (
+              <small className="danger-text">
+                {errors.description.message}
+              </small>
+            )}
+          </div>
+        </div>
+
+        <div className="row my-2">
+          <div className="col-md-12">
+            <label className="form-label ">Upload Bill </label>
+
+            <div
+              className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
+              style={{ cursor: "pointer" }}
+              onClick={() => document.getElementById("billAttachments").click()}
+            >
+              <i className="bx bx-cloud-upload d-block bx-lg"></i>
+              <span className="text-muted d-block">
+                Click to select or click here to browse
+              </span>
+              <small className="text-muted">(PDF, JPG, PNG, max 5MB)</small>
+
+              <input
+                type="file"
+                id="billAttachments"
+                accept=".pdf,.jpg,.jpeg,.png"
+                multiple
+                style={{ display: "none" }}
+                {...register("billAttachments")}
+                onChange={(e) => {
+                  onFileChange(e);
+                  e.target.value = "";
+                }}
+              />
+            </div>
+            {errors.billAttachments && (
+              <small className="danger-text">
+                {errors.billAttachments.message}
+              </small>
+            )}
+            {files.length > 0 && (
+              <div className="d-block">
+                {files
+                  .filter((file) => {
+                    if (expenseToEdit) {
+                      return file.isActive;
+                    }
+                    return true;
+                  })
+                  .map((file, idx) => (
+                    <a
+                      key={idx}
+                      className="d-flex justify-content-between text-start p-1"
+                      href={file.preSignedUrl || "#"}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      <div>
+                        <span className="mb-0 text-secondary small d-block">
+                          {file.fileName}
+                        </span>
+                        <span className="text-body-secondary small d-block">
+                          {file.fileSize ? formatFileSize(file.fileSize) : ""}
+                        </span>
+                      </div>
+                      <i
+                        className="bx bx-trash bx-sm cursor-pointer text-danger"
+                        onClick={(e) => {
+                          e.preventDefault();
+                          removeFile(expenseToEdit ? file.documentId : idx);
+                        }}
+                      ></i>
+                    </a>
+                  ))}
+              </div>
+            )}
+
+            {Array.isArray(errors.billAttachments) &&
+              errors.billAttachments.map((fileError, index) => (
+                <div key={index} className="danger-text small mt-1">
+                  {
+                    (fileError?.fileSize?.message ||
+                      fileError?.contentType?.message ||
+                      fileError?.base64Data?.message,
+                    fileError?.documentId?.message)
+                  }
+                </div>
+              ))}
+          </div>
+        </div>
+
+        <div className="d-flex justify-content-center gap-2">
+          {" "}
+          <button
+            type="submit"
+            className="btn btn-primary btn-sm mt-3"
+            disabled={isPending || createPending}
+          >
+            {isPending || createPending
+              ? "Please Wait..."
+              : expenseToEdit
+              ? "Update"
+              : "Submit"}
+          </button>
+          <button
+            type="reset"
+            disabled={isPending || createPending}
+            onClick={handleClose}
+            className="btn btn-secondary btn-sm mt-3"
+          >
+            Cancel
+          </button>
+        </div>
+      </form>
+    </div>
+  );
+};
+
+export default ManageExpense;

src/components/Expenses/PreviewDocument.jsx

@@ -0,0 +1,28 @@
+import { useState } from 'react';
+
+const PreviewDocument = ({ imageUrl }) => {
+  const [loading, setLoading] = useState(true);
+
+  return (
+    <div className="d-flex justify-content-center align-items-center" style={{ minHeight: "50vh" }}>
+      {loading && (
+        <div className="text-secondary text-center mb-2">
+          Loading...
+        </div>
+      )}
+      <img
+        src={imageUrl}
+        alt="Full View"
+        className="img-fluid"
+        style={{
+          maxHeight: "100vh",
+          objectFit: "contain",
+          display: loading ? "none" : "block",
+        }}
+        onLoad={() => setLoading(false)}
+      />
+    </div>
+  );
+};
+
+export default PreviewDocument;

src/components/Expenses/ViewExpense.jsx

@@ -0,0 +1,556 @@
+import React, { useState, useMemo } from "react";
+import {
+  useActionOnExpense,
+  useExpense,
+  useHasAnyPermission,
+} from "../../hooks/useExpense";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+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 } from "../../utils/appUtils";
+import { ExpenseDetailsSkeleton } from "./ExpenseSkeleton";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import {
+  EXPENSE_REJECTEDBY,
+  PROCESS_EXPENSE,
+  REVIEW_EXPENSE,
+} from "../../utils/constants";
+import { useProfile } from "../../hooks/useProfile";
+import { useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import Avatar from "../common/Avatar";
+import Error from "../common/Error";
+import DatePicker from "../common/DatePicker";
+import { useEmployeeRoles, useEmployeesName } from "../../hooks/useEmployees";
+import EmployeeSearchInput from "../common/EmployeeSearchInput";
+import { z } from "zod";
+import moment from "moment";
+import ExpenseStatusLogs from "./ExpenseStatusLogs";
+
+const ViewExpense = ({ ExpenseId }) => {
+  const { data, isLoading, isError, error } = useExpense(ExpenseId);
+  const [IsPaymentProcess, setIsPaymentProcess] = useState(false);
+  const [clickedStatusId, setClickedStatusId] = useState(null);
+
+  const IsReview = useHasUserPermission(REVIEW_EXPENSE);
+  const [imageLoaded, setImageLoaded] = useState({});
+  const { setDocumentView } = useExpenseContext();
+  const ActionSchema = ExpenseActionScheam(IsPaymentProcess) ?? z.object({});
+  const navigate = useNavigate();
+  const {
+    register,
+    handleSubmit,
+    setValue,
+    reset,
+    control,
+    formState: { errors },
+  } = useForm({
+    resolver: zodResolver(ActionSchema),
+    defaultValues: defaultActionValues,
+  });
+
+  const userPermissions = useSelector(
+    (state) => state?.globalVariables?.loginUser?.featurePermissions || []
+  );
+  const CurrentUser = useSelector(
+    (state) => state?.globalVariables?.loginUser?.employeeInfo
+  );
+
+  const nextStatusWithPermission = useMemo(() => {
+    if (!Array.isArray(data?.nextStatus)) return [];
+
+    return data.nextStatus.filter((status) => {
+      const permissionIds = Array.isArray(status?.permissionIds)
+        ? status.permissionIds
+        : [];
+
+      if (permissionIds.length === 0) return true;
+      if (permissionIds.includes(PROCESS_EXPENSE)) {
+        setIsPaymentProcess(true);
+      }
+      return permissionIds.some((id) => userPermissions.includes(id));
+    });
+  }, [data, userPermissions]);
+
+  const IsRejectedExpense = useMemo(() => {
+    return EXPENSE_REJECTEDBY.includes(data?.status?.id);
+  }, [data]);
+
+  const isCreatedBy = useMemo(() => {
+    return data?.createdBy.id === CurrentUser?.id;
+  }, [data, CurrentUser]);
+
+  const { mutate: MakeAction, isPending } = useActionOnExpense(() => {
+    setClickedStatusId(null);
+    reset();
+  });
+
+  const onSubmit = (formData) => {
+    const Payload = {
+      ...formData,
+      reimburseDate: moment
+        .utc(formData.reimburseDate, "DD-MM-YYYY")
+        .toISOString(),
+      expenseId: ExpenseId,
+      comment: formData.comment,
+    };
+    MakeAction(Payload);
+  };
+
+  if (isLoading) return <ExpenseDetailsSkeleton />;
+  if (isError) return <Error error={error} />;
+  const handleImageLoad = (id) => {
+    setImageLoaded((prev) => ({ ...prev, [id]: true }));
+  };
+
+  return (
+    <form className="container px-3" onSubmit={handleSubmit(onSubmit)}>
+      <div className="row mb-3">
+        <div className="col-12 mb-3">
+          <h5 className="fw-semibold">Expense Details</h5>
+          <hr />
+        </div>
+        <div className="text-start mb-2">
+          {/* <label className="form-label me-2 mb-0 fw-semibold">
+          Description :
+        </label> */}
+          <div className="text-muted">{data?.description}</div>
+        </div>
+        {/* Row 1 */}
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Transaction Date :
+            </label>
+            <div className="text-muted">
+              {formatUTCToLocalTime(data?.transactionDate)}
+            </div>
+          </div>
+        </div>
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Expense Type :
+            </label>
+            <div className="text-muted">{data?.expensesType?.name}</div>
+          </div>
+        </div>
+
+        {/* Row 2 */}
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Supplier :
+            </label>
+            <div className="text-muted">{data?.supplerName}</div>
+          </div>
+        </div>
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Amount :
+            </label>
+            <div className="text-muted">₹ {data.amount}</div>
+          </div>
+        </div>
+
+        {/* Row 3 */}
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Payment Mode :
+            </label>
+            <div className="text-muted">{data?.paymentMode?.name}</div>
+          </div>
+        </div>
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Paid By :
+            </label>
+            <div className="text-muted">
+              {data?.paidBy?.firstName} {data?.paidBy?.lastName}
+            </div>
+          </div>
+        </div>
+
+        {/* Row 4 */}
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Status :
+            </label>
+            <span
+              className={`badge bg-label-${
+                getColorNameFromHex(data?.status?.color) || "secondary"
+              }`}
+            >
+              {data?.status?.name}
+            </span>
+          </div>
+        </div>
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Pre-Approved :
+            </label>
+            <div className="text-muted">{data.preApproved ? "Yes" : "No"}</div>
+          </div>
+        </div>
+
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Project :
+            </label>
+            <div className="text-muted">{data?.project?.name}</div>
+          </div>
+        </div>
+        <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Created At :
+            </label>
+            <div className="text-muted">
+              {formatUTCToLocalTime(data?.createdAt, true)}
+            </div>
+          </div>
+        </div>
+
+        {/* Row 6 */}
+        {data.createdBy && (
+          <div className="col-md-6 text-start">
+            <div className="d-flex align-items-center">
+              <label
+                className="form-label me-2 mb-0 fw-semibold"
+                style={{ minWidth: "130px" }}
+              >
+                Created By :
+              </label>
+              <div className="d-flex align-items-center gap-1">
+                <Avatar
+                  size="xs"
+                  classAvatar="m-0"
+                  firstName={data.createdBy?.firstName}
+                  lastName={data.createdBy?.lastName}
+                />
+                <span className="text-muted">
+                  {`${data.createdBy?.firstName ?? ""} ${
+                    data.createdBy?.lastName ?? ""
+                  }`.trim() || "N/A"}
+                </span>
+              </div>
+            </div>
+          </div>
+        )}
+
+        {/* {data.reviewedBy && (
+          <div className="col-md-6 mb-3 text-start">
+            <div className="d-flex align-items-center">
+              <label
+                className="form-label me-2 mb-0 fw-semibold"
+                style={{ minWidth: "130px" }}
+              >
+                Reviewed By :
+              </label>
+              <div className="d-flex align-items-center">
+                <Avatar
+                  size="xs"
+                  classAvatar="m-0"
+                  firstName={data.reviewedBy?.firstName}
+                  lastName={data.reviewedBy?.lastName}
+                />
+                <span className="text-muted">
+                  {`${data.reviewedBy?.firstName ?? ""} ${
+                    data.reviewedBy?.lastName ?? ""
+                  }`.trim() || "N/A"}
+                </span>
+              </div>
+            </div>
+          </div>
+        )}
+
+        {data.approvedBy && (
+          <div className="col-md-6 mb-3 text-start">
+            <div className="d-flex align-items-center">
+              <label
+                className="form-label me-2 mb-0 fw-semibold"
+                style={{ minWidth: "130px" }}
+              >
+                Approved By :{" "}
+              </label>
+              <div className="d-flex align-items-center">
+                <Avatar
+                  size="xs"
+                  classAvatar="m-0"
+                  firstName={data.approvedBy?.firstName}
+                  lastName={data.approvedBy?.lastName}
+                />
+                <span className="text-muted">
+                  {`${data.approvedBy?.firstName ?? ""} ${
+                    data.approvedBy?.lastName ?? ""
+                  }`.trim() || "N/A"}
+                </span>
+              </div>
+            </div>
+          </div>
+        )}
+        {data.processedBy && (
+          <div className="col-md-6 mb-3 text-start">
+            <div className="d-flex align-items-center">
+              <label
+                className="form-label me-2 mb-0 fw-semibold"
+                style={{ minWidth: "130px" }}
+              >
+                Processed By :{" "}
+              </label>
+              <div className="d-flex align-items-center">
+                <Avatar
+                  size="xs"
+                  classAvatar="m-0"
+                  firstName={data.processedBy?.firstName}
+                  lastName={data.processedBy?.lastName}
+                />
+                <span className="text-muted">
+                  {`${data.processedBy?.firstName ?? ""} ${
+                    data.processedBy?.lastName ?? ""
+                  }`.trim() || "N/A"}
+                </span>
+              </div>
+            </div>
+          </div>
+        )} */}
+      </div>
+    
+
+      {/* <div className="text-start">
+        <label className="form-label me-2 mb-0 fw-semibold">
+          Description :
+        </label>
+        <div className="text-muted">{data?.description}</div>
+      </div> */}
+      <div className="col-12  text-start">
+        <label className="form-label me-2 mb-0 fw-semibold">Attachment :</label>
+
+        {data?.documents?.map((doc) => {
+          const getIconByType = (type) => {
+            if (!type) return "bx bx-file";
+
+            if (type.includes("pdf")) return "bxs-file-pdf";
+            if (type.includes("word")) return "bxs-file-doc";
+            if (type.includes("excel") || type.includes("spreadsheet"))
+              return "bxs-file-xls";
+            if (type.includes("image")) return "bxs-file-image";
+            if (type.includes("zip") || type.includes("rar"))
+              return "bxs-file-archive";
+
+            return "bx bx-file";
+          };
+
+          const isImage = doc.contentType?.includes("image");
+
+          return (
+            <div
+              className="list-group-item list-group-item-action d-flex align-items-center"
+              key={doc.documentId}
+            >
+              <div
+                className="rounded me-1 d-flex align-items-center justify-content-center cursor-pointer"
+                style={{ height: "50px", width: "60px", position: "relative" }}
+                onClick={() => {
+                  if (isImage) {
+                    setDocumentView({
+                      IsOpen: true,
+                      Image: doc.preSignedUrl,
+                    });
+                  }
+                }}
+              >
+                <i
+                  className={`bx ${getIconByType(
+                    doc.contentType
+                  )} text-primary`}
+                  style={{ fontSize: "35px" }}
+                ></i>
+              </div>
+
+              <div className="w-100">
+                <small className="mb-0 small">{doc.fileName}</small>
+                <div className="d">
+                  <a
+                    href={doc.preSignedUrl}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="bx bx-cloud-download cursor-pointer"
+                    title="View PDF"
+                  />
+                </div>
+              </div>
+            </div>
+          );
+        })}
+      </div>
+
+     
+        {data.expensesReimburse && (
+        <div className="row text-start">
+          <div className="col-md-6 mb-sm-0 mb-2">
+            <label className="form-label me-2 mb-0 fw-semibold">
+              Transaction ID :
+            </label>
+            {data.expensesReimburse.reimburseTransactionId || "N/A"}
+          </div>
+          <div className="col-md-6 ">
+            <label className="form-label me-2 mb-0 fw-semibold">
+              Reimburse Date :
+            </label>
+            {formatUTCToLocalTime(data.expensesReimburse.reimburseDate)}
+          </div>
+
+          {data.expensesReimburse && (
+            <>
+              <div className="col-md-6  d-flex align-items-center">
+                <label className="form-label me-2 mb-0 fw-semibold">
+                  Reimburse By :
+                </label>
+                <Avatar
+                  size="xs"
+                  classAvatar="m-0 me-1"
+                  firstName={data?.expensesReimburse?.reimburseBy?.firstName}
+                  lastName={data?.expensesReimburse?.reimburseBy?.lastName}
+                />
+                <span className="text-muted">
+                  {`${data?.expensesReimburse?.reimburseBy?.firstName} ${data?.expensesReimburse?.reimburseBy?.lastName}`.trim()}
+                </span>
+              </div>
+            </>
+          )}
+        </div>
+      )}
+       <hr className="divider my-1" />
+
+      {Array.isArray(data?.nextStatus) && data.nextStatus.length > 0 && (
+        <>
+          {IsPaymentProcess && nextStatusWithPermission?.length > 0 && (
+            <div className="row">
+              <div className="col-12 col-md-6 text-start">
+                <label className="form-label">Transaction Id </label>
+                <input
+                  type="text"
+                  className="form-control form-control-sm"
+                  {...register("reimburseTransactionId")}
+                />
+                {errors.reimburseTransactionId && (
+                  <small className="danger-text">
+                    {errors.reimburseTransactionId.message}
+                  </small>
+                )}
+              </div>
+              <div className="col-12 col-md-6 text-start">
+                <label className="form-label">Transaction Date </label>
+                <DatePicker
+                  name="reimburseDate"
+                  control={control}
+                  minDate={data?.transactionDate}
+                />
+                {errors.reimburseDate && (
+                  <small className="danger-text">
+                    {errors.reimburseDate.message}
+                  </small>
+                )}
+              </div>
+              <div className="col-12 col-md-6 text-start">
+                <label className="form-label">Reimburse By </label>
+                <EmployeeSearchInput
+                  control={control}
+                  name="reimburseById"
+                  projectId={null}
+                />
+              </div>
+            </div>
+          )}
+          <div className="col-12 mb-3 text-start">
+            {((nextStatusWithPermission.length > 0 && !IsRejectedExpense) ||
+              (IsRejectedExpense && isCreatedBy)) && (
+              <>
+                <label className="form-label me-2 mb-0">Comment:</label>
+                <textarea
+                  className="form-control form-control-sm"
+                  {...register("comment")}
+                  rows="2"
+                />
+                {errors.comment && (
+                  <small className="danger-text">
+                    {errors.comment.message}
+                  </small>
+                )}
+              </>
+            )}
+
+            {nextStatusWithPermission?.length > 0 &&
+              (!IsRejectedExpense || isCreatedBy) && (
+                <div className="text-center flex-wrap gap-2 my-2">
+                  {nextStatusWithPermission.map((status, index) => (
+                    <button
+                      key={status.id || index}
+                      type="button"
+                      onClick={() => {
+                        setClickedStatusId(status.id);
+                        setValue("statusId", status.id);
+                        handleSubmit(onSubmit)();
+                      }}
+                      disabled={isPending}
+                      className="btn btn-primary btn-sm cursor-pointer mx-2 border-0"
+                    >
+                      {isPending && clickedStatusId === status.id
+                        ? "Please Wait..."
+                        : status.displayName || status.name}
+                    </button>
+                  ))}
+                </div>
+              )}
+          </div>
+        </>
+      )}
+
+   <ExpenseStatusLogs data={data}/>
+
+    </form>
+
+  
+  );
+};
+
+export default ViewExpense;

src/components/Project/AssignTask.jsx

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

src/components/common/DatePicker.jsx

@@ -1,39 +1,71 @@
-import React, { useEffect, useRef } from "react";
+import { useEffect, useRef } from "react";
+import { useController } from "react-hook-form";
 
-const DatePicker = ({ onDateChange }) => {
+
+const DatePicker = ({
+  name,
+  control,
+  placeholder = "DD-MM-YYYY",
+  className = "",
+  allowText = false,
+  maxDate=new Date(),
+  minDate,
+  ...rest
+}) => {
   const inputRef = useRef(null);
 
-  useEffect(() => {
+  const {
-    const fp = flatpickr(inputRef.current, {
+    field: { onChange, value, ref }
-      dateFormat: "Y-m-d",
+  } = useController({
-      defaultDate: new Date(),
+    name,
-      onChange: (selectedDates, dateStr) => {
+    control
-        if (onDateChange) {
-          onDateChange(dateStr); // Pass selected date to parent
-        }
-      }
   });
 
-    return () => {
+  useEffect(() => {
-      // Cleanup flatpickr instance
+    if (inputRef.current) {
-      fp.destroy();
+      flatpickr(inputRef.current, {
-    };
+        dateFormat: "d-m-Y",
-  }, [onDateChange]);
+        allowInput: allowText, 
+        defaultDate: value
+          ? flatpickr.parseDate(value, "Y-m-d")
+          : null,
+        maxDate:maxDate,
+        minDate:new Date(minDate?.split("T")[0]) ?? undefined,
+        onChange: function (selectedDates, dateStr) {
+          onChange(dateStr); 
+        },
+        ...rest
+      });
+    }
+  }, [inputRef]);
 
   return (
-    <div className="container mt-3">
+    <div className={` position-relative ${className}`}>
-      <div className="mb-3">
-        {/* <label htmlFor="flatpickr-single" className="form-label">
-          Select Date
-        </label> */}
       <input
         type="text"
-          id="flatpickr-single"
+        className="form-control form-control-sm " 
-          className="form-control"
+        placeholder={placeholder}
-          placeholder="YYYY-MM-DD"
+          defaultValue={
-          ref={inputRef}
+          value ? flatpickr.formatDate(flatpickr.parseDate(value, "Y-m-d"), "d-m-Y") : ""
+        }
+        ref={(el) => {
+          inputRef.current = el;
+          ref(el);
+        }}
+        readOnly={!allowText}
+        autoComplete="off"
       />
-      </div>
+
+      <span
+        className="position-absolute top-50 end-0 pe-1 translate-middle-y cursor-pointer"
+        onClick={() => {
+          if (inputRef.current && inputRef.current._flatpickr) {
+            inputRef.current._flatpickr.open();
+          }
+        }}
+      >
+        <i className="bx bx-calendar bx-sm fs-5 text-muted"></i>
+      </span>
     </div>
   );
 };

src/components/common/DateRangePicker.jsx

@@ -1,6 +1,8 @@
 import React, { useEffect, useRef } from "react";
-
+import { useController, useFormContext, useWatch } from "react-hook-form";
 const DateRangePicker = ({
+  md,
+  sm,
   onRangeChange,
   DateDifference = 7,
   endDateMode = "yesterday",
@@ -25,11 +27,12 @@ const DateRangePicker = ({
       altInput: true,
       altFormat: "d-m-Y",
       defaultDate: [startDate, endDate],
-      static: true,       
+      static: false,
+      // appendTo: document.body,
       clickOpens: true,
-      maxDate: endDate, // ✅ Disable future dates
+      maxDate: endDate,
       onChange: (selectedDates, dateStr) => {
-        const [startDateString, endDateString] = dateStr.split(" to ");
+        const [startDateString, endDateString] = dateStr.split(" To ");
         onRangeChange?.({ startDate: startDateString, endDate: endDateString });
       },
     });
@@ -45,14 +48,129 @@ const DateRangePicker = ({
   }, [onRangeChange, DateDifference, endDateMode]);
 
   return (
+    <div className={`col-${sm} col-sm-${md} px-1 position-relative`}>
       <input
         type="text"
-      className="form-control form-control-sm ms-1"
+        className="form-control form-control-sm ps-2 pe-5  me-4"
         placeholder="From to End"
         id="flatpickr-range"
         ref={inputRef}
       />
+
+      <i
+        className="bx bx-calendar calendar-icon cursor-pointer position-absolute top-50  translate-middle-y "
+        style={{ right: "12px" }}
+      ></i>
+    </div>
   );
 };
 
 export default DateRangePicker;
+
+
+
+
+
+export const DateRangePicker1 = ({
+  startField = "startDate",
+  endField = "endDate",
+  placeholder = "Select date range",
+  className = "",
+  allowText = false,
+  resetSignal, // <- NEW prop
+  ...rest
+}) => {
+  const inputRef = useRef(null);
+  const { control, setValue, getValues } = useFormContext();
+
+  const {
+    field: { ref },
+  } = useController({ name: startField, control });
+
+  const applyDefaultDates = () => {
+    const today = new Date();
+    const past = new Date();
+    past.setDate(today.getDate() - 6);
+
+    const format = (d) => flatpickr.formatDate(d, "d-m-Y");
+    const formattedStart = format(past);
+    const formattedEnd = format(today);
+
+    setValue(startField, formattedStart, { shouldValidate: true });
+    setValue(endField, formattedEnd, { shouldValidate: true });
+
+    if (inputRef.current?._flatpickr) {
+      inputRef.current._flatpickr.setDate([past, today]);
+    }
+  };
+
+  useEffect(() => {
+    if (!inputRef.current || inputRef.current._flatpickr) return;
+
+    const instance = flatpickr(inputRef.current, {
+      mode: "range",
+      dateFormat: "d-m-Y",
+      allowInput: allowText,
+      onChange: (selectedDates) => {
+        if (selectedDates.length === 2) {
+          const [start, end] = selectedDates;
+          const format = (d) => flatpickr.formatDate(d, "d-m-Y");
+          setValue(startField, format(start), { shouldValidate: true });
+          setValue(endField, format(end), { shouldValidate: true });
+        } else {
+          setValue(startField, "", { shouldValidate: true });
+          setValue(endField, "", { shouldValidate: true });
+        }
+      },
+      ...rest,
+    });
+
+    // Apply default if empty
+    const currentStart = getValues(startField);
+    const currentEnd = getValues(endField);
+    if (!currentStart && !currentEnd) {
+      applyDefaultDates();
+    } else if (currentStart && currentEnd) {
+      instance.setDate([
+        flatpickr.parseDate(currentStart, "d-m-Y"),
+        flatpickr.parseDate(currentEnd, "d-m-Y"),
+      ]);
+    }
+
+    return () => instance.destroy();
+  }, []);
+
+  // Reapply default range on resetSignal change
+  useEffect(() => {
+    if (resetSignal !== undefined) {
+      applyDefaultDates();
+    }
+  }, [resetSignal]);
+
+  const start = getValues(startField);
+  const end = getValues(endField);
+  const formattedValue = start && end ? `${start} To ${end}` : "";
+
+  return (
+    <div className={`position-relative ${className}`}>
+      <input
+        type="text"
+        className="form-control form-control-sm"
+        placeholder={placeholder}
+        defaultValue={formattedValue}
+        ref={(el) => {
+          inputRef.current = el;
+          ref(el);
+        }}
+        readOnly={!allowText}
+        autoComplete="off"
+      />
+      <span
+        className="position-absolute top-50 end-0 pe-1 translate-middle-y cursor-pointer"
+        onClick={() => inputRef.current?._flatpickr?.open()}
+      >
+        <i className="bx bx-calendar bx-sm fs-5 text-muted"></i>
+      </span>
+    </div>
+  );
+};

src/components/common/EmployeeSearchInput.jsx

@@ -0,0 +1,96 @@
+import { useState, useEffect } 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 {
+    field: { onChange, value, ref },
+    fieldState: { error },
+  } = useController({ name, control });
+
+  const [search, setSearch] = useState("");
+  const [showDropdown, setShowDropdown] = useState(false);
+  const debouncedSearch = useDebounce(search, 500);
+
+  const {
+    data: employees,
+    isLoading,
+  } = useEmployeesName(projectId, debouncedSearch);
+
+  useEffect(() => {
+    if (value && !search) {
+      const found = employees?.data?.find((emp) => emp.id === value);
+      if (found) setSearch(found.firstName + " " + found.lastName);
+    }
+  }, [value, employees]);
+
+  const handleSelect = (employee) => {
+    onChange(employee.id);
+    setSearch(employee.firstName + " " + employee.lastName);
+    setShowDropdown(false);
+  };
+
+  return (
+    <div className="position-relative">
+      <input
+        type="text"
+        ref={ref}
+        className={`form-control form-control-sm`}
+        placeholder={placeholder}
+        value={search}
+        onChange={(e) => {
+          setSearch(e.target.value);
+          setShowDropdown(true);
+          onChange(""); 
+        }}
+        onFocus={() => {
+          if (search) setShowDropdown(true);
+        }}
+      />
+
+      {showDropdown && (employees?.data?.length > 0 || isLoading) && (
+        <ul
+          className="list-group position-absolute bg-white w-100 shadow z-3 rounded-none px-0"
+          style={{ maxHeight: 200, overflowY: "auto" }}
+        >
+          {isLoading ? (
+            <li className="list-group-item">
+              <a>Searching...</a>
+              
+            </li>
+          ) : (
+            employees?.data?.map((emp) => (
+             <li
+        key={emp.id}
+        className="list-group-item list-group-item-action py-1 px-1"
+        style={{ cursor: "pointer" }}
+        onClick={() => handleSelect(emp)}
+      >
+        <div className="d-flex align-items-center px-0">
+          <Avatar
+            size="xs"
+            classAvatar="m-0 me-2"
+            firstName={emp.firstName}
+            lastName={emp.lastName}
+          />
+          <span className="text-muted">
+            {`${emp?.firstName} ${emp?.lastName}`.trim()}
+          </span>
+        </div>
+      </li>
+            ))
+          )}
+        </ul>
+      )}
+
+      {error && <small className="danger-text">{error.message}</small>}
+    </div>
+  );
+};
+
+export default EmployeeSearchInput;

src/components/common/Error.jsx

@@ -0,0 +1,20 @@
+import React from 'react'
+
+const Error = ({error,close}) => {
+  console.log(error)
+  return (
+      <div className="container text-center py-5">
+      <h1 className="display-4 fw-bold text-danger">{error.statusCode || error?.response?.status
+}</h1>
+      <h2 className="mb-3">Internal Server Error</h2>
+      <p className="lead">
+        {error.message}
+      </p>
+      <a href="/" className="btn btn-primary btn-sm mt-3" onClick={()=>close()}>
+        Go to Home
+      </a>
+    </div>
+  )
+}
+
+export default Error

src/components/common/GlobalModel.jsx

@@ -68,6 +68,21 @@ useEffect(() => {
       backgroundColor: 'rgba(0,0,0,0.3)',
     };
 
+const getPositionClass = (type) => {
+  switch (type) {
+    case 'top':
+      return 'mt-3';
+    case 'bottom':
+      return 'mt-auto mb-0 d-flex flex-column';
+    case 'left':
+      return 'position-absolute top-50 start-0 translate-middle-y me-auto';
+    case 'right':
+      return 'position-absolute top-50 end-0 translate-middle-y ms-auto';
+    case 'center':
+    default:
+      return 'modal-dialog-centered';
+  }
+};
 
   return (
     <div
@@ -80,7 +95,7 @@ useEffect(() => {
       {...dataAttributesProps}
       style={backdropStyle}
     >
-      <div className={`modal-dialog ${dialogClass} ${modalSizeClass } mx-sm-auto mx-1`} role={role} >
+      <div   className={`modal-dialog ${modalSizeClass} ${getPositionClass(modalType)} ${dialogClass} mx-sm-auto mx-1`} role={role}>
         <div className="modal-content">
           <div className="modal-header p-0">
             {/* Close button inside the modal header */}

src/components/common/GlobalOffcanvas .jsx

@@ -0,0 +1,52 @@
+import React, { useEffect, useRef } from "react";
+import { useFab } from "../../Context/FabContext";
+
+const GlobalOffcanvas = () => {
+  const { offcanvas, setIsOffcanvasOpen } = useFab();
+  const offcanvasRef = useRef();
+
+  useEffect(() => {
+    const el = offcanvasRef.current;
+    const bsOffcanvas = new bootstrap.Offcanvas(el);
+
+    const handleShow = () => setIsOffcanvasOpen(true);
+    const handleHide = () => setIsOffcanvasOpen(false);
+
+    el.addEventListener("show.bs.offcanvas", handleShow);
+    el.addEventListener("hidden.bs.offcanvas", handleHide);
+
+    return () => {
+      el.removeEventListener("show.bs.offcanvas", handleShow);
+      el.removeEventListener("hidden.bs.offcanvas", handleHide);
+    };
+  }, []);
+
+  return (
+    <div
+      className="offcanvas offcanvas-end"
+      tabIndex="-1"
+      id="globalOffcanvas"
+      ref={offcanvasRef}
+      aria-labelledby="offcanvasLabel"
+         data-bs-backdrop="false"
+      data-bs-scroll="true"
+    >
+      <div className="offcanvas-header">
+        <h5 className="offcanvas-title" id="offcanvasLabel">
+          {offcanvas.title}
+        </h5>
+        <button
+          type="button"
+          className="btn-close text-reset"
+          data-bs-dismiss="offcanvas"
+          aria-label="Close"
+        ></button>
+      </div>
+      <div className="offcanvas-body  mx-0 py-1 flex-grow-0">
+        {offcanvas.content || <p>No content</p>}
+      </div>
+    </div>
+  );
+};
+
+export default GlobalOffcanvas;

src/components/common/OffcanvasTrigger.jsx

@@ -0,0 +1,26 @@
+import { createPortal } from "react-dom";
+import { useFab } from "../../Context/FabContext";
+
+const OffcanvasTrigger = () => {
+  const { openOffcanvas, offcanvas, showTrigger } = useFab();
+
+  if (!showTrigger || !offcanvas.content) return null;
+
+  const btn = (
+    <i
+      className="bx bx-slider-alt position-fixed p-2 bg-primary text-white rounded-start"
+      onClick={() => openOffcanvas(offcanvas.title, offcanvas.content)} 
+      role="button"
+      style={{
+        top: "25%",
+        right: "0%",
+        cursor: "pointer",
+        zIndex: 1056,
+      }}
+    />
+  );
+
+  return createPortal(btn, document.body);
+};
+
+export default OffcanvasTrigger;

src/components/common/Pagination.jsx

@@ -0,0 +1,84 @@
+import React from "react";
+
+const getPaginationRange = (currentPage, totalPages, delta = 1) => {
+  const range = [];
+  const rangeWithDots = [];
+  let l;
+
+  for (let i = 1; i <= totalPages; i++) {
+    if (
+      i === 1 ||
+      i === totalPages ||
+      (i >= currentPage - delta && i <= currentPage + delta)
+    ) {
+      range.push(i);
+    }
+  }
+
+  for (let i of range) {
+    if (l) {
+      if (i - l === 2) {
+        rangeWithDots.push(l + 1);
+      } else if (i - l !== 1) {
+        rangeWithDots.push("...");
+      }
+    }
+    rangeWithDots.push(i);
+    l = i;
+  }
+
+  return rangeWithDots;
+};
+
+const Pagination = ({ currentPage, totalPages, onPageChange }) => {
+  if (totalPages <= 1) return null;
+
+  const paginationRange = getPaginationRange(currentPage, totalPages);
+
+  return (
+    <nav aria-label="Page navigation">
+      <ul className="pagination pagination-sm justify-content-end py-1 mx-1">
+        <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
+          <button
+            className="page-link btn-xs"
+            onClick={() => onPageChange(currentPage - 1)}
+          >
+            &laquo;
+          </button>
+        </li>
+
+        {paginationRange.map((page, index) => (
+          <li
+            key={index}
+            className={`page-item ${
+              page === currentPage ? "active" : ""
+            } ${page === "..." ? "disabled" : ""}`}
+          >
+            {page === "..." ? (
+              <span className="page-link">…</span>
+            ) : (
+              <button className="page-link" onClick={() => onPageChange(page)}>
+                {page}
+              </button>
+            )}
+          </li>
+        ))}
+
+        <li
+          className={`page-item ${
+            currentPage === totalPages ? "disabled" : ""
+          }`}
+        >
+          <button
+            className="page-link"
+            onClick={() => onPageChange(currentPage + 1)}
+          >
+            &raquo;
+          </button>
+        </li>
+      </ul>
+    </nav>
+  );
+};
+
+export default Pagination;

src/components/common/SelectMultiple.jsx

@@ -1,12 +1,13 @@
 import React, { useState, useEffect, useRef } from "react";
 import { useFormContext } from "react-hook-form";
+import { createPortal } from "react-dom";
 import "./MultiSelectDropdown.css";
 
 const SelectMultiple = ({
   name,
   options = [],
   label = "Select options",
-  labelKey = "name",
+  labelKey = "name", // Can now be a function or a string
   valueKey = "id",
   placeholder = "Please select...",
   IsLoading = false,
@@ -16,11 +17,18 @@ const SelectMultiple = ({
 
   const [isOpen, setIsOpen] = useState(false);
   const [searchText, setSearchText] = useState("");
+  const containerRef = useRef(null);
   const dropdownRef = useRef(null);
 
+  const [dropdownStyles, setDropdownStyles] = useState({ top: 0, left: 0, width: 0 });
+
   useEffect(() => {
     const handleClickOutside = (e) => {
-      if (dropdownRef.current && !dropdownRef.current.contains(e.target)) {
+      if (
+        containerRef.current &&
+        !containerRef.current.contains(e.target) &&
+        (!dropdownRef.current || !dropdownRef.current.contains(e.target))
+      ) {
         setIsOpen(false);
       }
     };
@@ -28,6 +36,21 @@ const SelectMultiple = ({
     return () => document.removeEventListener("mousedown", handleClickOutside);
   }, []);
 
+  useEffect(() => {
+    if (isOpen && containerRef.current) {
+      const rect = containerRef.current.getBoundingClientRect();
+      setDropdownStyles({
+        top: rect.bottom + window.scrollY,
+        left: rect.left + window.scrollX,
+        width: rect.width,
+      });
+    }
+  }, [isOpen]);
+
+  const getLabel = (item) => {
+    return typeof labelKey === "function" ? labelKey(item) : item[labelKey];
+  };
+
   const handleCheckboxChange = (value) => {
     const updated = selectedValues.includes(value)
       ? selectedValues.filter((v) => v !== value)
@@ -36,35 +59,98 @@ const SelectMultiple = ({
     setValue(name, updated, { shouldValidate: true });
   };
 
-  const filteredOptions = options.filter((item) =>
+  const filteredOptions = options.filter((item) => {
-    item[labelKey]?.toLowerCase().includes(searchText.toLowerCase())
+    const label = getLabel(item);
+    return label?.toLowerCase().includes(searchText.toLowerCase());
+  });
+
+  const dropdownElement = (
+    <div
+      ref={dropdownRef}
+      className="multi-select-dropdown-options"
+      style={{
+        position: "absolute",
+        top: dropdownStyles.top,
+        left: dropdownStyles.left,
+        width: dropdownStyles.width,
+        zIndex: 9999,
+        backgroundColor: "white",
+        boxShadow: "0 2px 8px rgba(0,0,0,0.15)",
+        borderRadius: 4,
+        maxHeight: 300,
+        overflowY: "auto",
+      }}
+    >
+      <div className="multi-select-dropdown-search" style={{ padding: 8 }}>
+        <input
+          type="text"
+          placeholder="Search..."
+          value={searchText}
+          onChange={(e) => setSearchText(e.target.value)}
+          className="multi-select-dropdown-search-input"
+          style={{ width: "100%", padding: 4 }}
+        />
+      </div>
+
+      {filteredOptions.map((item) => {
+        const labelVal = getLabel(item);
+        const valueVal = item[valueKey];
+        const isChecked = selectedValues.includes(valueVal);
+
+        return (
+          <div
+            key={valueVal}
+            className={`multi-select-dropdown-option ${isChecked ? "selected" : ""}`}
+            style={{ display: "flex", alignItems: "center", padding: "4px 8px" }}
+          >
+            <input
+              type="checkbox"
+              className="custom-checkbox form-check-input"
+              checked={isChecked}
+              onChange={() => handleCheckboxChange(valueVal)}
+              style={{ marginRight: 8 }}
+            />
+            <label className="text-secondary">{labelVal}</label>
+          </div>
+        );
+      })}
+
+      {!IsLoading && filteredOptions.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 && (
+        <div className="multi-select-dropdown-Not-found" style={{ padding: 8 }}>
+          <label className="text-muted">Loading...</label>
+        </div>
+      )}
+    </div>
   );
 
   return (
-    <div ref={dropdownRef} className="multi-select-dropdown-container">
+    <>
+      <div ref={containerRef} className="multi-select-dropdown-container" style={{ position: "relative" }}>
         <label className="form-label mb-1">{label}</label>
 
         <div
           className="multi-select-dropdown-header"
           onClick={() => setIsOpen((prev) => !prev)}
+          style={{ cursor: "pointer" }}
         >
           <span
             className={
-            selectedValues.length > 0
+              selectedValues.length > 0 ? "placeholder-style-selected" : "placeholder-style"
-              ? "placeholder-style-selected"
-              : "placeholder-style"
             }
           >
             <div className="selected-badges-container">
               {selectedValues.length > 0 ? (
                 selectedValues.map((val) => {
                   const found = options.find((opt) => opt[valueKey] === val);
+                  const label = found ? getLabel(found) : "";
                   return (
-                  <span
+                    <span key={val} className="badge badge-selected-item mx-1 mb-1">
-                    key={val}
+                      {label}
-                    className="badge badge-selected-item mx-1 mb-1"
-                  >
-                    {found ? found[labelKey] : ""}
                     </span>
                   );
                 })
@@ -75,56 +161,10 @@ const SelectMultiple = ({
           </span>
           <i className="bx bx-chevron-down"></i>
         </div>
-
-      {isOpen && (
-        <div className="multi-select-dropdown-options">
-          <div className="multi-select-dropdown-search">
-            <input
-              type="text"
-              placeholder="Search..."
-              value={searchText}
-              onChange={(e) => setSearchText(e.target.value)}
-              className="multi-select-dropdown-search-input"
-            />
       </div>
 
-          {filteredOptions.map((item) => {
+      {isOpen && createPortal(dropdownElement, document.body)}
-            const labelVal = item[labelKey];
+    </>
-            const valueVal = item[valueKey];
-            const isChecked = selectedValues.includes(valueVal);
-
-            return (
-              <div
-                key={valueVal}
-                className={`multi-select-dropdown-option ${
-                  isChecked ? "selected" : ""
-                }`}
-              >
-                <input
-                  type="checkbox"
-                  className="custom-checkbox form-check-input"
-                  checked={isChecked}
-                  onChange={() => handleCheckboxChange(valueVal)}
-                />
-                <label className="text-secondary">{labelVal}</label>
-              </div>
-            );
-          })}
-          {!IsLoading && filteredOptions.length === 0 && (
-            <div className="multi-select-dropdown-Not-found">
-              <label className="text-muted">
-                Not Found {`'${searchText}'`}
-              </label>
-            </div>
-          )}
-          {IsLoading && filteredOptions.length === 0 && (
-            <div className="multi-select-dropdown-Not-found">
-              <label className="text-muted">Loading...</label>
-            </div>
-          )}
-        </div>
-      )}
-    </div>
   );
 };
 

src/components/master/CreateActivity.jsx

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

src/components/master/ManageExpenseStatus.jsx

@@ -0,0 +1,165 @@
+import React, { useEffect } from "react";
+import {
+  useForm,
+  FormProvider,
+} from "react-hook-form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import SelectMultiple from "../common/SelectMultiple";
+import { useFeatures } from "../../hooks/useMasterRole";
+import { EXPENSE_MANAGEMENT } from "../../utils/constants";
+import { useCreateExpenseStatus, useUpdateExpenseStatus } from "../../hooks/masterHook/useMaster";
+import { displayName } from "react-quill";
+import { AppColorconfig } from "../../utils/appUtils";
+
+const ExpenseStatusSchema = z.object({
+  name: z.string().min(1, { message: "Name is required" }),
+  displayName: z.string().min(1, { message: "Display Name is required" }),
+  description: z.string().min(1, { message: "Description is required" }),
+  permissionIds: z.array(z.string()).min(1, {
+    message: "At least one permission is required",
+  }),
+  color: z
+    .string()
+    .regex(/^#([0-9A-F]{3}){1,2}$/i, { message: "Invalid hex color" }),
+});
+
+const ManageExpenseStatus = ({data, onClose }) => {
+  const methods = useForm({
+    resolver: zodResolver(ExpenseStatusSchema),
+    defaultValues: {
+      name: "",
+      displayName: "",
+      description: "",
+      permissionIds: [],
+      color: AppColorconfig.colors.primary,
+    },
+  });
+
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = methods;
+
+  const { masterFeatures, loading } = useFeatures();
+
+  const ExpenseFeature = masterFeatures?.find(
+    (appfeature) => appfeature.id === EXPENSE_MANAGEMENT
+  );
+  const {mutate:CreateExpenseStatus,isPending:isPending} = useCreateExpenseStatus(()=>onClose?.())
+  const {mutate:UpdateExpenseStatus,isPending:Updating} = useUpdateExpenseStatus(()=>onClose?.());
+
+
+
+  const onSubmit = (payload) => {
+  if(data){
+        UpdateExpenseStatus({id:data.id,payload:{...payload,id:data.id}})
+  }else{
+     CreateExpenseStatus(payload)
+  }
+  };
+
+
+  useEffect(()=>{
+    if(data){
+     reset({
+        name:data.name ?? "",
+        displayName:data.displayName ?? "",
+        description:data.description ?? "",
+        permissionIds:data.permissionIds ?? [],
+        color:data.color ?? AppColorconfig.colors.primary
+      })
+    }
+  },[data])
+  return (
+    <FormProvider {...methods}>
+      {loading ? (
+        <div>Loading...</div>
+      ) : (
+        <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+          <div className="col-12">
+            <label className="form-label">Expense Status Name</label>
+            <input
+              type="text"
+              {...register("name")}
+              className={`form-control ${errors.name ? "is-invalid" : ""}`}
+            />
+            {errors.name && <p className="text-danger">{errors.name.message}</p>}
+          </div>
+
+          <div className="col-12">
+            <label className="form-label">Status Display Name</label>
+            <input
+              type="text"
+              {...register("displayName")}
+              className={`form-control ${errors.displayName ? "is-invalid" : ""}`}
+            />
+            {errors.displayName && (
+              <p className="text-danger">{errors.displayName.message}</p>
+            )}
+          </div>
+
+          <div className="col-12">
+            <SelectMultiple
+              name="permissionIds"
+              label="Select Permissions"
+              options={ExpenseFeature?.featurePermissions || []}
+              labelKey="name"
+              valueKey="id"
+              IsLoading={loading}
+            />
+            {errors.permissionIds && (
+              <p className="text-danger">{errors.permissionIds.message}</p>
+            )}
+          </div>
+
+          <div className="col-12">
+            <label className="form-label">Select Color</label>
+            <input
+              type="color"
+              className={`form-control form-control ${errors.color ? "is-invalid" : ""}`}
+              {...register("color")}
+            />
+            {errors.color && (
+              <p className="text-danger">{errors.color.message}</p>
+            )}
+          </div>
+
+          <div className="col-12">
+            <label className="form-label">Description</label>
+            <textarea
+              rows="3"
+              {...register("description")}
+              className={`form-control ${errors.description ? "is-invalid" : ""}`}
+            />
+            {errors.description && (
+              <p className="text-danger">{errors.description.message}</p>
+            )}
+          </div>
+
+          <div className="col-12 text-center">
+            <button
+              type="submit"
+              className="btn btn-sm btn-primary me-3"
+              disabled={isPending || Updating}
+            >
+              {isPending || Updating ? "Please Wait..." : Updating ? "Update" : "Submit"}
+            </button>
+            <button
+              type="button"
+              className="btn btn-sm btn-secondary"
+              onClick={onClose}
+              disabled={isPending || Updating}
+            >
+              Cancel
+            </button>
+          </div>
+        </form>
+      )}
+    </FormProvider>
+  );
+};
+
+export default ManageExpenseStatus;

src/components/master/ManageExpenseType.jsx

@@ -0,0 +1,113 @@
+import React, { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+  useCreateExpenseType,
+  useUpdateExpenseType,
+} from "../../hooks/masterHook/useMaster";
+
+const ExpnseSchema = z.object({
+  name: z.string().min(1, { message: "Name is required" }),
+  noOfPersonsRequired: z.boolean().default(false),
+  description: z.string().min(1, { message: "Description is required" }),
+});
+
+const ManageExpenseType = ({ data = null, onClose }) => {
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = useForm({
+    resolver: zodResolver(ExpnseSchema),
+    defaultValues: { name: "", noOfPersonsRequired: false, description: "" },
+  });
+  const { mutate: UpdateExpenseType, isPending:isPendingUpdate } = useUpdateExpenseType(
+    () => onClose?.()
+  );
+  const { mutate: CreateExpenseType, isPending } = useCreateExpenseType(() =>
+    onClose?.()
+  );
+
+  const onSubmit = (payload) => {
+    if (data) {
+      UpdateExpenseType({
+        id: data.id,
+        payload: { ...payload, id: data.id },
+      });
+    } else {
+      CreateExpenseType(payload);
+    }
+  };
+
+  useEffect(() => {
+    if (data) {
+      reset({
+        name: data.name ?? "",
+        noOfPersonsRequired: data.noOfPersonsRequired ?? false,
+        description: data.description ?? "",
+      });
+    }
+  }, [data]);
+  return (
+    <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="form-label">Expesne Type Name</label>
+        <input
+          type="text"
+          {...register("name")}
+          className={`form-control ${errors.name ? "is-invalids" : ""}`}
+        />
+        {errors.name && <p className="danger-text">{errors.name.message}</p>}
+      </div>
+      <div className="col-12 col-md-12">
+        <label className="form-label" htmlFor="description">
+          Description
+        </label>
+        <textarea
+          rows="3"
+          {...register("description")}
+          className={`form-control ${errors.description ? "is-invalids" : ""}`}
+        ></textarea>
+
+        {errors.description && (
+          <p className="danger-text">{errors.description.message}</p>
+        )}
+      </div>
+      <div className="col-12 col-md-12 d-flex align-items-center">
+        <label className="from-label">No. of Persons Required </label>{" "}
+        <input
+          type="checkbox"
+          className="form-check-input  ms-2"
+          {...register("noOfPersonsRequired")}
+        />
+      </div>
+      <div className="col-12 text-center">
+        <button
+          type="submit"
+          className="btn btn-sm btn-primary me-3"
+          disabled={isPending || isPendingUpdate}
+        >
+          {isPending || isPendingUpdate
+            ? "Please Wait..."
+            : data
+            ? "Update"
+            : "Submit"}
+        </button>
+        <button
+          type="reset"
+          className="btn btn-sm btn-label-secondary "
+          data-bs-dismiss="modal"
+          aria-label="Close"
+          disabled={isPending || isPendingUpdate}
+          onClick={()=>onClose()}
+        >
+          Cancel
+        </button>
+      </div>
+    </form>
+  );
+};
+
+export default ManageExpenseType;

src/components/master/ManagePaymentMode.jsx

@@ -0,0 +1,95 @@
+import React, { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useCreatePaymentMode, useUpdatePaymentMode } from "../../hooks/masterHook/useMaster";
+
+const ExpnseSchema = z.object({
+  name: z.string().min(1, { message: "Name is required" }),
+  description: z.string().min(1, { message: "Description is required" }),
+});
+
+const ManagePaymentMode = ({ data = null, onClose }) => {
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = useForm({
+    resolver: zodResolver(ExpnseSchema),
+    defaultValues: { name: "",  description: "" },
+  });
+
+  const { mutate: CreatePaymentMode, isPending } = useCreatePaymentMode(() =>
+    onClose?.()
+  );
+  const {mutate:UpdatePaymentMode,isPending:Updating} = useUpdatePaymentMode(()=>onClose?.())
+
+  const onSubmit = (payload) => {
+    if(data){
+        UpdatePaymentMode({id:data.id,payload:{...payload,id:data.id}})
+    }else(
+        CreatePaymentMode(payload)
+    )
+    
+  };
+
+  useEffect(()=>{
+    if(data){ 
+      reset({
+        name:data.name ?? "",
+        description:data.description ?? ""
+      })
+    }
+  },[data])
+
+
+  return (
+    <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="form-label">Payment Mode Name</label>
+        <input
+          type="text"
+          {...register("name")}
+          className={`form-control ${errors.name ? "is-invalids" : ""}`}
+        />
+        {errors.name && <p className="danger-text">{errors.name.message}</p>}
+      </div>
+      <div className="col-12 col-md-12">
+        <label className="form-label" htmlFor="description">
+          Description
+        </label>
+        <textarea
+          rows="3"
+          {...register("description")}
+          className={`form-control ${errors.description ? "is-invalids" : ""}`}
+        ></textarea>
+
+        {errors.description && (
+          <p className="danger-text">{errors.description.message}</p>
+        )}
+      </div>
+
+      <div className="col-12 text-center">
+        <button
+          type="submit"
+          className="btn btn-sm btn-primary me-3"
+          disabled={isPending || Updating}
+        >
+          {isPending || Updating? "Please Wait..." : Updating ? "Update" : "Submit"}
+        </button>
+        <button
+          type="reset"
+          className="btn btn-sm btn-label-secondary "
+          data-bs-dismiss="modal"
+          aria-label="Close"
+          disabled={isPending || Updating}
+        >
+          Cancel
+        </button>
+      </div>
+    </form>
+  );
+};
+
+export default ManagePaymentMode;

src/components/master/MasterModal.jsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from "react";
-
 import CreateRole from "./CreateRole";
 import DeleteMaster from "./DeleteMaster";
 import EditRole from "./EditRole";
@@ -18,67 +17,45 @@ import CreateContactTag from "./CreateContactTag";
 import EditContactCategory from "./EditContactCategory";
 import EditContactTag from "./EditContactTag";
 import { useDeleteMasterItem } from "../../hooks/masterHook/useMaster";
+import ManageExpenseType from "./ManageExpenseType";
+import ManagePaymentMode from "./ManagePaymentMode";
+import ManageExpenseStatus from "./ManageExpenseStatus";
+
 
 const MasterModal = ({ modaldata, closeModal }) => {
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const { mutate: deleteMasterItem, isPending } = useDeleteMasterItem();
 
-  // const handleSelectedMasterDeleted = async () =>
-  // {
-  //   debugger
-  //   const deleteFn = MasterRespository[modaldata.masterType];
-  //   if (!deleteFn) {
-  //     showToast(`No delete strategy defined for master type`,"error");
-  //     return false;
-  //   }
-  //    try
-  //    {
-  //      const response = await deleteFn( modaldata?.item?.id );
-  //      const selected_cachedData = getCachedData( modaldata?.masterType );
-  //      const updated_master =  selected_cachedData?.filter(item => item.id !== modaldata?.item.id);
-  //      cacheData( modaldata?.masterType, updated_master )
-
-  //      showToast(`${modaldata?.masterType} is deleted successfully`, "success");
-  //      handleCloseDeleteModal()
-
-  //    } catch ( error )
-  //    {
-  //      const message = error.response.data.message || error.message || "Error occured api during call"
-  //      showToast(message, "success");
-  //   }
-  // }
-
   const handleSelectedMasterDeleted = () => {
-    if (!modaldata?.masterType || !modaldata?.item?.id) {
+    const { masterType, item, validateFn } = modaldata || {};
+    if (!masterType || !item?.id) {
       showToast("Missing master type or item", "error");
       return;
     }
+
     deleteMasterItem(
-      {
+      { masterType, item, validateFn },
-        masterType: modaldata.masterType,
+      { onSuccess: handleCloseDeleteModal }
-        item: modaldata.item,
-        validateFn: modaldata.validateFn, // optional
-      },
-      {
-        onSuccess: () => {
-          handleCloseDeleteModal();
-        },
-      }
     );
   };
 
+  const handleCloseDeleteModal = () => {
+    setIsDeleteModalOpen(false);
+    closeModal();
+  };
+
   useEffect(() => {
     if (modaldata?.modalType === "delete") {
       setIsDeleteModalOpen(true);
     }
   }, [modaldata]);
 
-  const handleCloseDeleteModal = () => {
+  if (!modaldata?.modalType) {
-    setIsDeleteModalOpen(false);
     closeModal();
-  };
+    return null;
+  }
 
-  if (modaldata?.modalType === "delete" && isDeleteModalOpen) {
+  if (modaldata.modalType === "delete" && isDeleteModalOpen) {
     return (
       <div
         className="modal fade show"
@@ -90,86 +67,69 @@ const MasterModal = ({ modaldata, closeModal }) => {
         <ConfirmModal
           type="delete"
           header={`Delete ${modaldata.masterType}`}
-          message={"Are you sure you want delete?"}
+          message="Are you sure you want delete?"
           onSubmit={handleSelectedMasterDeleted}
           onClose={handleCloseDeleteModal}
         />
       </div>
     );
   }
+
+  const renderModalContent = () => {
+    const { modalType, item, masterType } = modaldata;
+
+    const modalComponents = {
+      "Application Role": <CreateRole masmodalType={masterType} onClose={closeModal} />,
+      "Edit-Application Role": <EditRole master={modaldata} onClose={closeModal} />,
+      "Job Role": <CreateJobRole onClose={closeModal} />,
+      "Edit-Job Role": <EditJobRole data={item} onClose={closeModal} />,
+      "Activity": <CreateActivity onClose={closeModal} />,
+      "Edit-Activity": <EditActivity activityData={item} onClose={closeModal} />,
+      "Work Category": <CreateWorkCategory onClose={closeModal} />,
+      "Edit-Work Category": <EditWorkCategory data={item} onClose={closeModal} />,
+      "Contact Category": <CreateCategory data={item} onClose={closeModal} />,
+      "Edit-Contact Category": <EditContactCategory data={item} onClose={closeModal} />,
+      "Contact Tag": <CreateContactTag data={item} onClose={closeModal} />,
+      "Edit-Contact Tag": <EditContactTag data={item} onClose={closeModal} />,
+      "Expense Type":<ManageExpenseType  onClose={closeModal} />,
+      "Edit-Expense Type":<ManageExpenseType data={item} onClose={closeModal} />,
+      "Payment Mode":<ManagePaymentMode onClose={closeModal}/>,
+      "Edit-Payment Mode":<ManagePaymentMode data={item} onClose={closeModal}/>,
+      "Expense Status":<ManageExpenseStatus onClose={closeModal}/>,
+      "Edit-Expense Status":<ManageExpenseStatus data={item} onClose={closeModal}/>
+    };
+
+    return modalComponents[modalType] || null;
+  };
+
+  const isLargeModal = ["Application Role", "Edit-Application Role"].includes(
+    modaldata.modalType
+  );
+
   return (
     <div
-      className="modal fade"
+      className="modal fade show"
       id="master-modal"
       tabIndex="-1"
-      aria-hidden="true"
       role="dialog"
+      aria-hidden="true"
       aria-labelledby="modalToggleLabel"
+      style={{ display: "block" }}
     >
-      <div
+      <div className={`modal-dialog mx-sm-auto mx-1 ${isLargeModal ? "modal-lg" : "modal-md"} modal-simple`}>
-        className={`modal-dialog mx-sm-auto mx-1 ${
-          ["Application Role", "Edit-Application Role"].includes(
-            modaldata?.modalType
-          )
-            ? "modal-lg"
-            : "modal-md"
-        } modal-simple`}
-      >
         <div className="modal-content">
           <div className="modal-body p-sm-4 p-0">
             <div className="d-flex justify-content-between">
-              <h6>{`${modaldata?.modalType} `}</h6>
+              <h6>{modaldata?.modalType}</h6>
               <button
                 type="button"
                 className="btn-close"
                 data-bs-dismiss="modal"
                 aria-label="Close"
                 onClick={closeModal}
-              ></button>
+              />
             </div>
-
+            {renderModalContent()}
-            {modaldata.modalType === "Application Role" && (
-              <CreateRole
-                masmodalType={modaldata.masterType}
-                onClose={closeModal}
-              />
-            )}
-            {modaldata.modalType === "Edit-Application Role" && (
-              <EditRole master={modaldata} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Job Role" && (
-              <CreateJobRole onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Edit-Job Role" && (
-              <EditJobRole data={modaldata.item} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Activity" && (
-              <CreateActivity onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Edit-Activity" && (
-              <EditActivity
-                activityData={modaldata.item}
-                onClose={closeModal}
-              />
-            )}
-            {modaldata.modalType === "Work Category" && (
-              <CreateWorkCategory onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Edit-Work Category" && (
-              <EditWorkCategory data={modaldata.item} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Contact Category" && (
-              <CreateCategory data={modaldata.item} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Edit-Contact Category" && (
-              <EditContactCategory data={modaldata.item} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Contact Tag" && (
-              <CreateContactTag data={modaldata.item} onClose={closeModal} />
-            )}
-            {modaldata.modalType === "Edit-Contact Tag" && (
-              <EditContactTag data={modaldata.item} onClose={closeModal} />
-            )}
           </div>
         </div>
       </div>

src/data/masters.js

@@ -1,153 +1,157 @@
 // it important ------
-export const mastersList = [ {id: 1, name: "Application Role"}, {id: 2, name: "Job Role"}, {id: 3, name: "Activity"},{id: 4, name:"Work Category"},{id:5,name:"Contact Category"},{id:6,name:"Contact Tag"}]
+export const mastersList = [
+  { id: 1, name: "Application Role" },
+  { id: 2, name: "Job Role" },
+  { id: 3, name: "Activity" },
+  { id: 4, name: "Work Category" },
+  { id: 5, name: "Contact Category" },
+  { id: 6, name: "Contact Tag" },
+  { id: 7, name: "Expense Type" },
+  { id: 8, name: "Payment Mode" },
+  { id: 9, name: "Expense Status" },
+];
 // -------------------
 
-export const dailyTask = [
+// export const dailyTask = [
-    {
+//     {
-        id:1,
+//         id:1,
-        project:{
+//         project:{
-            projectName:"Project Name1",
+//             projectName:"Project Name1",
-            building:"buildName1",
+//             building:"buildName1",
-            floor:"floorName1",
+//             floor:"floorName1",
-            workArea:"workarea1"
+//             workArea:"workarea1"
-        },
+//         },
-        target:80,
+//         target:80,
-        employees:[
+//         employees:[
-            {
+//             {
-                id:1,
+//                 id:1,
-                name:"Vishal Patil",
+//                 name:"Vishal Patil",
-                role:"helper"
+//                 role:"helper"
-            },
+//             },
-            {
+//             {
-                id:202,
+//                 id:202,
-                name:"Vishal Patil",
+//                 name:"Vishal Patil",
-                role:"helper"
+//                 role:"helper"
-            },
+//             },
-            {
+//             {
-                id:101,
+//                 id:101,
-                name:"Kushal Patil",
+//                 name:"Kushal Patil",
-                role:"Engineer"
+//                 role:"Engineer"
-            }
+//             }
-        ]
+//         ]
-        
-    },
-    {
-        id:2,
-        project:{
-            projectName:"Project Name1",
-            building:"buildName1",
-            floor:"floorName1",
-            workArea:"workarea1"
-        },
-        target:90,
-        employees:[
-            {
-                id:1,
-                name:"Vishal Patil",
-                role:"welder"
-            },
-            {
-                id:202,
-                name:"Vishal Patil",
-                role:"welder"
-            },
-            {
-                id:101,
-                name:"Kushal Patil",
-                role:"Site Engineer"
-            }
-        ]
-        
-    }
-]
-
-
-
-export const jobRoles =[
-    {
-        id:1,
-        name:"Project Manager"
-    },
-    {
-        id:2,
-        name:"Software Developer"
-    },
-    {
-        id:3,
-        name:"Estimation Engineer"
-    },
-    {
-        id:4,
-        name:"Designer"
-    },
-    {
-        id:5,
-        name:"Site Engineer"
-    }
-]
-
-export const employee =[
-    {
-        id:1,
-        FirtsName:"Pramod",
-        LastName:"Mahajan",
-        JobRoleId:2,
-    },
-    {
-        id:2,
-        FirtsName:"Akahsy",
-        LastName:"Patil",
-        JobRoleId:1,
-    },
-    {
-        id:3,
-        FirtsName:"janvi",
-        LastName:"Potdar",
-        JobRoleId:3,
-    },
-    {
-        id:4,
-        FirtsName:"Aboli",
-        LastName:"Patil",
-        JobRoleId:2,
-    },
-    {
-        id:5,
-        FirtsName:"Shubham",
-        LastName:"Tamboli",
-        JobRoleId:1,
-    },
-    {
-        id:6,
-        FirtsName:"Alwin",
-        LastName:"Joy",
-        JobRoleId:4,
-    },
-    {
-        id:7,
-        FirtsName:"John",
-        LastName:"kwel",
-        JobRoleId:4,
-    },
-    {
-        id:8,
-        FirtsName:"Gita",
-        LastName:"shaha",
-        JobRoleId:1,
-    },{
-        id:9,
-        FirtsName:"Pratik",
-        LastName:"Joshi",
-        JobRoleId:5,
-    },
-    {
-        id:10,
-        FirtsName:"Nikil",
-        LastName:"Patil",
-        JobRoleId:5,
-    }
-]
 
+//     },
+//     {
+//         id:2,
+//         project:{
+//             projectName:"Project Name1",
+//             building:"buildName1",
+//             floor:"floorName1",
+//             workArea:"workarea1"
+//         },
+//         target:90,
+//         employees:[
+//             {
+//                 id:1,
+//                 name:"Vishal Patil",
+//                 role:"welder"
+//             },
+//             {
+//                 id:202,
+//                 name:"Vishal Patil",
+//                 role:"welder"
+//             },
+//             {
+//                 id:101,
+//                 name:"Kushal Patil",
+//                 role:"Site Engineer"
+//             }
+//         ]
 
+//     }
+// ]
 
+// export const jobRoles =[
+//     {
+//         id:1,
+//         name:"Project Manager"
+//     },
+//     {
+//         id:2,
+//         name:"Software Developer"
+//     },
+//     {
+//         id:3,
+//         name:"Estimation Engineer"
+//     },
+//     {
+//         id:4,
+//         name:"Designer"
+//     },
+//     {
+//         id:5,
+//         name:"Site Engineer"
+//     }
+// ]
 
+// export const employee =[
+//     {
+//         id:1,
+//         FirtsName:"Pramod",
+//         LastName:"Mahajan",
+//         JobRoleId:2,
+//     },
+//     {
+//         id:2,
+//         FirtsName:"Akahsy",
+//         LastName:"Patil",
+//         JobRoleId:1,
+//     },
+//     {
+//         id:3,
+//         FirtsName:"janvi",
+//         LastName:"Potdar",
+//         JobRoleId:3,
+//     },
+//     {
+//         id:4,
+//         FirtsName:"Aboli",
+//         LastName:"Patil",
+//         JobRoleId:2,
+//     },
+//     {
+//         id:5,
+//         FirtsName:"Shubham",
+//         LastName:"Tamboli",
+//         JobRoleId:1,
+//     },
+//     {
+//         id:6,
+//         FirtsName:"Alwin",
+//         LastName:"Joy",
+//         JobRoleId:4,
+//     },
+//     {
+//         id:7,
+//         FirtsName:"John",
+//         LastName:"kwel",
+//         JobRoleId:4,
+//     },
+//     {
+//         id:8,
+//         FirtsName:"Gita",
+//         LastName:"shaha",
+//         JobRoleId:1,
+//     },{
+//         id:9,
+//         FirtsName:"Pratik",
+//         LastName:"Joshi",
+//         JobRoleId:5,
+//     },
+//     {
+//         id:10,
+//         FirtsName:"Nikil",
+//         LastName:"Patil",
+//         JobRoleId:5,
+//     }
+// ]

src/data/menuData.json

@@ -66,6 +66,12 @@
                 "available": true,
                 "link": "/gallary"
             },
+            {
+                "text": "Expense",
+                "icon": "bx bx-receipt",
+                "available": true,
+                "link": "/expenses"
+            },
             {
                 "text": "Administration",
                 "icon": "bx bx-box",

src/hooks/masterHook/useMaster.js

@@ -12,213 +12,6 @@ import showToast from "../../services/toastService";
 
 
 
-// const useMaster = () => {
-
-//   const selectedMaster = useSelector((store)=>store.localVariables.selectedMaster);
-//   const [data, setData] = useState([]);
-//   const [loading, setLoading] = useState(true);
-//   const [error, setError] = useState("");
-//   useEffect(() => {
-//     const fetchData = async () => {
-//       if (!selectedMaster) return;
-//       setLoading(true);
-//       try {
-//         const cachedData = getCachedData(selectedMaster);
-//         if (cachedData) {
-          
-//           setData(cachedData);
-          
-//         } else {
-//           let response;
-//           switch (selectedMaster) {
-//             case "Application Role":
-//               response = await MasterRespository.getRoles();
-//               response = response.data;
-//               break;
-//             case "Job Role":
-//               response = await MasterRespository.getJobRole();
-//               response = response.data
-//                 break;
-//             case "Activity":
-//               response = await MasterRespository.getActivites();
-//               response = response.data
-//               break;
-//             case "Work Category":
-//               response = await MasterRespository.getWorkCategory();
-//               response = response.data
-//               break;
-//             case "Contact Category":
-//               response = await MasterRespository.getContactCategory();
-//               response = response.data
-//               break;
-//             case "Contact Tag":
-//               response = await MasterRespository.getContactTag();
-//               response = response.data
-//               break;
-//             case "Status":
-//               response = [{description: null,featurePermission: null,id: "02dd4761-363c-49ed-8851-3d2489a3e98d",status:"status 1"},{description: null,featurePermission: null,id: "03dy9761-363c-49ed-8851-3d2489a3e98d",status:"status 2"},{description: null,featurePermission: null,id: "03dy7761-263c-49ed-8851-3d2489a3e98d",status:"Status 3"}];
-//               break;
-//             default:
-//               response = [];
-//           }
-
-//           if (response) {
-//             setData(response);
-//             cacheData(selectedMaster, response);
-//           }
-//         }
-//       } catch (err) {
-//         setError("Failed to fetch data.");
-//       } finally {
-//         setLoading(false);
-//       }
-//     };
-
-//     if ( selectedMaster )
-//     {
-     
-//       fetchData();
-//     }
-    
-//   }, [selectedMaster]);
-
-  
-
-//   return { data, loading, error }
-// };
-
-
-
-
-// export const useActivitiesMaster = () =>
-//   {
-//     const [ activities, setActivites ] = useState( [] )
-//     const [ loading, setloading ] = useState( false );
-//     const [ error, setError ] = useState()
-//       const fetchActivities =async () =>  {
-//           setloading(true);
-//           try {
-//             const response = await MasterRespository.getActivites();
-//             setActivites(response.data);
-//             cacheData( "ActivityMaster", response.data );
-//             setloading(false);
-//           } catch (err) {
-//             setError(err);
-//             setloading(false);
-//           } 
-//        }
-//     useEffect( () =>
-//     {
-//       const cacheddata = getCachedData( "ActivityMaster" );
-//       if ( !cacheddata )
-//       {
-//              fetchActivities()
-//       } else
-//       {
-//            setActivites(cacheddata);
-//       }
-//     }, [] )
-    
-//     return {activities,loading,error}
-//   }
-
-//   export const useWorkCategoriesMaster = () =>
-//     {
-//       const [ categories, setCategories ] = useState( [] )
-//       const [ categoryLoading, setloading ] = useState( false );
-//       const [ categoryError, setError ] = useState( "" )
-    
-//         const fetchCategories =async () =>  {
-//           const cacheddata = getCachedData("Work Category");
-    
-//           if (!cacheddata) {
-//             setloading(true);
-//             try {
-//               const response = await MasterRespository.getWorkCategory();
-//               setCategories(response.data);
-//               cacheData("Work Category", response.data);
-//             } catch (err) {
-//               setError(err);
-//               console.log(err);
-//             } finally {
-//               setloading(false);
-//             }
-//           } else {
-//             setCategories(cacheddata);
-//           }
-//          }
-//       useEffect( () =>
-//       {
-//         fetchCategories()
-//       }, [] )
-      
-//       return {categories,categoryLoading,categoryError}
-// }
-    
-// export const useContactCategory = () =>
-// {
-//   const [ contactCategory, setContactCategory ] = useState( [] )
-//   const [ loading, setLoading ] = useState( false )
-//   const [ Error, setError ] = useState()
-  
-//   const fetchConatctCategory = async() =>
-//   {
-//     const cache_Category = getCachedData( "Contact Category" );
-//     if ( !cache_Category )
-//     {
-//       try
-//       {
-//         let resp = await MasterRespository.getContactCategory();
-//         setContactCategory( resp.data );
-//         cacheData("Contact Category",resp.data)
-//       } catch ( error )
-//       {
-//         setError(error)
-//       }
-//     } else
-//     {
-//       setContactCategory(cache_Category)
-//     }
-//   }
-
-//   useEffect( () =>
-//   {
-//     fetchConatctCategory()
-//   }, [] )
-//   return { contactCategory,loading,Error}
-// }
-// export const useContactTags = () => {
-//   const [contactTags, setContactTags] = useState([]);
-//   const [loading, setLoading] = useState(false);
-//   const [error, setError] = useState(null);
-
-//   useEffect(() => {
-//     const fetchContactTag = async () => {
-//       const cache_Tags = getCachedData("Contact Tag");
-
-//       if (!cache_Tags) {
-//         setLoading(true);
-//         try {
-//           const resp = await MasterRespository.getContactTag();
-//           setContactTags(resp.data);
-//           cacheData("Contact Tag", resp.data);
-//         } catch (err) {
-//           setError(err);
-//         } finally {
-//           setLoading(false);
-//         }
-//       } else {
-//         setContactTags(cache_Tags);
-//       }
-//     };
-
-//     fetchContactTag();
-//   }, []);
-
-//   return { contactTags, loading, error };
-// };
-
-// Separate matser-------------
 
 export const useActivitiesMaster = () =>
 {
@@ -300,6 +93,76 @@ export const useContactTags = () => {
   return { contactTags, loading, error };
 };
 
+
+export const useExpenseType =()=>{
+const {
+    data: ExpenseTypes = [],
+    isLoading: loading,
+    error,
+  } = useQuery({
+    queryKey: ["Expense Type"],
+    queryFn: async () => {
+      const res = await MasterRespository.getExpenseType()
+      return res.data;
+    },
+    onError: (error) => {
+      showToast(
+        error?.response?.data?.message ||
+          error.message ||
+          "Failed to fetch Expense Type",
+        "error"
+      );
+    },
+  });
+
+  return { ExpenseTypes, loading, error };
+}
+export const usePaymentMode =()=>{
+const {
+    data: PaymentModes = [],
+    isLoading: loading,
+    error,
+  } = useQuery({
+    queryKey: ["Payment Mode"],
+    queryFn: async () => {
+      const res = await MasterRespository.getPaymentMode()
+      return res.data;
+    },
+    onError: (error) => {
+      showToast(
+        error?.response?.data?.message ||
+          error.message ||
+          "Failed to fetch Payment Mode",
+        "error"
+      );
+    },
+  });
+
+  return { PaymentModes, loading, error };
+}
+export const useExpenseStatus =()=>{
+const {
+    data: ExpenseStatus = [],
+    isLoading: loading,
+    error,
+  } = useQuery({
+    queryKey: ["Expense Status"],
+    queryFn: async () => {
+      const res = await MasterRespository.getExpenseStatus()
+      return res.data;
+    },
+    onError: (error) => {
+      showToast(
+        error?.response?.data?.message ||
+          error.message ||
+          "Failed to fetch Expense Status",
+        "error"
+      );
+    },
+  });
+
+  return { ExpenseStatus, loading, error };
+}
 // ===Application Masters Query=================================================
 
 const fetchMasterData = async (masterType) => {
@@ -316,6 +179,12 @@ const fetchMasterData = async (masterType) => {
       return (await MasterRespository.getContactCategory()).data;
     case "Contact Tag":
       return (await MasterRespository.getContactTag()).data;
+    case "Expense Type":
+      return (await MasterRespository.getExpenseType()).data;
+    case "Payment Mode":
+      return (await MasterRespository.getPaymentMode()).data;
+    case "Expense Status":
+      return (await MasterRespository.getExpenseStatus()).data;
     case "Status":
       return [
         {
@@ -666,6 +535,140 @@ export const useUpdateContactTag = (onSuccessCallback) =>
   });
 }
 
+// ----------------------Expense Type------------------
+export const useCreateExpenseType = (onSuccessCallback)=>{
+    const queryClient = useQueryClient();
+
+  return useMutation( {
+    mutationFn: async ( payload ) =>
+    {
+      const resp = await MasterRespository.createExpenseType(payload);
+      return resp.data;
+    },
+    onSuccess: ( data ) =>
+    {
+      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Type" ]} )
+      showToast( "Expense Type added successfully", "success" );
+      if(onSuccessCallback) onSuccessCallback(data)
+    },
+    onError: ( error ) =>
+    {
+     showToast(error.message || "Something went wrong", "error");
+    }
+  })
+}
+export const useUpdateExpenseType = (onSuccessCallback) =>
+{
+   const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async ( {id, payload} ) =>
+    {
+      const response = await MasterRespository.updateExpenseType(id,payload);
+      return response.data;
+    },
+    onSuccess: (data, variables) => {
+
+      queryClient.invalidateQueries({
+        queryKey: ["masterData", "Expense Type"],
+      });
+      showToast("Expense Type updated successfully.", "success");
+       
+      if (onSuccessCallback) onSuccessCallback(data);
+    },
+    onError: (error) => {
+      showToast(error.message || "Something went wrong", "error");
+    },
+  });
+}
+
+// -----------------Payment Mode -------------
+
+export const useCreatePaymentMode = (onSuccessCallback)=>{
+    const queryClient = useQueryClient();
+
+  return useMutation( {
+    mutationFn: async ( payload ) =>
+    {
+      const resp = await MasterRespository.createPaymentMode(payload);
+      return resp.data;
+    },
+    onSuccess: ( data ) =>
+    {
+      queryClient.invalidateQueries( {queryKey:[ "masterData", "Payment Mode" ]} )
+      showToast( "Payment Mode added successfully", "success" );
+      if(onSuccessCallback) onSuccessCallback(data)
+    },
+    onError: ( error ) =>
+    {
+     showToast(error.message || "Something went wrong", "error");
+    }
+  })
+}
+export const useUpdatePaymentMode = (onSuccessCallback)=>{
+    const queryClient = useQueryClient();
+
+  return useMutation( {
+    mutationFn: async ( {id,payload} ) =>
+    {
+      const resp = await MasterRespository.updatePaymentMode(id,payload);
+      return resp.data;
+    },
+    onSuccess: ( data ) =>
+    {
+      queryClient.invalidateQueries( {queryKey:[ "masterData", "Payment Mode" ]} )
+      showToast( "Payment Mode Updated successfully", "success" );
+      if(onSuccessCallback) onSuccessCallback(data)
+    },
+    onError: ( error ) =>
+    {
+     showToast(error.message || "Something went wrong", "error");
+    }
+  })
+}
+// -------------------Expense Status----------------------------------
+export const useCreateExpenseStatus =(onSuccessCallback)=>{
+      const queryClient = useQueryClient();
+
+  return useMutation( {
+    mutationFn: async ( payload ) =>
+    {
+      const resp = await MasterRespository.createExpenseStatus(payload);
+      return resp.data;
+    },
+    onSuccess: ( data ) =>
+    {
+      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Status" ]} )
+      showToast( "Expense Status added successfully", "success" );
+      if(onSuccessCallback) onSuccessCallback(data)
+    },
+    onError: ( error ) =>
+    {
+     showToast(error.message || "Something went wrong", "error");
+    }
+  })
+}
+export const useUpdateExpenseStatus = (onSuccessCallback)=>{
+    const queryClient = useQueryClient();
+
+  return useMutation( {
+    mutationFn: async ( {id,payload} ) =>
+    {
+      const resp = await MasterRespository.updateExepnseStatus(id,payload);
+      return resp.data;
+    },
+    onSuccess: ( data ) =>
+    {
+      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Status" ]} )
+      showToast( "Expense Status Updated successfully", "success" );
+      if(onSuccessCallback) onSuccessCallback(data)
+    },
+    onError: ( error ) =>
+    {
+     showToast(error.message || "Something went wrong", "error");
+    }
+  })
+}
 // -Delete Master --------
 export const useDeleteMasterItem = () => {
   const queryClient = useQueryClient();

src/hooks/useEmployees.js

@@ -3,27 +3,22 @@ import { cacheData, getCachedData } from "../slices/apiDataManager";
 import { RolesRepository } from "../repositories/MastersRepository";
 import EmployeeRepository from "../repositories/EmployeeRepository";
 import ProjectRepository from "../repositories/ProjectRepository";
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import showToast from "../services/toastService";
 import { useSelector } from "react-redux";
 import { store } from "../store/store";
 import { queryClient } from "../layouts/AuthLayout";
 
-
-
-
 // Query ---------------------------------------------------------------------------
 
-
+export const useAllEmployees = (showInactive) => {
-export const useAllEmployees = ( showInactive ) =>
-{
   const {
     data = [],
     isLoading,
     error,
     refetch, // optional if you want recall functionality
   } = useQuery({
-    queryKey: ['allEmployee', showInactive],
+    queryKey: ["allEmployee", showInactive],
     queryFn: async () => {
       const res = await EmployeeRepository.getAllEmployeeList(showInactive);
       return res.data;
@@ -39,9 +34,7 @@ export const useAllEmployees = ( showInactive ) =>
 };
 
 //  ManageBucket.jsx
-export const useEmployees = ( selectedProject ) =>
+export const useEmployees = (selectedProject) => {
-{
-
   const {
     data = [],
     isLoading,
@@ -50,7 +43,9 @@ export const useEmployees = ( selectedProject ) =>
   } = useQuery({
     queryKey: ["employeeListByProject", selectedProject],
     queryFn: async () => {
-      const res = await EmployeeRepository.getEmployeeListByproject(selectedProject);
+      const res = await EmployeeRepository.getEmployeeListByproject(
+        selectedProject
+      );
       return res.data || res;
     },
     enabled: !!selectedProject,
@@ -72,7 +67,7 @@ export const useEmployeeRoles = (employeeId) => {
     isLoading: loading,
     error,
   } = useQuery({
-    queryKey: ['employeeRoles', employeeId],
+    queryKey: ["employeeRoles", employeeId],
     queryFn: async () => {
       const res = await RolesRepository.getEmployeeRoles(employeeId);
       return res.data;
@@ -95,7 +90,7 @@ export const useEmployeesByProject = (projectId) => {
     error,
     refetch: recallProjectEmplloyee,
   } = useQuery({
-    queryKey: ['projectEmployees', projectId],
+    queryKey: ["projectEmployees", projectId],
     queryFn: async () => {
       const res = await ProjectRepository.getEmployeesByProject(projectId);
       return res.data;
@@ -112,13 +107,14 @@ export const useEmployeesByProject = (projectId) => {
 };
 
 // EmployeeList.jsx
-export const useEmployeesAllOrByProjectId = (showAllEmployees ,projectId,
+export const useEmployeesAllOrByProjectId = (
-      showInactive) => {
+  showAllEmployees,
-
+  projectId,
-
+  showInactive
+) => {
   const queryKey = showAllEmployees
-  ? ['allEmployees', showInactive]
+    ? ["allEmployees", showInactive]
-  : ['projectEmployees', projectId, showInactive];
+    : ["projectEmployees", projectId, showInactive];
 
   const queryFn = async () => {
     if (showAllEmployees) {
@@ -139,7 +135,8 @@ export const useEmployeesAllOrByProjectId = (showAllEmployees ,projectId,
   } = useQuery({
     queryKey,
     queryFn,
-    enabled:typeof showInactive === "boolean" && (showAllEmployees || !!projectId),  
+    enabled:
+      typeof showInactive === "boolean" && (showAllEmployees || !!projectId),
   });
 
   return {
@@ -151,16 +148,15 @@ export const useEmployeesAllOrByProjectId = (showAllEmployees ,projectId,
 };
 
 //  ManageEmployee.jsx
-export const useEmployeeProfile = ( employeeId ) =>
+export const useEmployeeProfile = (employeeId) => {
-{
   const isEnabled = !!employeeId;
   const {
     data = null,
     isLoading: loading,
     error,
-    refetch
+    refetch,
   } = useQuery({
-    queryKey: ['employeeProfile', employeeId],
+    queryKey: ["employeeProfile", employeeId],
     queryFn: async () => {
       if (!employeeId) return null;
       const res = await EmployeeRepository.getEmployeeProfile(employeeId);
@@ -173,47 +169,77 @@ export const useEmployeeProfile = ( employeeId ) =>
     employee: data,
     loading,
     error,
-    refetch
+    refetch,
   };
 };
 
+export const useEmployeesName = (projectId, search) => {
+  return useQuery({
+    queryKey: ["employees", projectId, search],
+    queryFn: async() => await EmployeeRepository.getEmployeeName(projectId, search),
+   
+    staleTime: 5 * 60 * 1000, // Optional: cache for 5 minutes
+  });
+};
+
+export const useEmployeesNameByProject = (projectId) => {
+  return useQuery({
+    queryKey: ["Projectemployees", projectId],
+    queryFn: async () => {
+      const response = await EmployeeRepository.getEmployeeName(projectId);
+      return response?.data || []; // handle undefined/null response
+    },
+    enabled: !!projectId, // only fetch if projectId is truthy
+    staleTime: 5 * 60 * 1000, // cache for 5 minutes
+  });
+};
+
 
 // Mutation------------------------------------------------------------------
 
-
+export const useUpdateEmployee = () => {
-
+  const selectedProject = useSelector(
-export const useUpdateEmployee = () =>
+    (store) => store.localVariables.projectId
-{
+  );
-    const selectedProject = useSelector((store)=>store.localVariables.projectId)
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (employeeData) => EmployeeRepository.manageEmployee(employeeData),
+    mutationFn: (employeeData) =>
+      EmployeeRepository.manageEmployee(employeeData),
     onSuccess: (_, variables) => {
       const id = variables.id || variables.employeeId;
       const isAllEmployee = variables.IsAllEmployee;
 
       // Cache invalidation
-        queryClient.invalidateQueries( {queryKey:[ 'allEmployees'] }); 
+      queryClient.invalidateQueries({ queryKey: ["allEmployees"] });
       // queryClient.invalidateQueries(['employeeProfile', id]);
-      queryClient.invalidateQueries( {queryKey: [ 'projectEmployees' ]} );
+      queryClient.invalidateQueries({ queryKey: ["projectEmployees"] });
       queryClient.removeQueries({ queryKey: ["empListByProjectAllocated"] });
 
       // queryClient.invalidateQueries( {queryKey:[ 'employeeListByProject']} );
-      showToast( `Employee ${ id ? 'updated' : 'created' } successfully`, 'success' );
+      showToast(
+        `Employee ${id ? "updated" : "created"} successfully`,
+        "success"
+      );
     },
     onError: (error) => {
-      const msg = error?.response?.data?.message || error.message || 'Something went wrong';
+      const msg =
-      showToast(msg, 'error');
+        error?.response?.data?.message ||
+        error.message ||
+        "Something went wrong";
+      showToast(msg, "error");
     },
   });
 };
 
-
+export const useSuspendEmployee = ({
-
+  setIsDeleteModalOpen,
-export const useSuspendEmployee = ({ setIsDeleteModalOpen, setemployeeLodaing }) => {
+  setemployeeLodaing,
+}) => {
   const queryClient = useQueryClient();
- const selectedProject = useSelector((store)=>store.localVariables.projectId)
+  const selectedProject = useSelector(
+    (store) => store.localVariables.projectId
+  );
   return useMutation({
     mutationFn: (id) => {
       setemployeeLodaing(true);
@@ -221,11 +247,11 @@ export const useSuspendEmployee = ({ setIsDeleteModalOpen, setemployeeLodaing })
     },
 
     onSuccess: () => {
-  
-
       // queryClient.invalidateQueries( ['allEmployee',false]);
-      queryClient.invalidateQueries( {queryKey: [ 'projectEmployees' ]} );
+      queryClient.invalidateQueries({ queryKey: ["projectEmployees"] });
-      queryClient.invalidateQueries( {queryKey:[ 'employeeListByProject' ,selectedProject]} );
+      queryClient.invalidateQueries({
+        queryKey: ["employeeListByProject", selectedProject],
+      });
       showToast("Employee deleted successfully.", "success");
       setIsDeleteModalOpen(false);
     },
@@ -247,8 +273,11 @@ export const useSuspendEmployee = ({ setIsDeleteModalOpen, setemployeeLodaing })
 
 // Manage Role
 
-
+export const useUpdateEmployeeRoles = ({
-export const useUpdateEmployeeRoles = ({ onClose, resetForm, onSuccessCallback } = {}) => {
+  onClose,
+  resetForm,
+  onSuccessCallback,
+} = {}) => {
   const queryClient = useQueryClient();
   const mutation = useMutation({
     mutationFn: (updates) => RolesRepository.createEmployeeRoles(updates),
@@ -264,7 +293,9 @@ export const useUpdateEmployeeRoles = ({ onClose, resetForm, onSuccessCallback }
     },
     onError: (err) => {
       const message =
-        err?.response?.data?.message || err?.message || "Error occurred while updating roles";
+        err?.response?.data?.message ||
+        err?.message ||
+        "Error occurred while updating roles";
       showToast(message, "error");
     },
   });

src/hooks/useExpense.js

@@ -0,0 +1,263 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import ExpenseRepository from "../repositories/ExpsenseRepository";
+import showToast from "../services/toastService";
+import { queryClient } from "../layouts/AuthLayout";
+import { useSelector } from "react-redux";
+import moment from "moment";
+
+// -------------------Query------------------------------------------------------
+
+const cleanFilter = (filter) => {
+  const cleaned = { ...filter };
+
+  ["projectIds", "statusIds", "createdByIds", "paidById"].forEach((key) => {
+    if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
+      delete cleaned[key];
+    }
+  });
+
+  // moment.utc() to get consistent UTC ISO strings
+  if (!cleaned.startDate) {
+    cleaned.startDate = moment.utc().subtract(7, "days").startOf("day").toISOString();
+  }
+
+  if (!cleaned.endDate) {
+    cleaned.endDate = moment.utc().startOf("day").toISOString();
+  }
+
+  return cleaned;
+};
+
+
+export const useExpenseList = (
+  pageSize,
+  pageNumber,
+  filter,
+  searchString = ""
+) => {
+  return useQuery({
+    queryKey: ["Expenses", pageNumber, pageSize, filter, searchString],
+    queryFn: async () => {
+      const cleanedFilter = cleanFilter(filter);
+      const response = await ExpenseRepository.GetExpenseList(
+        pageSize,
+        pageNumber,
+        cleanedFilter,
+        searchString
+      );
+      return response.data;
+    },
+    keepPreviousData: true,
+  });
+};
+
+export const useExpense = (ExpenseId) => {
+  return useQuery({
+    queryKey: ["Expense", ExpenseId],
+    queryFn: async () =>
+      await ExpenseRepository.GetExpenseDetails(ExpenseId).then(
+        (res) => res.data
+      ),
+    enabled: !!ExpenseId,
+  });
+};
+
+export const useExpenseFilter = () => {
+  return useQuery({
+    queryKey: ["ExpenseFilter"],
+    queryFn: async () =>
+      await ExpenseRepository.GetExpenseFilter().then((res) => res.data),
+  });
+};
+
+// ---------------------------Mutation---------------------------------------------
+
+export const useCreateExpnse = (onSuccessCallBack) => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (payload) => {
+      await ExpenseRepository.CreateExpense(payload);
+    },
+    onSuccess: (_, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["Expenses"] });
+      showToast("Expense Created Successfully", "success");
+      if (onSuccessCallBack) onSuccessCallBack();
+    },
+    onError: (error) => {
+      showToast(
+        error.message || "Something went wrong please try again !",
+        "error"
+      );
+    },
+  });
+};
+
+export const useUpdateExpense = (onSuccessCallBack) => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({ id, payload }) => {
+      const response = await ExpenseRepository.UpdateExpense(id, payload);
+      return response.data;
+    },
+    onSuccess: (updatedExpense, variables) => {
+      // queryClient.setQueriesData(
+      //   {queryKey:['expenses'],exact:true},
+      //   (oldData) => {
+      //     if (!oldData || !oldData.data) return oldData;
+
+      //     const updatedList = oldData.data.map((expense) => {
+      //       if (expense.id !== variables.id) return expense;
+
+      //       return {
+      //         ...expense,
+      //         project:
+      //           expense.project.id !== updatedExpense.project.id
+      //             ? updatedExpense.project
+      //             : expense.project,
+      //         expensesType:
+      //           expense.expensesType.id !== updatedExpense.expensesType.id
+      //             ? updatedExpense.expensesType
+      //             : expense.expensesType,
+      //         paymentMode:
+      //           expense.paymentMode.id !== updatedExpense.paymentMode.id
+      //             ? updatedExpense.paymentMode
+      //             : expense.paymentMode,
+      //         paidBy:
+      //           expense.paidBy.id !== updatedExpense.paidBy.id
+      //             ? updatedExpense.paidBy
+      //             : expense.paidBy,
+      //         createdBy:
+      //           expense.createdBy.id !== updatedExpense.createdBy.id
+      //             ? updatedExpense.createdBy
+      //             : expense.createdBy,
+      //         createdAt: updatedExpense.createdAt,
+      //         status: updatedExpense.status,
+      //         nextStatus: updatedExpense.nextStatus,
+      //         preApproved: updatedExpense.preApproved,
+      //         transactionDate: updatedExpense.transactionDate,
+      //         amount: updatedExpense.amount,
+      //       };
+      //     });
+
+      //     return {
+      //       ...oldData,
+      //       data: updatedList,
+      //     };
+      //   }
+      // );
+      queryClient.removeQueries({ queryKey: ["Expense", variables.id] });
+      queryClient.invalidateQueries({ queryKey: ["Expenses"] });
+      showToast("Expense updated Successfully", "success");
+
+      if (onSuccessCallBack) onSuccessCallBack();
+    },
+    onError: (error) => {
+      showToast("Something went wrong.Please try again later.", "error");
+    },
+  });
+};
+
+export const useActionOnExpense = (onSuccessCallBack) => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (payload) => {
+      const response = await ExpenseRepository.ActionOnExpense(payload);
+      return response.data;
+    },
+    onSuccess: (updatedExpense, variables) => {
+      showToast("Request processed successfully.", "success");
+
+      queryClient.setQueriesData(
+        {
+          queryKey: ["Expenses"],
+          exact: false,
+        },
+        (oldData) => {
+          if (!oldData) return oldData;
+          return {
+            ...oldData,
+            data: oldData.data.map((item) =>
+              item.id === updatedExpense.id
+                ? {
+                    ...item,
+                    nextStatus: updatedExpense.nextStatus,
+                    status: updatedExpense.status,
+                  }
+                : item
+            ),
+          };
+        }
+      );
+      // queryClient.setQueriesData(
+      //   { queryKey: ["Expense", updatedExpense.id] },
+      //   (oldData) => {
+      //     return {
+      //       ...oldData,
+      //       nextStatus: updatedExpense.nextStatus,
+      //       status: updatedExpense.status,
+      //     };
+      //   }
+      // );
+      queryClient.invalidateQueries({queryKey:["Expense",updatedExpense.id]})
+
+      if (onSuccessCallBack) onSuccessCallBack();
+    },
+    onError: (error) => {
+      showToast(
+        error.response.data.message ||
+          "Something went wrong.Please try again later.",
+        "error"
+      );
+    },
+  });
+};
+
+export const useDeleteExpense = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async ({ id }) => {
+      const response = await ExpenseRepository.DeleteExpense(id);
+      return response.data;
+    },
+    onSuccess: (data, variables) => {
+      queryClient.setQueryData(["Expenses"], (oldData) => {
+        if (!oldData || !oldData.data)
+          return queryClient.invalidateQueries({ queryKey: ["Expenses"] });
+
+        const updatedList = oldData.data.filter(
+          (expense) => expense.id !== variables.id
+        );
+
+        return {
+          ...oldData,
+          data: updatedList,
+        };
+      });
+
+      showToast(data.message || "Expense deleted successfully", "success");
+    },
+    onError: (error) => {
+      showToast(
+        error.message ||
+          error.response.message ||
+          "Something went wrong.Please try again later.",
+        "error"
+      );
+    },
+  });
+};
+
+export const useHasAnyPermission = (permissionIdsInput) => {
+  const permissions = useSelector((state) => state?.profile?.permissions || []);
+
+  const permissionIds = Array.isArray(permissionIdsInput)
+    ? permissionIdsInput
+    : [];
+
+  // No permission needed
+  if (permissionIds.length === 0) return true;
+
+  return permissionIds.some((id) => permissions.includes(id));
+};

src/hooks/usePositionTracker.js

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

src/hooks/useProjects.js

@@ -313,6 +313,7 @@ export const useProjectName = () => {
     isLoading,
     error,
     refetch,
+    isError
   } = useQuery({
     queryKey: ["basicProjectNameList"],
     queryFn: async () => {
@@ -323,7 +324,7 @@ export const useProjectName = () => {
       showToast(error.message || "Error while Fetching project Name", "error");
     },
   });
-  return { projectNames: data, loading: isLoading, Error: error, refetch };
+  return { projectNames: data, loading: isLoading, Error: error, refetch,isError };
 };
 
 export const useProjectInfra = (projectId) => {

src/layouts/HomeLayout.jsx

@@ -7,6 +7,8 @@ import Footer from "../components/Layout/Footer";
 import FloatingMenu from "../components/common/FloatingMenu";
 import { FabProvider } from "../Context/FabContext";
 import { useSelector } from "react-redux";
+import OffcanvasTrigger from "../components/common/OffcanvasTrigger";
+import GlobalOffcanvas from "../components/common/GlobalOffcanvas ";
 
 const HomeLayout = () => {
   const loggedUser = useSelector((store) => store.globalVariables.loginUser);
@@ -34,9 +36,11 @@ const HomeLayout = () => {
               <Footer />
             </div>
           </div>
+            <OffcanvasTrigger />
           <FloatingMenu />
           <div className="layout-overlay layout-menu-toggle"></div>
         </div>
+                <GlobalOffcanvas />
       </div>
     </FabProvider>
   );

src/pages/Activities/AttendancePage.jsx

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

src/pages/ErrorPage.jsx

@@ -3,22 +3,54 @@ import { useRouteError, isRouteErrorResponse } from 'react-router-dom';
 
 const ErrorPage = () => {
   const error = useRouteError();
-  console.error(error);
+  console.error('Route Error:', error);
 
   if (isRouteErrorResponse(error)) {
+    const { status, statusText, data } = error;
+
     return (
-      <div>
+      <div className="container mt-5">
-        <h1>{error.status}</h1>
+        <h1 className="text-danger">Oops! Something went wrong.</h1>
-        <p>{error.statusText}</p>
+        <p className="lead">We couldn’t load the page you requested.</p>
+
+        <hr />
+
+        <h4>Error Details</h4>
+        <ul>
+          <li><strong>Status:</strong> {status}</li>
+          <li><strong>Status Text:</strong> {statusText}</li>
+          {data && <li><strong>Message:</strong> {typeof data === 'string' ? data : JSON.stringify(data)}</li>}
+        </ul>
       </div>
     );
   }
 
+  const {
+    message = 'An unexpected error occurred.',
+    name,
+    stack,
+  } = error || {};
+
   return (
-    <div>
+    <div className="container mt-5">
-      <h1>Something went wrong.</h1>
+      <h1 className="text-danger">Something went wrong.</h1>
-      <p>{error?.message || 'Unknown error occurred'}</p>
+      <p className="lead">Sorry, we couldn’t complete your request.</p>
+
+      {message && (
+        <div className="alert alert-warning mt-4">
+          <strong>{name ? `${name}: ` : ''}</strong>
+          {message}
+        </div>
+      )}
+
+      {stack && (
+        <details className="mt-3 text-muted">
+          <summary>Developer Details (Stack Trace)</summary>
+          <pre>{stack}</pre>
+        </details>
+      )}
     </div>
   );
-}
+};
-export default ErrorPage
+
+export default ErrorPage;

src/pages/Expense/ExpensePage.jsx

@@ -0,0 +1,195 @@
+import React, { createContext, useContext, useState, useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useSelector } from "react-redux";
+
+// Components
+import ExpenseList from "../../components/Expenses/ExpenseList";
+import ViewExpense from "../../components/Expenses/ViewExpense";
+import Breadcrumb from "../../components/common/Breadcrumb";
+import GlobalModel from "../../components/common/GlobalModel";
+import PreviewDocument from "../../components/Expenses/PreviewDocument";
+import ManageExpense from "../../components/Expenses/ManageExpense";
+import ExpenseFilterPanel from "../../components/Expenses/ExpenseFilterPanel";
+
+// Context & Hooks
+import { useFab } from "../../Context/FabContext";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import {
+  CREATE_EXEPENSE,
+  VIEW_ALL_EXPNESE,
+  VIEW_SELF_EXPENSE,
+} from "../../utils/constants";
+
+// Schema & Defaults
+import {
+  defaultFilter,
+  SearchSchema,
+} from "../../components/Expenses/ExpenseSchema";
+
+// Context
+export const ExpenseContext = createContext();
+export const useExpenseContext = () => {
+  const context = useContext(ExpenseContext);
+  if (!context) {
+    throw new Error("useExpenseContext must be used within an ExpenseProvider");
+  }
+  return context;
+};
+
+const ExpensePage = () => {
+  const selectedProjectId = useSelector(
+    (store) => store.localVariables.projectId
+  );
+
+  const [filters, setFilter] = useState();
+  const [groupBy, setGroupBy] = useState("transactionDate");
+  const [searchText, setSearchText] = useState("");
+
+  const [ManageExpenseModal, setManageExpenseModal] = useState({
+    IsOpen: null,
+    expenseId: null,
+  });
+
+  const [viewExpense, setViewExpense] = useState({
+    expenseId: null,
+    view: false,
+  });
+
+  const [ViewDocument, setDocumentView] = useState({
+    IsOpen: false,
+    Image: null,
+  });
+
+  const IsCreatedAble = useHasUserPermission(CREATE_EXEPENSE);
+  const IsViewAll = useHasUserPermission(VIEW_ALL_EXPNESE);
+  const IsViewSelf = useHasUserPermission(VIEW_SELF_EXPENSE);
+
+  const { setOffcanvasContent, setShowTrigger } = useFab();
+
+  const methods = useForm({
+    resolver: zodResolver(SearchSchema),
+    defaultValues: defaultFilter,
+  });
+
+  const { reset } = methods;
+
+  const clearFilter = () => {
+    setFilter(defaultFilter);
+    reset();
+  };
+
+  useEffect(() => {
+    setShowTrigger(true);
+    setOffcanvasContent(
+      "Expense Filters",
+      <ExpenseFilterPanel
+        onApply={setFilter}
+        handleGroupBy={setGroupBy}
+        clearFilter={clearFilter}
+      />
+    );
+
+    return () => {
+      setShowTrigger(false);
+      setOffcanvasContent("", null);
+    };
+  }, []);
+
+  const contextValue = {
+    setViewExpense,
+    setManageExpenseModal,
+    setDocumentView,
+  };
+
+  return (
+    <ExpenseContext.Provider value={contextValue}>
+      <div className="container-fluid">
+        <Breadcrumb data={[{ label: "Home", link: "/" }, { label: "Expense" }]} />
+
+        {(IsViewAll || IsViewSelf) ? (
+          <>
+            <div className="card my-3 px-sm-4 px-0">
+              <div className="card-body py-2 px-3">
+                <div className="row align-items-center">
+                  <div className="col-6 ">
+                    <div className="d-flex align-items-center">
+
+                      <input
+                        type="search"
+                        className="form-control form-control-sm w-auto"
+                        placeholder="Search Expense"
+                        aria-describedby="search-label"
+                        value={searchText}
+                        onChange={(e) => setSearchText(e.target.value)}
+                      />
+                    </div>
+                  </div>
+
+                  <div className="col-6  text-end mt-2 mt-sm-0">
+                    {IsCreatedAble && (
+                      <button
+                        type="button"
+                        className="p-1 me-1 m-sm-0  bg-primary rounded-circle"
+                        title="Add New Expense"
+                        onClick={() => setManageExpenseModal({ IsOpen: true, expenseId: null })}
+                      >
+                        <i className="bx bx-plus fs-4 text-white"></i>
+                      </button>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <ExpenseList filters={filters} groupBy={groupBy} searchText={searchText} />
+          </>
+        ) : (
+          <div className="card text-center py-1">
+            <i className="fa-solid fa-triangle-exclamation fs-5" />
+            <p>Access Denied: You don't have permission to perform this action!</p>
+          </div>
+        )}
+
+        {/* Modals */}
+        {ManageExpenseModal.IsOpen && (
+          <GlobalModel
+            isOpen
+            size="lg"
+            closeModal={() => setManageExpenseModal({ IsOpen: null, expenseId: null })}
+          >
+            <ManageExpense
+              key={ManageExpenseModal.expenseId ?? "new"}
+              expenseToEdit={ManageExpenseModal.expenseId}
+              closeModal={() => setManageExpenseModal({ IsOpen: null, expenseId: null })}
+            />
+          </GlobalModel>
+        )}
+
+        {viewExpense.view && (
+          <GlobalModel
+            isOpen
+            size="lg"
+            modalType="top"
+            closeModal={() => setViewExpense({ expenseId: null, view: false })}
+          >
+            <ViewExpense ExpenseId={viewExpense.expenseId} />
+          </GlobalModel>
+        )}
+
+        {ViewDocument.IsOpen && (
+          <GlobalModel
+            isOpen
+            size="lg"
+            key={ViewDocument.Image ?? "doc"}
+            closeModal={() => setDocumentView({ IsOpen: false, Image: null })}
+          >
+            <PreviewDocument imageUrl={ViewDocument.Image} />
+          </GlobalModel>
+        )}
+      </div>
+    </ExpenseContext.Provider>
+  );
+};
+
+export default ExpensePage;

src/pages/master/MasterTable.jsx

@@ -16,6 +16,11 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
     "tenantId",
     "checkLists",
     "isSystem",
+    "isActive",
+    "noOfPersonsRequired",
+    "color",
+    "displayName",
+    "permissionIds"
   ];
 
   const safeData = Array.isArray(data) ? data : [];

src/repositories/EmployeeRepository.jsx

@@ -1,17 +1,26 @@
 import { api } from "../utils/axiosClient";
 
 const EmployeeRepository = {
-  getAllEmployeeList:(showInactive)=>api.get(`api/employee/list?showInactive=${showInactive}`),
+  getAllEmployeeList: (showInactive) =>
+    api.get(`api/employee/list?showInactive=${showInactive}`),
   getEmployeeListByproject: (projectid) =>
     api.get(`/api/employee/list/${projectid}`),
-  searchEmployees: (query) =>
+  searchEmployees: (query) => api.get(`/api/employee/search/${query}`),
-    api.get(`/api/employee/search/${query}`),
+  manageEmployee: (data) => api.post("/api/employee/manage", data),
-  manageEmployee: (data) =>
-    api.post("/api/employee/manage", data),
   updateEmployee: (id, data) => api.put(`/users/${id}`, data),
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
   getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
-  deleteEmployee:(id)=>api.delete(`/api/employee/${id}`)
+  deleteEmployee: (id) => api.delete(`/api/employee/${id}`),
+ getEmployeeName: (projectId, search) => {
+  const params = new URLSearchParams();
+
+  if (projectId) params.append("projectId", projectId);
+  if (search) params.append("searchString", search);
+
+  const query = params.toString();
+  return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);
+}
+
 };
 
 export default EmployeeRepository;

src/repositories/ExpsenseRepository.jsx

@@ -0,0 +1,24 @@
+import { api } from "../utils/axiosClient";
+
+
+const ExpenseRepository = {
+  GetExpenseList: ( pageSize, pageNumber, filter,searchString ) => {
+    const payloadJsonString = JSON.stringify(filter);
+
+   
+
+    return api.get(`/api/expense/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`);
+  },
+  
+  GetExpenseDetails:(id)=>api.get(`/api/Expense/details/${id}`),
+  CreateExpense:(data)=>api.post("/api/Expense/create",data),
+  UpdateExpense:(id,data)=>api.put(`/api/Expense/edit/${id}`,data),
+  DeleteExpense:(id)=>api.delete(`/api/Expense/delete/${id}`),
+
+  ActionOnExpense:(data)=>api.post('/api/expense/action',data),
+  
+  GetExpenseFilter:()=>api.get('/api/Expense/filter')
+
+}
+
+export default ExpenseRepository;

src/repositories/MastersRepository.jsx

@@ -13,49 +13,70 @@ export const RolesRepository = {
   updateRoles: (id, data) => api.put(`/users/${id}`, data),
   deleteRoles: (id) => api.delete(`/users/${id}`),
 
-
   getEmployeeRoles: (id) => api.get(`/api/employee/roles/${id}`),
-  createEmployeeRoles:(data)=>api.post("/api/roles/assign-roles",data)
+  createEmployeeRoles: (data) => api.post("/api/roles/assign-roles", data),
 };
 
-
 export const MasterRespository = {
   getRoles: () => api.get("/api/roles"),
   createRole: (data) => api.post("/api/roles", data),
   updateRoles: (id, data) => api.put(`/api/roles/${id}`, data),
   getFeatures: () => api.get(`/api/feature`),
 
-
+  createJobRole: (data) => api.post("api/roles/jobrole", data),
-  createJobRole:(data)=>api.post('api/roles/jobrole',data),
   getJobRole: () => api.get("/api/roles/jobrole"),
   updateJobRole: (id, data) => api.put(`/api/roles/jobrole/${id}`, data),
 
-  
+  getActivites: () => api.get("api/master/activities"),
-  getActivites: () => api.get( 'api/master/activities' ),
+  createActivity: (data) => api.post("api/master/activity", data),
-  createActivity: (data) => api.post( 'api/master/activity',data ),
+  updateActivity: (id, data) =>
-  updateActivity:(id,data) =>api.post(`api/master/activity/edit/${id}`,data),
+    api.post(`api/master/activity/edit/${id}`, data),
-  getIndustries: () => api.get( 'api/master/industries' ),
+  getIndustries: () => api.get("api/master/industries"),
 
   // delete
   "Job Role": (id) => api.delete(`/api/roles/jobrole/${id}`),
-  "Activity": ( id ) => api.delete( `/api/master/activity/delete/${ id }` ),
+  Activity: (id) => api.delete(`/api/master/activity/delete/${id}`),
   "Application Role": (id) => api.delete(`/api/roles/${id}`),
   "Work Category": (id) => api.delete(`api/master/work-category/${id}`),
   "Contact Category": (id) => api.delete(`/api/master/contact-category/${id}`),
   "Contact Tag": (id) => api.delete(`/api/master/contact-tag/${id}`),
+  "Expense Type": (id, isActive) =>
+    api.delete(`/api/Master/expenses-type/delete/${id}`, (isActive = false)),
+  "Payment Mode": (id, isActive) =>
+    api.delete(`/api/Master/payment-mode/delete/${id}`, (isActive = false)),
+  "Expense Status": (id, isActive) =>
+    api.delete(`/api/Master/expenses-status/delete/${id}`, (isActive = false)),
 
   getWorkCategory: () => api.get(`/api/master/work-categories`),
   createWorkCategory: (data) => api.post(`/api/master/work-category`, data),
-  updateWorkCategory: ( id, data ) => api.post( `/api/master/work-category/edit/${ id }`, data ),
+  updateWorkCategory: (id, data) =>
+    api.post(`/api/master/work-category/edit/${id}`, data),
 
   getContactCategory: () => api.get(`/api/master/contact-categories`),
-  createContactCategory: (data ) => api.post( `/api/master/contact-category`, data ),
+  createContactCategory: (data) =>
-  updateContactCategory: ( id, data ) => api.post( `/api/master/contact-category/edit/${ id }`, data ),
+    api.post(`/api/master/contact-category`, data),
+  updateContactCategory: (id, data) =>
+    api.post(`/api/master/contact-category/edit/${id}`, data),
 
   getContactTag: () => api.get(`/api/master/contact-tags`),
   createContactTag: (data) => api.post(`/api/master/contact-tag`, data),
-  updateContactTag: ( id, data ) => api.post( `/api/master/contact-tag/edit/${ id }`, data ),
+  updateContactTag: (id, data) =>
+    api.post(`/api/master/contact-tag/edit/${id}`, data),
 
-  getAuditStatus:()=>api.get('/api/Master/work-status')
+  getAuditStatus: () => api.get("/api/Master/work-status"),
 
-}
+  getExpenseType: () => api.get("/api/Master/expenses-types"),
+  createExpenseType: (data) => api.post("/api/Master/expenses-type", data),
+  updateExpenseType: (id, data) =>
+    api.put(`/api/Master/expenses-type/edit/${id}`, data),
+
+  getPaymentMode: () => api.get("/api/Master/payment-modes"),
+  createPaymentMode: (data) => api.post(`/api/Master/payment-mode`, data),
+  updatePaymentMode: (id, data) =>
+    api.put(`/api/Master/payment-mode/edit/${id}`, data),
+
+  getExpenseStatus: () => api.get("/api/Master/expenses-status"),
+  createExpenseStatus: (data) => api.post("/api/Master/expenses-status", data),
+  updateExepnseStatus: (id, data) =>
+    api.put(`/api/Master/expenses-status/edit/${id}`, data),
+};

src/router/AppRoutes.jsx

@@ -38,6 +38,7 @@ import LegalInfoCard from "../pages/TermsAndConditions/LegalInfoCard";
 import ProtectedRoute from "./ProtectedRoute";
 import Directory from "../pages/Directory/Directory";
 import LoginWithOtp from "../pages/authentication/LoginWithOtp";
+import ExpensePage from "../pages/Expense/ExpensePage";
 
 const router = createBrowserRouter(
   [
@@ -76,6 +77,7 @@ const router = createBrowserRouter(
             { path: "/activities/task", element: <TaskPlannng /> },
             { path: "/activities/reports", element: <Reports /> },
             { path: "/gallary", element: <ImageGallary /> },
+            { path: "/expenses", element: <ExpensePage /> },
             { path: "/masters", element: <MasterPage /> },
             { path: "/help/support", element: <Support /> },
             { path: "/help/docs", element: <Documentation /> },

src/services/signalRService.js

@@ -53,6 +53,9 @@ export function startSignalR(loggedUser) {
         eventBus.emit("attendance_log", data);
       }
 
+      if(data.keyword == "Expanse"){
+        queryClient.invalidateQueries({queryKey:["Expenses"]})
+      }
       // if create or update project
       if (
         data.keyword == "Create_Project" ||

src/utils/appUtils.js

@@ -0,0 +1,49 @@
+import { useEffect, useState } from "react";
+
+export const formatFileSize=(bytes)=> {
+  if (bytes < 1024) return bytes + " B";
+  else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
+  else return (bytes / (1024 * 1024)).toFixed(2) + " MB";
+}
+export const AppColorconfig = {
+  colors: {
+    primary: '#696cff',
+    secondary: '#8592a3',
+    success: '#71dd37',
+    info: '#03c3ec',
+    warning: '#ffab00',
+    danger: '#ff3e1d',
+    dark: '#233446',
+    black: '#000',
+    white: '#fff',
+    cardColor: '#fff',
+    bodyBg: '#f5f5f9',
+    bodyColor: '#697a8d',
+    headingColor: '#566a7f',
+    textMuted: '#a1acb8',
+    borderColor: '#eceef1'
+  }
+};
+export const getColorNameFromHex = (hex) => {
+  const normalizedHex = hex?.replace(/'/g, '').toLowerCase(); 
+  const colors = AppColorconfig.colors;
+
+  for (const [name, value] of Object.entries(colors)) {
+    if (value.toLowerCase() === normalizedHex) {
+      return name;
+    }
+  }
+
+  return null; //
+};
+
+export const useDebounce = (value, delay = 500) => {
+  const [debouncedValue, setDebouncedValue] = useState(value);
+
+  useEffect(() => {
+    const timer = setTimeout(() => setDebouncedValue(value), delay);
+    return () => clearTimeout(timer);
+  }, [value, delay]);
+
+  return debouncedValue;
+};

src/utils/axiosClient.jsx

@@ -44,7 +44,7 @@ axiosClient.interceptors.response.use(
     const originalRequest = error.config;
 
     // Skip retry for public requests or already retried ones
-    if (!originalRequest || originalRequest._retry || originalRequest.authRequired === false) {
+    if (!originalRequest && originalRequest._retry || originalRequest.authRequired === false) {
       return Promise.reject(error);
     }
 

src/utils/constants.jsx

@@ -41,5 +41,28 @@ export const DIRECTORY_MANAGER = "62668630-13ce-4f52-a0f0-db38af2230c5"
 
 export const DIRECTORY_USER = "0f919170-92d4-4337-abd3-49b66fc871bb"
 
+export const VIEW_SELF_EXPENSE = "385be49f-8fde-440e-bdbc-3dffeb8dd116"
+
+export const VIEW_ALL_EXPNESE = "01e06444-9ca7-4df4-b900-8c3fa051b92f";
+
+export const CREATE_EXEPENSE = "0f57885d-bcb2-4711-ac95-d841ace6d5a7";
+
+export const REVIEW_EXPENSE = "1f4bda08-1873-449a-bb66-3e8222bd871b";
+
+export const APPROVE_EXPENSE = "eaafdd76-8aac-45f9-a530-315589c6deca";
+
+
+export const PROCESS_EXPENSE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"
+
+export const EXPENSE_MANAGE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"
+
+export const EXPENSE_REJECTEDBY = ["d1ee5eec-24b6-4364-8673-a8f859c60729","965eda62-7907-4963-b4a1-657fb0b2724b"]
+
+export const EXPENSE_DRAFT = "297e0d8f-f668-41b5-bfea-e03b354251c8"
+// -------------------Application Role------------------------------
+
+// 1 - Expense Manage 
+export const EXPENSE_MANAGEMENT = "a4e25142-449b-4334-a6e5-22f70e4732d7"
+
 export const BASE_URL = process.env.VITE_BASE_URL;
 // export const BASE_URL = "https://api.marcoaiot.com";

src/utils/dateUtils.jsx

@@ -67,9 +67,13 @@ export  const formatNumber = (num) => {
   if (num == null || isNaN(num)) return "NA";
   return Number.isInteger(num) ? num : num.toFixed(2);
 };
-export const formatUTCToLocalTime = (datetime) =>{
+
-  return moment.utc(datetime).local().format("DD MMMM, YYYY [at] hh:mm A");
+
-}
+export const formatUTCToLocalTime = (datetime, timeRequired = false) => {
+  return timeRequired
+    ? moment.utc(datetime).local().format("DD MMM YYYY hh:mm A")
+    : moment.utc(datetime).local().format("DD MMM YYYY");
+};
 
 export  const getCompletionPercentage = (completedWork, plannedWork)=> {
   if (!plannedWork || plannedWork === 0) return 0;