Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main

Reviewed-on: #474
Merged

public/assets/css/core-extend.css

@@ -9,4 +9,274 @@
 }
 .table_header_border {
  border-bottom:2px solid var(--bs-table-border-color) ;
-}
+}
+
+
+.text-xxs { font-size: 0.55rem; }       /* 8px */
+.text-xs { font-size: 0.75rem; }       /* 12px */
+.text-sm { font-size: 0.875rem; }      /* 14px */
+.text-base { font-size: 1rem; }        /* 16px */
+.text-lg { font-size: 1.125rem; }      /* 18px */
+.text-xl { font-size: 1.25rem; }       /* 20px */
+.text-2xl { font-size: 1.5rem; }       /* 24px */
+.text-3xl { font-size: 1.875rem; }     /* 30px */
+.text-4xl { font-size: 2.25rem; }      /* 36px */
+.text-5xl { font-size: 3rem; }         /* 48px */
+.text-6xl { font-size: 3.75rem; }      /* 60px */
+.text-7xl { font-size: 4.5rem; }       /* 72px */
+.text-8xl { font-size: 6rem; }         /* 96px */
+.text-9xl { font-size: 8rem; }         /* 128px */
+
+
+/*  */
+
+.w-0     { width: 0px; }
+.w-px    { width: 1px; }
+.w-1     { width: 0.25rem; }  /* 4px */
+.w-2     { width: 0.5rem; }   /* 8px */
+.w-3     { width: 0.75rem; }  /* 12px */
+.w-4     { width: 1rem; }     /* 16px */
+.w-5     { width: 1.25rem; }  /* 20px */
+.w-6     { width: 1.5rem; }   /* 24px */
+.w-8     { width: 2rem; }     /* 32px */
+.w-10    { width: 2.5rem; }   /* 40px */
+.w-12    { width: 3rem; }     /* 48px */
+.w-16    { width: 4rem; }     /* 64px */
+.w-20    { width: 5rem; }     /* 80px */
+.w-24    { width: 6rem; }     /* 96px */
+.w-32    { width: 8rem; }     /* 128px */
+.w-40    { width: 10rem; }    /* 160px */
+.w-48    { width: 12rem; }    /* 192px */
+.w-56    { width: 14rem; }    /* 224px */
+.w-64    { width: 16rem; }    /* 256px */
+.w-auto  { width: auto; }
+.w-full  { width: 100%; }
+.w-screen{ width: 100vw; }
+.w-min   { width: min-content; }
+.w-max   { width: max-content; }
+
+
+
+.h-0     { height: 0px; }
+.h-px    { height: 1px; }
+.h-1     { height: 0.25rem; }  /* 4px */
+.h-2     { height: 0.5rem; }   /* 8px */
+.h-3     { height: 0.75rem; }  /* 12px */
+.h-4     { height: 1rem; }     /* 16px */
+.h-5     { height: 1.25rem; }  /* 20px */
+.h-6     { height: 1.5rem; }   /* 24px */
+.h-8     { height: 2rem; }     /* 32px */
+.h-10    { height: 2.5rem; }   /* 40px */
+.h-12    { height: 3rem; }     /* 48px */
+.h-16    { height: 4rem; }     /* 64px */
+.h-20    { height: 5rem; }     /* 80px */
+.h-24    { height: 6rem; }     /* 96px */
+.h-32    { height: 8rem; }     /* 128px */
+.h-40    { height: 10rem; }    /* 160px */
+.h-48    { height: 12rem; }    /* 192px */
+.h-56    { height: 14rem; }    /* 224px */
+.h-64    { height: 16rem; }    /* 256px */
+.h-auto  { height: auto; }
+.h-full  { height: 100%; }
+.h-screen{ height: 100vh; }
+.h-min   { height: min-content; }
+.h-max   { height: max-content; }
+
+
+
+
+
+/* ==========================
+   Base Font Sizes (mobile first)
+   ========================== */
+.text-xxs { font-size: 0.55rem; }   /* 8px */
+.text-xs  { font-size: 0.75rem; }   /* 12px */
+.text-sm  { font-size: 0.875rem; }  /* 14px */
+.text-base{ font-size: 1rem; }      /* 16px */
+.text-lg  { font-size: 1.125rem; }  /* 18px */
+.text-xl  { font-size: 1.25rem; }   /* 20px */
+.text-2xl { font-size: 1.5rem; }    /* 24px */
+.text-3xl { font-size: 1.875rem; }  /* 30px */
+.text-4xl { font-size: 2.25rem; }   /* 36px */
+.text-5xl { font-size: 3rem; }      /* 48px */
+.text-6xl { font-size: 3.75rem; }   /* 60px */
+.text-7xl { font-size: 4.5rem; }    /* 72px */
+.text-8xl { font-size: 6rem; }      /* 96px */
+.text-9xl { font-size: 8rem; }      /* 128px */
+
+/* ==========================
+   Base Heights
+   ========================== */
+.h-0     { height: 0; }
+.h-px    { height: 1px; }
+.h-1     { height: 0.25rem; }  /* 4px */
+.h-2     { height: 0.5rem; }   /* 8px */
+.h-3     { height: 0.75rem; }  /* 12px */
+.h-4     { height: 1rem; }     /* 16px */
+.h-5     { height: 1.25rem; }  /* 20px */
+.h-6     { height: 1.5rem; }   /* 24px */
+.h-8     { height: 2rem; }     /* 32px */
+.h-10    { height: 2.5rem; }   /* 40px */
+.h-12    { height: 3rem; }     /* 48px */
+.h-16    { height: 4rem; }     /* 64px */
+.h-20    { height: 5rem; }     /* 80px */
+.h-24    { height: 6rem; }     /* 96px */
+.h-32    { height: 8rem; }     /* 128px */
+.h-40    { height: 10rem; }    /* 160px */
+.h-48    { height: 12rem; }    /* 192px */
+.h-56    { height: 14rem; }    /* 224px */
+.h-64    { height: 16rem; }    /* 256px */
+.h-full  { height: 100%; }
+.h-screen{ height: 100vh; }
+
+/* ==========================
+   Base Widths
+   ========================== */
+.w-0     { width: 0; }
+.w-px    { width: 1px; }
+.w-1     { width: 0.25rem; }
+.w-2     { width: 0.5rem; }
+.w-3     { width: 0.75rem; }
+.w-4     { width: 1rem; }
+.w-5     { width: 1.25rem; }
+.w-6     { width: 1.5rem; }
+.w-8     { width: 2rem; }
+.w-10    { width: 2.5rem; }
+.w-12    { width: 3rem; }
+.w-16    { width: 4rem; }
+.w-20    { width: 5rem; }
+.w-24    { width: 6rem; }
+.w-32    { width: 8rem; }
+.w-40    { width: 10rem; }
+.w-48    { width: 12rem; }
+.w-56    { width: 14rem; }
+.w-64    { width: 16rem; }
+.w-full  { width: 100%; }
+.w-screen{ width: 100vw; }
+
+/* ==========================
+   Responsive Variants
+   ========================== */
+@media (min-width: 576px) { /* sm */
+  /* Font */
+  .text-xxs-sm { font-size: 0.55rem; }
+  .text-xs-sm  { font-size: 0.75rem; }
+  .text-sm-sm  { font-size: 0.875rem; }
+  .text-base-sm{ font-size: 1rem; }
+  .text-lg-sm  { font-size: 1.125rem; }
+  .text-xl-sm  { font-size: 1.25rem; }
+  .text-2xl-sm{ font-size: 1.5rem; }
+
+  /* Height */
+  .h-1-sm{ height: 0.25rem; }
+  .h-2-sm{ height: 0.5rem; }
+  .h-3-sm{ height: 0.75rem; }
+  .h-4-sm{ height: 1rem; }
+  .h-5-sm{ height: 1.25rem; }
+  .h-6-sm{ height: 1.5rem; }
+  .h-8-sm{ height: 2rem; }
+  .h-10-sm{ height: 2.5rem; }
+
+  /* Width */
+  .w-1-sm{ width: 0.25rem; }
+  .w-2-sm{ width: 0.5rem; }
+  .w-3-sm{ width: 0.75rem; }
+  .w-4-sm{ width: 1rem; }
+  .w-5-sm{ width: 1.25rem; }
+  .w-6-sm{ width: 1.5rem; }
+  .w-8-sm{ width: 2rem; }
+  .w-10-sm{ width: 2.5rem; }
+}
+
+@media (min-width: 768px) { /* md */
+  /* Font */
+  .text-xxs-md { font-size: 0.55rem; }
+  .text-xs-md  { font-size: 0.75rem; }
+  .text-sm-md  { font-size: 0.875rem; }
+  .text-base-md{ font-size: 1rem; }
+  .text-lg-md  { font-size: 1.125rem; }
+  .text-xl-md  { font-size: 1.25rem; }
+  .text-2xl-md{ font-size: 1.5rem; }
+
+  /* Height */
+  .h-1-md{ height: 0.25rem; }
+  .h-2-md{ height: 0.5rem; }
+  .h-3-md{ height: 0.75rem; }
+  .h-4-md{ height: 1rem; }
+  .h-5-md{ height: 1.25rem; }
+  .h-6-md{ height: 1.5rem; }
+  .h-8-md{ height: 2rem; }
+  .h-10-md{ height: 2.5rem; }
+
+  /* Width */
+  .w-1-md{ width: 0.25rem; }
+  .w-2-md{ width: 0.5rem; }
+  .w-3-md{ width: 0.75rem; }
+  .w-4-md{ width: 1rem; }
+  .w-5-md{ width: 1.25rem; }
+  .w-6-md{ width: 1.5rem; }
+  .w-8-md{ width: 2rem; }
+  .w-10-md{ width: 2.5rem; }
+}
+
+@media (min-width: 992px) { /* lg */
+  /* Font */
+  .text-xxs-lg { font-size: 0.55rem; }
+  .text-xs-lg  { font-size: 0.75rem; }
+  .text-sm-lg  { font-size: 0.875rem; }
+  .text-base-lg{ font-size: 1rem; }
+  .text-lg-lg  { font-size: 1.125rem; }
+  .text-xl-lg  { font-size: 1.25rem; }
+  .text-2xl-lg{ font-size: 1.5rem; }
+
+  /* Height */
+  .h-1-lg{ height: 0.25rem; }
+  .h-2-lg{ height: 0.5rem; }
+  .h-3-lg{ height: 0.75rem; }
+  .h-4-lg{ height: 1rem; }
+  .h-5-lg{ height: 1.25rem; }
+  .h-6-lg{ height: 1.5rem; }
+  .h-8-lg{ height: 2rem; }
+  .h-10-lg{ height: 2.5rem; }
+
+  /* Width */
+  .w-1-lg{ width: 0.25rem; }
+  .w-2-lg{ width: 0.5rem; }
+  .w-3-lg{ width: 0.75rem; }
+  .w-4-lg{ width: 1rem; }
+  .w-5-lg{ width: 1.25rem; }
+  .w-6-lg{ width: 1.5rem; }
+  .w-8-lg{ width: 2rem; }
+  .w-10-lg{ width: 2.5rem; }
+}
+
+@media (min-width: 1200px) { /* xl */
+  /* Font */
+  .text-xxs-xl { font-size: 0.55rem; }
+  .text-xs-xl  { font-size: 0.75rem; }
+  .text-sm-xl  { font-size: 0.875rem; }
+  .text-base-xl{ font-size: 1rem; }
+  .text-lg-xl  { font-size: 1.125rem; }
+  .text-xl-xl  { font-size: 1.25rem; }
+  .text-2xl-xl{ font-size: 1.5rem; }
+
+  /* Height */
+  .h-1-xl{ height: 0.25rem; }
+  .h-2-xl{ height: 0.5rem; }
+  .h-3-xl{ height: 0.75rem; }
+  .h-4-xl{ height: 1rem; }
+  .h-5-xl{ height: 1.25rem; }
+  .h-6-xl{ height: 1.5rem; }
+  .h-8-xl{ height: 2rem; }
+  .h-10-xl{ height: 2.5rem; }
+
+  /* Width */
+  .w-1-xl{ width: 0.25rem; }
+  .w-2-xl{ width: 0.5rem; }
+  .w-3-xl{ width: 0.75rem; }
+  .w-4-xl{ width: 1rem; }
+  .w-5-xl{ width: 1.25rem; }
+  .w-6-xl{ width: 1.5rem; }
+  .w-8-xl{ width: 2rem; }
+  .w-10-xl{ width: 2.5rem; }
+}

src/components/Activities/AttendcesLogs.jsx

@@ -38,190 +38,136 @@ const usePagination = (data, itemsPerPage) => {
 };
 
 const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => {
-  // const selectedProject = useSelector(
+const selectedProject = useSelectedProject();
-  //   (store) => store.localVariables.projectId
+const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
-  // );
+const dispatch = useDispatch();
-  const selectedProject = useSelectedProject();
+const [loading, setLoading] = useState(false);
-  const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
+const [showPending, setShowPending] = useState(false);
-  const dispatch = useDispatch();
+const [isRefreshing, setIsRefreshing] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [showPending, setShowPending] = useState(false);
 
-  const [isRefreshing, setIsRefreshing] = useState(false);
+const today = new Date();
-  const [processedData, setProcessedData] = useState([]);
+today.setHours(0, 0, 0, 0);
 
-  const today = new Date();
+const yesterday = new Date();
-  today.setHours(0, 0, 0, 0);
+yesterday.setDate(yesterday.getDate() - 1);
 
-  const yesterday = new Date();
+const isSameDay = (dateStr) => {
-  yesterday.setDate(yesterday.getDate() - 1);
+  if (!dateStr) return false;
+  const d = new Date(dateStr);
+  d.setHours(0, 0, 0, 0);
+  return d.getTime() === today.getTime();
+};
 
-  const isSameDay = (dateStr) => {
+const isBeforeToday = (dateStr) => {
-    if (!dateStr) return false;
+  if (!dateStr) return false;
-    const d = new Date(dateStr);
+  const d = new Date(dateStr);
-    d.setHours(0, 0, 0, 0);
+  d.setHours(0, 0, 0, 0);
-    return d.getTime() === today.getTime();
+  return d.getTime() < today.getTime();
-  };
+};
 
-  const isBeforeToday = (dateStr) => {
+const sortByName = (a, b) => {
-    if (!dateStr) return false;
+  const nameA = (a.firstName + a.lastName).toLowerCase();
-    const d = new Date(dateStr);
+  const nameB = (b.firstName + b.lastName).toLowerCase();
-    d.setHours(0, 0, 0, 0);
+  return nameA.localeCompare(nameB);
-    return d.getTime() < today.getTime();
+};
-  };
 
-  const sortByName = (a, b) => {
+const { data = [], isLoading, error, refetch, isFetching } = useAttendancesLogs(
-    const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
+  selectedProject,
-    const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
+  dateRange.startDate,
-    return nameA?.localeCompare(nameB);
+  dateRange.endDate,
-  };
+  organizationId
+);
 
-  const {
+const processedData = useMemo(() => {
-    data = [],
+  const filteredData = showPending
-    isLoading,
+    ? data.filter((item) => item.checkOutTime === null)
-    error,
+    : data;
-    refetch,
-    isFetching,
-  } = useAttendancesLogs(
-    selectedProject,
-    dateRange.startDate,
-    dateRange.endDate,
-    organizationId
-  );
-  const filtering = (data) => {
-    const filteredData = showPending
-      ? data.filter((item) => item.checkOutTime === null)
-      : data;
 
-    const group1 = filteredData
+  const group1 = filteredData.filter((d) => d.activity === 1 && isSameDay(d.checkInTime)).sort(sortByName);
-      .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
+  const group2 = filteredData.filter((d) => d.activity === 4 && isSameDay(d.checkOutTime)).sort(sortByName);
-      .sort(sortByName);
+  const group3 = filteredData.filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime)).sort(sortByName);
-    const group2 = filteredData
+  const group4 = filteredData.filter((d) => d.activity === 4 && isBeforeToday(d.checkOutTime));
-      .filter((d) => d.activity === 4 && isSameDay(d.checkOutTime))
+  const group5 = filteredData.filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime)).sort(sortByName);
-      .sort(sortByName);
+  const group6 = filteredData.filter((d) => d.activity === 5).sort(sortByName);
-    const group3 = filteredData
-      .filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime))
-      .sort(sortByName);
-    const group4 = filteredData.filter(
-      (d) => d.activity === 4 && isBeforeToday(d.checkOutTime)
-    );
-    const group5 = filteredData
-      .filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
-      .sort(sortByName);
-    const group6 = filteredData
-      .filter((d) => d.activity === 5)
-      .sort(sortByName);
 
-    const sortedList = [
+  const sortedList = [...group1, ...group2, ...group3, ...group4, ...group5, ...group6];
-      ...group1,
-      ...group2,
-      ...group3,
-      ...group4,
-      ...group5,
-      ...group6,
-    ];
 
-    // Group by date
+  const groupedByDate = sortedList.reduce((acc, item) => {
-    const groupedByDate = sortedList.reduce((acc, item) => {
+    const date = (item.checkInTime || item.checkOutTime)?.split("T")[0];
-      const date = (item.checkInTime || item.checkOutTime)?.split("T")[0];
+    if (date) {
-      if (date) {
+      acc[date] = acc[date] || [];
-        acc[date] = acc[date] || [];
+      acc[date].push(item);
-        acc[date].push(item);
-      }
-      return acc;
-    }, {});
-
-    const sortedDates = Object.keys(groupedByDate).sort(
-      (a, b) => new Date(b) - new Date(a)
-    );
-
-    const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
-    setProcessedData(finalData);
-  };
-
-  useEffect(() => {
-    filtering(data);
-  }, [data, showPending]);
-
-  // New useEffect to handle search filtering
-  const filteredSearchData = useMemo(() => {
-    if (!searchTerm) {
-      return processedData;
     }
-    const lowercasedSearchTerm = searchTerm.toLowerCase();
+    return acc;
-    return processedData.filter((item) => {
+  }, {});
-      const fullName = `${item.firstName} ${item.lastName}`.toLowerCase();
-      return fullName.includes(lowercasedSearchTerm);
-    });
-  }, [processedData, searchTerm]);
 
-  const {
+  const sortedDates = Object.keys(groupedByDate).sort((a, b) => new Date(b) - new Date(a));
-    currentPage,
+  return sortedDates.flatMap((date) => groupedByDate[date]);
-    totalPages,
+}, [data, showPending]);
-    currentItems: paginatedAttendances,
-    paginate,
-    resetPage,
-  } = usePagination(filteredSearchData, 20);
 
-  useEffect(() => {
+const filteredSearchData = useMemo(() => {
-    resetPage();
+  if (!searchTerm) return processedData;
-  }, [filteredSearchData, resetPage]);
 
-  const handler = useCallback(
+  const lowercased = searchTerm.toLowerCase();
-    (msg) => {
+  return processedData.filter((item) =>
-      const { startDate, endDate } = dateRange;
+    `${item.firstName} ${item.lastName}`.toLowerCase().includes(lowercased)
-      const checkIn = msg.response.checkInTime.substring(0, 10);
-      if (
-        selectedProject === msg.projectId &&
-        startDate <= checkIn &&
-        checkIn <= endDate
-      ) {
-        queryClient.setQueriesData(["attendanceLogs"], (oldData) => {
-          if (!oldData) {
-            queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] });
-            return;
-          }
-          const updatedAttendance = oldData.map((record) =>
-            record.id === msg.response.id
-              ? { ...record, ...msg.response }
-              : record
-          );
-          filtering(updatedAttendance);
-          return updatedAttendance;
-        });
-        resetPage();
-      }
-    },
-    [selectedProject, dateRange, filtering, resetPage]
   );
+}, [processedData, searchTerm]);
 
-  useEffect(() => {
+const {
-    eventBus.on("attendance_log", handler);
+  currentPage,
-    return () => eventBus.off("attendance_log", handler);
+  totalPages,
-  }, [handler]);
+  currentItems: paginatedAttendances,
+  paginate,
+  resetPage,
+} = usePagination(filteredSearchData, 20);
 
-  const employeeHandler = useCallback(
+useEffect(() => {
-    (msg) => {
+  resetPage();
-      const { startDate, endDate } = dateRange;
+}, [filteredSearchData]);
-      if (data.some((item) => item.employeeId == msg.employeeId)) {
+
-        // dispatch(
+const handler = useCallback(
-        //   fetchAttendanceData({
+  (msg) => {
-        //     ,
+    const { startDate, endDate } = dateRange;
-        //     fromDate: startDate,
+    const checkIn = msg.response.checkInTime.substring(0, 10);
-        //     toDate: endDate,
+
-        //   })
+    if (selectedProject === msg.projectId && startDate <= checkIn && checkIn <= endDate) {
-        // );
+      queryClient.setQueriesData(["attendanceLogs"], (oldData) => {
+        if (!oldData) {
+          queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] });
+          return;
+        }
+        return oldData.map((record) =>
+          record.id === msg.response.id ? { ...record, ...msg.response } : record
+        );
+      });
+      resetPage();
+    }
+  },
+  [selectedProject, dateRange, resetPage]
+);
+
+useEffect(() => {
+  eventBus.on("attendance_log", handler);
+  return () => eventBus.off("attendance_log", handler);
+}, [handler]);
+
+const employeeHandler = useCallback(
+  (msg) => {
+    const { startDate, endDate } = dateRange;
+    if (data.some((item) => item.employeeId == msg.employeeId)) {
+      refetch();
+    }
+  },
+  [data, refetch]
+);
+
+useEffect(() => {
+  eventBus.on("employee", employeeHandler);
+  return () => eventBus.off("employee", employeeHandler);
+}, [employeeHandler]);
 
-        refetch();
-      }
-    },
-    [selectedProject, dateRange, data, refetch]
-  );
 
-  useEffect(() => {
-    eventBus.on("employee", employeeHandler);
-    return () => eventBus.off("employee", employeeHandler);
-  }, [employeeHandler]);
 
   return (
     <>

src/components/Activities/Regularization.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState, useMemo } from "react";
 import Avatar from "../common/Avatar";
-import { convertShortTime } from "../../utils/dateUtils";
+import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils";
 import RegularizationActions from "./RegularizationActions";
 import { useSelector } from "react-redux";
 import { useRegularizationRequests } from "../../hooks/useAttendance";
@@ -33,7 +33,11 @@ const Regularization = ({
   );
 
   useEffect(() => {
+    if(!regularizes) return
+    if(regularizes?.length) {
     setregularizedList(regularizes);
+
+    }
   }, [regularizes]);
 
   const sortByName = (a, b) => {
@@ -122,13 +126,19 @@ const Regularization = ({
               <th>
                 <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
               </th>
+              <th colSpan={2}>
+                Requested By
+              </th>
+               <th >
+                Requested At
+              </th>
               <th>Action</th>
             </tr>
           </thead>
           <tbody>
             {currentItems?.map((att, index) => (
               <tr key={index}>
-                <td colSpan={2}>
+                   <td colSpan={2}>
                   <div className="d-flex justify-content-start align-items-center">
                     <Avatar firstName={att.firstName} lastName={att.lastName} />
                     <div className="d-flex flex-column">
@@ -146,7 +156,23 @@ const Regularization = ({
 
                 <td>{convertShortTime(att.checkInTime)}</td>
                 <td>
-                  {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
+                  {att.requestedAt ? convertShortTime(att.checkOutTime) : "--"}
+                </td>
+             
+                  <td colSpan={2}>
+                     {att.requestedBy ? ( <div className="d-flex justify-content-start align-items-center">
+                    <Avatar firstName={att?.requestedBy?.firstName} lastName={att?.requestedBy?.lastName} />
+                    <div className="d-flex flex-column">
+                      <a href="#" className="text-heading text-truncate">
+                        <span className="fw-normal">
+                          {att?.requestedBy?.firstName} {att?.requestedBy?.lastName}
+                        </span>
+                      </a>
+                    </div>
+                  </div>):(<small>--</small>)}
+                </td>
+                  <td>
+                  {att?.requestedAt ? formatUTCToLocalTime(att.requestedAt,true) : "--"}
                 </td>
                 <td className="text-center ">
                   <RegularizationActions

src/components/Organization/OrgPickerFromSPId.jsx

@@ -10,13 +10,15 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { spridSchema } from "./OrganizationSchema";
 import { OrgCardSkeleton } from "./OrganizationSkeleton";
+import { useQueryClient } from "@tanstack/react-query";
+
 
 // Zod schema: only allow exactly 4 digits
 
 const OrgPickerFromSPId = ({ title, placeholder }) => {
-  const { onClose, startStep, flowType, onOpen, prevStep } =
+  const { onClose, startStep, flowType, onOpen, prevStep,orgData } =
     useOrganizationModal();
-
+ const clientQuery = useQueryClient()
   const {
     register,
     handleSubmit,
@@ -35,8 +37,11 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
   const onSubmit = (formdata) => {
     setSPRID(formdata.spridSearchText);
   };
-
+  
-  const handleOrg = (orgId) => {};
+  const handleCrateOrg = () => {
+     clientQuery.removeQueries({queryKey:["organization"]})
+    onOpen({ startStep: 4,orgData:null })
+  };
   const SP = watch("spridSearchText");
   return (
     <div className="d-block">
@@ -126,7 +131,7 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
         <button
           type="button"
           className="btn btn-sm btn-primary mt-3"
-          onClick={() => onOpen({ startStep: 4 })}
+          onClick={handleCrateOrg}
         >
           <i className="bx bx-plus-circle me-2"></i>
           Create New Organization

src/components/Tenant/TenanatSkeleton.jsx

@@ -14,7 +14,7 @@ const SkeletonCell = ({ width = "100%", height = 20, style = {} }) => (
 
 export const TenantTableSkeleton = ({ columns, rows = 5 }) => {
   return (
-    <div className="card p-2 mt-3">
+    <div className="p-2 mt-3">
       <div className="card-datatable text-nowrap table-responsive">
         <table className="table border-top dataTable text-nowrap">
           <thead>

src/components/Tenant/TenantsList.jsx

@@ -137,7 +137,7 @@ const TenantsList = ({
   return (
     <>
       <div className="p-2 mt-3">
-        <div className="card-datatable text-nowrap table-responsive">
+        <div className=" text-nowrap table-responsive">
           <table className="table border-top dataTable text-nowrap">
             <thead>
               <tr className="shadow-sm">

src/components/master/EditContactTag.jsx

@@ -41,7 +41,6 @@ const EditContactTag = ({ data, onClose }) => {
       name: formData.name,
       description: formData.description,
     };
-    debugger
     updateContactTag({ id: data?.id, payload });
   }
   // const onSubmit = (formdata) => {

src/components/master/MasterModal.jsx

@@ -70,12 +70,12 @@ const MasterModal = ({ modaldata, closeModal }) => {
   };
 
   return (
-<>
+<div className="p-2 p-md-1">
     <div className="text-center">
       <p className="fs-5 fw-semibold" >{`${masterType, " ",  modalType}`}</p>
     </div>
      { modalComponents[modalType] || null}
-</>
+</div>
   );
 };
 

src/components/master/Services/ServicesGroups.jsx

@@ -81,8 +81,8 @@ const ServiceGroups = ({ service }) => {
             ) : (
               <div className="accordion-body text-start m-0 p-0">
                 <div className="dropdown-divider border"></div>
-
+              {!isLoading && groups?.data?.length === 0 && (<div className="text-center py-2"><p>No Group available.</p></div>)}
-                {groups?.data?.map((group) => {
+                {groups && groups?.data?.map((group) => {
                   const isOpen = activeGroupId === group.id;
 
                   return (

src/hooks/masterHook/useMaster.js

@@ -570,7 +570,6 @@ export const useUpdateContactTag = (onSuccessCallback) => {
 
   return useMutation({
     mutationFn: async ({ id, payload }) => {
-      debugger;
       const response = await MasterRespository.updateContactTag(id, payload);
       return response.data;
     },
@@ -704,13 +703,13 @@ export const useCreateService = (onSuccessCallback) => {
 
   return useMutation({
     mutationFn: async (payload) => {
-      debugger;
+
       const resp = await MasterRespository.createService(payload);
-      debugger;
+ 
       return resp.data;
     },
     onSuccess: (data) => {
-      debugger;
+     
       queryClient.invalidateQueries({ queryKey: ["masterData", "Services"] });
 
       showToast(data?.message || "Service added successfully", "success");
@@ -718,7 +717,7 @@ export const useCreateService = (onSuccessCallback) => {
       if (onSuccessCallback) onSuccessCallback(data?.data);
     },
     onError: (error) => {
-      debugger;
+   
       showToast( error?.response?.data?.message || error?.message  || "Something went wrong", "error");
     },
   });
@@ -759,7 +758,7 @@ export const useCreateActivityGroup = (onSuccessCallback) => {
       queryClient.invalidateQueries({
         queryKey: ["groups"],
       });
-  debugger
+
       showToast( data?.message ||
         data?.response?.data?.message || "Activity Group created successfully.",
         "success"

src/hooks/useOrganization.js

@@ -24,7 +24,7 @@ export const useOrganizationModal = () => {
       dispatch(
         openOrgModal({
           isOpen: true,
-          orgData: options.orgData ?? orgData ?? null,
+          orgData: options.hasOwnProperty("orgData") ? options.orgData : orgData,
           startStep: options.startStep ?? startStep ?? 1,
           prevStep: options.prevStep ?? prevStep ?? 1,
           flowType: options.flowType ?? flowType ?? "default",

src/pages/Directory/DirectoryPage.jsx

@@ -162,29 +162,33 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                 </ul>
               </div>
 
-              <div className="mb-1 px-2 py-3">
+              <div className="mb-1 px-md-2 px-0 py-3">
-                <div className="d-flex align-items-center justify-content-between">
+                <div className="row">
-                  <div className="d-flex align-items-center gap-3">
+                  <div className="col-12 col-md-10 mb-2">
                     {activeTab === "notes" && (
-                      <input
+                      <div className="col-8 col-md-3">
+                        <input
                         type="search"
                         className="form-control form-control-sm"
                         placeholder="Search notes..."
                         value={searchNote}
                         onChange={(e) => setSearchNote(e.target.value)}
                       />
+                      </div>
                     )}
 
                     {activeTab === "contacts" && (
                       <div className="d-flex align-items-center gap-3">
-                        <div className="d-flex gap-2 align-items-center">
+                        <div className="col-12 col-md-8 d-flex flex-row gap-2">
-                          <input
+                         <div className="col-7 col-md-4">
+                           <input
                             type="search"
                             className="form-control form-control-sm"
                             placeholder="Search contacts..."
                             value={searchContact}
                             onChange={(e) => setsearchContact(e.target.value)}
                           />
+                         </div>
                           <button
                             className={`btn btn-sm p-1 ${
                               !gridView ? "btn-primary" : "btn-outline-primary"
@@ -202,9 +206,7 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                           >
                             <i className="bx bx-grid-alt"></i>
                           </button>
-                        </div>
+                          <div className="form-check form-switch d-flex align-items-center d-none d-md-flex">
-
-                        <div className="form-check form-switch d-flex align-items-center">
                           <input
                             type="checkbox"
                             className="form-check-input"
@@ -220,11 +222,30 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                             {showActive ? "Active" : "Inactive"} Contacts
                           </label>
                         </div>
+                        </div>
+
+                        
                       </div>
                     )}
                   </div>
-
+                   <div className="col-12 col-md-2 d-flex justify-content-end align-items-center gap-2">
-                  <div className="btn-group">
+                    <div className={`form-check form-switch d-flex align-items-center  ${activeTab === "contacts" ? " d-flex d-md-none m-0":"d-none" }`}>
+                          <input
+                            type="checkbox"
+                            className="form-check-input"
+                            role="switch"
+                            id="inactiveEmployeesCheckbox"
+                            checked={showActive}
+                            onChange={(e) => setShowActive(e.target.checked)}
+                          />
+                          <label
+                            className="form-check-label ms-2"
+                            htmlFor="inactiveEmployeesCheckbox"
+                          >
+                            {showActive ? "Active" : "Inactive"} Contacts
+                          </label>
+                        </div>
+                        <div className="  btn-group">
                     <button
                       className="btn btn-sm btn-label-secondary dropdown-toggle"
                       type="button"
@@ -244,6 +265,8 @@ export default function DirectoryPage({ IsPage = true, projectId = null }) {
                       </li>
                     </ul>
                   </div>
+                   </div>
+                  
                 </div>
               </div>
             </div>

src/pages/master/MasterPage.jsx

@@ -103,7 +103,7 @@ const MasterPage = () => {
 
   if (menuErrorFlag || isMasterError)
     return (
-      <div className="d-flex flex-column align-items-center justify-content-center py-5">
+      <div className="d-flex flex-column align-items-center justify-content-center py-1 py-md-5">
         <h4 className="mb-3">
           <i className="fa-solid fa-triangle-exclamation fs-5" /> Oops, an error
           occurred
@@ -161,21 +161,17 @@ const MasterPage = () => {
           data={[{ label: "Home", link: "/dashboard" }, { label: "Masters" }]}
         />
 
-        <div className="row">
+        <div className="row page-min-h">
           <div className="card">
             <div
-              className="card-datatable table-responsive py-10 mx-5 "
+              className="card-datatable table-responsive py-2 py-md-10 mx-1 mx-md-5 "
               style={{ overflow: "hidden" }}
             >
               <div className="row mb-2">
-                <div className="col-md-3 col-sm-6">
+                <div className="col-12 col-md-3">
                   <select
                     className="form-select py-1 px-2"
-                    style={{
+                   
-                      fontSize: "0.875rem",
-                      height: "32px",
-                      width: "190px",
-                    }}
                     value={selectedMaster}
                     onChange={(e) => dispatch(changeMaster(e.target.value))}
                   >
@@ -190,8 +186,8 @@ const MasterPage = () => {
                     )}
                   </select>
                 </div>
-                <div className="col-md-9 col-sm-6 d-flex justify-content-end align-items-center gap-2">
+                <div className="col-12 col-md-9  d-flex justify-content-end align-items-center gap-2 mt-2 mt-md-0">
-                  <div className="w-25">
+                  <div className="col-6 col-md-3">
                     <input
                       type="search"
                       className="form-control form-control-sm"
@@ -207,8 +203,8 @@ const MasterPage = () => {
                         handleModalData(selectedMaster, null, selectedMaster)
                       }
                     >
-                      <i className="bx bx-plus-circle me-2"></i>Add{" "}
+                      <i className="bx bx-plus-circle me-2"></i> <span className="d-none d-md-inline-block">Add{" "}
-                      {selectedMaster}
+                      {selectedMaster}</span>
                     </button>
                   )}
                 </div>

src/pages/master/MasterTable.jsx

@@ -92,7 +92,8 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
                 {" "}
                 {selectedMaster === "Activity" ? "Activity" : "Name"}
               </th>
-              <th className="text-start">
+    <th className="text-start d-none d-md-table-cell">
+
                 {" "}
                 {selectedMaster === "Activity"
                   ? "Unit"
@@ -108,12 +109,12 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
           <tbody>
             {currentItems.length > 0 ? (
               currentItems.map((item, index) => (
-                <tr key={index}>
+                <tr key={index} >
-                  <td style={{ width: "20px" }}>
+                  <td style={{ width: "20px" }} className="py-3">
                     <i className="bx bx-right-arrow-alt"></i>
                   </td>
                   {updatedColumns.map((col) => (
-                    <td className="text-start mx-2" key={col.key}>
+                    <td className={`text-start mx-2 py-3 ${col.key === "description" && "d-none d-md-table-cell"}`} key={col.key} >
                       {col.key === "description" ? (
                         item[col.key] !== undefined &&
                         item[col.key] !== null ? (
@@ -133,7 +134,7 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
                       )}
                     </td>
                   ))}
-                  <td className={!hasMasterPermission ? "d-none" : ""}>
+                  <td className={!hasMasterPermission ? "d-none" : "py-3"}>
                     {(selectedMaster === "Application Role" ||
                       selectedMaster === "Work Category") &&
                     item?.isSystem ? (