admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

react-query-v2 : react-query intergrated inside attendance and gallery module #270

Merged
vikas.nale merged 16 commits from react-query-v2 into main 2025-07-24 09:41:21 +00:00
Conversation 0 Commits 16 Files Changed 17 +1232 -966
17 changed files with 1232 additions and 966 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -51,7 +51,7 @@
<!-- Timer Picker --> <!-- Timer Picker -->
<!-- Flatpickr CSS --> <!-- Flatpickr CSS -->
<link rel="stylesheet" href="/assets/vendor/libs/flatpickr/flatpickr.css" /> <link rel="stylesheet" href="/assets/vendor/libs/flatpickr/flatpickr.css" />
<link rel="stylesheet" href="./src/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css" /> <link rel="stylesheet" href="/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css" />

34
public/assets/js/main.js
View File

@ -115,4 +115,38 @@ function Main () {
// Auto update menu collapsed/expanded based on the themeConfig // Auto update menu collapsed/expanded based on the themeConfig
window.Helpers.setCollapsed(true, false); window.Helpers.setCollapsed(true, false);
// perfect scrolling
const verticalExample = document.getElementById('vertical-example'),
horizontalExample = document.getElementById('horizontal-example'),
horizVertExample = document.getElementById('both-scrollbars-example');
// Vertical Example
// --------------------------------------------------------------------
if (verticalExample) {
new PerfectScrollbar(verticalExample, {
wheelPropagation: false
});
}
// Horizontal Example
// --------------------------------------------------------------------
if (horizontalExample) {
new PerfectScrollbar(horizontalExample, {
wheelPropagation: false,
suppressScrollY: true
});
}
// Both vertical and Horizontal Example
// --------------------------------------------------------------------
if (horizVertExample) {
new PerfectScrollbar(horizVertExample, {
wheelPropagation: false
});
}
}; };

106
src/components/Activities/Attendance.jsx
View File

@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect, useCallback } from "react";
import moment from "moment"; import moment from "moment";
import Avatar from "../common/Avatar"; import Avatar from "../common/Avatar";
import { convertShortTime } from "../../utils/dateUtils"; import { convertShortTime } from "../../utils/dateUtils";
@ -6,29 +6,41 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus";
import usePagination from "../../hooks/usePagination"; import usePagination from "../../hooks/usePagination";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { ITEMS_PER_PAGE } from "../../utils/constants"; import { ITEMS_PER_PAGE } from "../../utils/constants";
import { useAttendance } from "../../hooks/useAttendance";
import { useSelector } from "react-redux";
import { useQueryClient } from "@tanstack/react-query";
import eventBus from "../../services/eventBus";
const Attendance = ({ const Attendance = ({ getRole, handleModalData }) => {
attendance, const queryClient = useQueryClient();
getRole,
handleModalData,
setshowOnlyCheckout,
showOnlyCheckout,
}) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const navigate = useNavigate(); const navigate = useNavigate();
const [todayDate, setTodayDate] = useState(new Date()); 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);
const filteredAttendance = ShowPending
? attendance?.filter(
(att) => att?.checkInTime !== null && att?.checkOutTime === null
)
: attendance;
// Ensure attendance is an array const attendanceList = Array.isArray(filteredAttendance)
const attendanceList = Array.isArray(attendance) ? attendance : []; ? filteredAttendance
: [];
// Function to sort by first and last name
const sortByName = (a, b) => { const sortByName = (a, b) => {
const nameA = (a.firstName + a.lastName).toLowerCase(); const nameA = (a.firstName + a.lastName).toLowerCase();
const nameB = (b.firstName + b.lastName).toLowerCase(); const nameB = (b.firstName + b.lastName).toLowerCase();
return nameA?.localeCompare(nameB); return nameA?.localeCompare(nameB);
}; };
// Filter employees based on activity
const group1 = attendanceList const group1 = attendanceList
.filter((d) => d.activity === 1 || d.activity === 4) .filter((d) => d.activity === 1 || d.activity === 4)
.sort(sortByName); .sort(sortByName);
@ -37,30 +49,69 @@ const Attendance = ({
.sort(sortByName); .sort(sortByName);
const filteredData = [...group1, ...group2]; const filteredData = [...group1, ...group2];
const { currentPage, totalPages, currentItems, paginate } = usePagination( const { currentPage, totalPages, currentItems, paginate } = usePagination(
filteredData, filteredData,
ITEMS_PER_PAGE ITEMS_PER_PAGE
); );
const handler = useCallback(
(msg) => {
if (selectedProject == msg.projectId) {
// const updatedAttendance = attendances.map((item) =>
// item.employeeId === msg.response.employeeId
// ? { ...item, ...msg.response }
// : item
// );
queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
if (!oldData) {
queryClient.invalidateQueries({queryKey:["attendance"]})
};
return oldData.map((record) =>
record.employeeId === msg.response.employeeId ? { ...record, ...msg.response } : record
);
});
}
},
[selectedProject, attrecall]
);
const employeeHandler = useCallback(
(msg) => {
if (attendances.some((item) => item.employeeId == msg.employeeId)) {
attrecall();
}
},
[selectedProject, attendance]
);
useEffect(() => {
eventBus.on("attendance", handler);
return () => eventBus.off("attendance", handler);
}, [handler]);
useEffect(() => {
eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]);
return ( return (
<> <>
<div className="table-responsive text-nowrap"> <div className="table-responsive text-nowrap h-100" >
<div className="d-flex text-start align-items-center py-2"> <div className="d-flex text-start align-items-center py-2">
<strong>Date : {todayDate.toLocaleDateString("en-GB")}</strong> <strong>Date : {todayDate.toLocaleDateString("en-GB")}</strong>
<div className="form-check form-switch text-start m-0 ms-5"> <div className="form-check form-switch text-start m-0 ms-5">
<input <input
type="checkbox" type="checkbox"
className="form-check-input" className="form-check-input"
role="switch" role="switch"
id="inactiveEmployeesCheckbox" id="inactiveEmployeesCheckbox"
checked={showOnlyCheckout} disabled={isFetching}
onChange={(e) => setshowOnlyCheckout(e.target.checked)} checked={ShowPending}
onChange={(e) => setShowPending(e.target.checked)}
/> />
<label className="form-check-label ms-0">Show Pending</label> <label className="form-check-label ms-0">Show Pending</label>
</div> </div>
</div> </div>
{attendance && attendance.length > 0 && ( {Array.isArray(attendance) && attendance.length > 0 ? (
<> <>
<table className="table "> <table className="table ">
<thead> <thead>
@ -81,14 +132,13 @@ const Attendance = ({
{currentItems && {currentItems &&
currentItems currentItems
.sort((a, b) => { .sort((a, b) => {
// If checkInTime exists, compare it, otherwise, treat null as earlier than a date
const checkInA = a?.checkInTime const checkInA = a?.checkInTime
? new Date(a.checkInTime) ? new Date(a.checkInTime)
: new Date(0); : new Date(0);
const checkInB = b?.checkInTime const checkInB = b?.checkInTime
? new Date(b.checkInTime) ? new Date(b.checkInTime)
: new Date(0); : new Date(0);
return checkInB - checkInA; // Sort in descending order of checkInTime return checkInB - checkInA;
}) })
.map((item) => ( .map((item) => (
<tr key={item.employeeId}> <tr key={item.employeeId}>
@ -138,7 +188,7 @@ const Attendance = ({
</tr> </tr>
))} ))}
{!attendance && ( {!attendance && (
<span>No employees assigned to the project</span> <span className="text-secondary m-4">No employees assigned to the project!</span>
)} )}
</tbody> </tbody>
</table> </table>
@ -189,6 +239,18 @@ const Attendance = ({
</nav> </nav>
)} )}
</> </>
) : attLoading ? (
<div>Loading...</div>
) : (
<div className="text-muted">
{Array.isArray(attendance)
? "No employees assigned to the project"
: "Attendance data unavailable"}
</div>
)}
{currentItems?.length == 0 && attendance.length > 0 && (
<div className="my-4"><span className="text-secondary">No Pending Record Available !</span></div>
)} )}
</div> </div>
</> </>

273
src/components/Activities/AttendcesLogs.jsx
View File

@ -9,6 +9,8 @@ import DateRangePicker from "../common/DateRangePicker";
import { clearCacheKey, getCachedData } from "../../slices/apiDataManager"; import { clearCacheKey, getCachedData } from "../../slices/apiDataManager";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
import AttendanceRepository from "../../repositories/AttendanceRepository"; import AttendanceRepository from "../../repositories/AttendanceRepository";
import { useAttendancesLogs } from "../../hooks/useAttendance";
import { queryClient } from "../../layouts/AuthLayout";
const usePagination = (data, itemsPerPage) => { const usePagination = (data, itemsPerPage) => {
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
@ -33,13 +35,15 @@ const usePagination = (data, itemsPerPage) => {
const AttendanceLog = ({ const AttendanceLog = ({
handleModalData, handleModalData,
projectId,
setshowOnlyCheckout,
showOnlyCheckout,
}) => { }) => {
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
const dispatch = useDispatch(); 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 [isRefreshing, setIsRefreshing] = useState(false);
const [processedData, setProcessedData] = useState([]); const [processedData, setProcessedData] = useState([]);
@ -69,20 +73,19 @@ const AttendanceLog = ({
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,
setIsRefreshing(false); dateRange.endDate
}, [dateRange, projectId, dispatch, isRefreshing]); );
const filtering = (data) => { const filtering = (data) => {
const filteredData = showOnlyCheckout const filteredData = showPending
? data.filter((item) => item.checkOutTime === null) ? data.filter((item) => item.checkOutTime === null)
: data; : data;
@ -124,19 +127,17 @@ const AttendanceLog = ({
return acc; return acc;
}, {}); }, {});
// Sort dates in descending order
const sortedDates = Object.keys(groupedByDate).sort( const sortedDates = Object.keys(groupedByDate).sort(
(a, b) => new Date(b) - new Date(a) (a, b) => new Date(b) - new Date(a)
); );
// Create the final sorted array
const finalData = sortedDates.flatMap((date) => groupedByDate[date]); const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
setProcessedData(finalData); setProcessedData(finalData);
} };
useEffect(() => { useEffect(() => {
filtering(data) filtering(data);
}, [data, showOnlyCheckout]); }, [data, showPending]);
const { const {
currentPage, currentPage,
@ -146,55 +147,59 @@ const AttendanceLog = ({
resetPage, resetPage,
} = usePagination(processedData, 20); } = usePagination(processedData, 20);
// Reset to the first page whenever processedData changes (due to switch on/off)
useEffect(() => { useEffect(() => {
resetPage(); resetPage();
}, [processedData, resetPage]); }, [processedData, resetPage]);
const handler = useCallback( const handler = useCallback(
(msg) => { (msg) => {
const { startDate, endDate } = dateRange; const { startDate, endDate } = dateRange;
const checkIn = msg.response.checkInTime.substring(0, 10); const checkIn = msg.response.checkInTime.substring(0, 10);
if ( if (
projectId === msg.projectId && selectedProject === msg.projectId &&
startDate <= checkIn && startDate <= checkIn &&
checkIn <= endDate 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
);
})
filtering(updatedAttendance); filtering(updatedAttendance);
resetPage(); resetPage();
} }
}, },
[projectId, dateRange, data, filtering, resetPage] [selectedProject, dateRange, data, filtering, resetPage]
); );
useEffect(() => { useEffect(() => {
eventBus.on("attendance_log", handler); eventBus.on("attendance_log", handler);
return () => eventBus.off("attendance_log", handler); return () => eventBus.off("attendance_log", handler);
}, [handler]); }, [handler]);
const employeeHandler = useCallback( const employeeHandler = useCallback(
(msg) => { (msg) => {
const { startDate, endDate } = dateRange; const { startDate, endDate } = dateRange;
if (data.some((item) => item.employeeId == msg.employeeId)) { if (data.some((item) => item.employeeId == msg.employeeId)) {
dispatch( // dispatch(
fetchAttendanceData({ // fetchAttendanceData({
projectId, // ,
fromDate: startDate, // fromDate: startDate,
toDate: endDate, // toDate: endDate,
}) // })
) // );
refetch()
} }
}, },
[projectId, dateRange,data] [selectedProject, dateRange, data]
); );
useEffect(() => { useEffect(() => {
eventBus.on("employee", employeeHandler); eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler); return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]); }, [employeeHandler]);
@ -215,9 +220,10 @@ const AttendanceLog = ({
type="checkbox" type="checkbox"
className="form-check-input" className="form-check-input"
role="switch" role="switch"
disabled={isFetching}
id="inactiveEmployeesCheckbox" 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> <label className="form-check-label ms-0">Show Pending</label>
</div> </div>
@ -225,18 +231,17 @@ const AttendanceLog = ({
<div className="col-md-2 m-0 text-end"> <div className="col-md-2 m-0 text-end">
<i <i
className={`bx bx-refresh cursor-pointer fs-4 ${ className={`bx bx-refresh cursor-pointer fs-4 ${
loading || isRefreshing ? "spin" : "" isFetching ? "spin" : ""
}`} }`}
title="Refresh" title="Refresh"
onClick={() => setIsRefreshing(true)} onClick={() => refetch()}
/> />
</div> </div>
</div> </div>
<div <div className="table-responsive text-nowrap">
className="table-responsive text-nowrap" {isLoading ? (
style={{ minHeight: "200px", display: 'flex', alignItems: 'center', justifyContent: 'center' }} <div><p className="text-secondary">Loading...</p></div>
> ) : data?.length > 0 ? (
{data && data.length > 0 && (
<table className="table mb-0"> <table className="table mb-0">
<thead> <thead>
<tr> <tr>
@ -255,92 +260,82 @@ const AttendanceLog = ({
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{(loading || isRefreshing) && ( {paginatedAttendances.reduce((acc, attendance, index, arr) => {
<tr> const currentDate = moment(
<td colSpan={6}>Loading...</td> attendance.checkInTime || attendance.checkOutTime
</tr> ).format("YYYY-MM-DD");
)} const previousAttendance = arr[index - 1];
{!loading && const previousDate = previousAttendance
!isRefreshing && ? moment(
paginatedAttendances.reduce((acc, attendance, index, arr) => { previousAttendance.checkInTime ||
const currentDate = moment( previousAttendance.checkOutTime
attendance.checkInTime || attendance.checkOutTime ).format("YYYY-MM-DD")
).format("YYYY-MM-DD"); : null;
const previousAttendance = arr[index - 1];
const previousDate = previousAttendance
? moment(
previousAttendance.checkInTime ||
previousAttendance.checkOutTime
).format("YYYY-MM-DD")
: null;
if (!previousDate || currentDate !== previousDate) { if (!previousDate || currentDate !== previousDate) {
acc.push(
<tr
key={`header-${currentDate}`}
className="table-row-header"
>
<td colSpan={6} className="text-start">
<strong>
{moment(currentDate).format("DD-MM-YYYY")}
</strong>
</td>
</tr>
);
}
acc.push( acc.push(
<tr key={index}> <tr
<td colSpan={2}> key={`header-${currentDate}`}
<div className="d-flex justify-content-start align-items-center"> className="table-row-header"
<Avatar >
firstName={attendance.firstName} <td colSpan={6} className="text-start">
lastName={attendance.lastName} <strong>
/> {moment(currentDate).format("DD-MM-YYYY")}
<div className="d-flex flex-column"> </strong>
<a href="#" className="text-heading text-truncate">
<span className="fw-normal">
{attendance.firstName} {attendance.lastName}
</span>
</a>
</div>
</div>
</td>
<td>
{moment(
attendance.checkInTime || attendance.checkOutTime
).format("DD-MMM-YYYY")}
</td>
<td>{convertShortTime(attendance.checkInTime)}</td>
<td>
{attendance.checkOutTime
? convertShortTime(attendance.checkOutTime)
: "--"}
</td>
<td className="text-center">
<RenderAttendanceStatus
attendanceData={attendance}
handleModalData={handleModalData}
Tab={2}
currentDate={today.toLocaleDateString("en-CA")}
/>
</td> </td>
</tr> </tr>
); );
return acc; }
}, [])} acc.push(
<tr key={index}>
<td colSpan={2}>
<div className="d-flex justify-content-start align-items-center">
<Avatar
firstName={attendance.firstName}
lastName={attendance.lastName}
/>
<div className="d-flex flex-column">
<a href="#" className="text-heading text-truncate">
<span className="fw-normal">
{attendance.firstName} {attendance.lastName}
</span>
</a>
</div>
</div>
</td>
<td>
{moment(
attendance.checkInTime || attendance.checkOutTime
).format("DD-MMM-YYYY")}
</td>
<td>{convertShortTime(attendance.checkInTime)}</td>
<td>
{attendance.checkOutTime
? convertShortTime(attendance.checkOutTime)
: "--"}
</td>
<td className="text-center">
<RenderAttendanceStatus
attendanceData={attendance}
handleModalData={handleModalData}
Tab={2}
currentDate={today.toLocaleDateString("en-CA")}
/>
</td>
</tr>
);
return acc;
}, [])}
</tbody> </tbody>
</table> </table>
) : (
<div className="my-4"><span className="text-secondary">No Record Available !</span></div>
)} )}
{!loading && !isRefreshing && data.length === 0 && (
<span className="text-muted">No employee logs</span>
)}
{/* {error && !loading && !isRefreshing && (
<tr>
<td colSpan={6}>{error}</td>
</tr>
)} */}
</div> </div>
{!loading && !isRefreshing && processedData.length > 10 && ( {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 "> <nav aria-label="Page ">
<ul className="pagination pagination-sm justify-content-end py-1"> <ul className="pagination pagination-sm justify-content-end py-1">
<li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}> <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>

48
src/components/Activities/CheckCheckOutForm.jsx
View File

@ -8,6 +8,7 @@ import { useDispatch, useSelector } from "react-redux";
import { markAttendance } from "../../slices/apiSlice/attedanceLogsSlice"; import { markAttendance } from "../../slices/apiSlice/attedanceLogsSlice";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
import { checkIfCurrentDate } from "../../utils/dateUtils"; import { checkIfCurrentDate } from "../../utils/dateUtils";
import { useMarkAttendance } from "../../hooks/useAttendance";
const schema = z.object({ const schema = z.object({
@ -18,6 +19,7 @@ const schema = z.object({
const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => { const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
const projectId = useSelector((store) => store.localVariables.projectId) const projectId = useSelector((store) => store.localVariables.projectId)
const {mutate:MarkAttendance} = useMarkAttendance()
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const coords = usePositionTracker(); const coords = usePositionTracker();
const dispatch = useDispatch() const dispatch = useDispatch()
@ -44,29 +46,34 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
const onSubmit = (data) => { 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 = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
if (modeldata.forWhichTab === 1) { // if (modeldata.forWhichTab === 1 || modeldata.forWhichTab === 2) {
handleSubmitForm(record) // handleSubmitForm(record)
} else { const payload = {
Id: modeldata?.id || null,
comment: data.description,
employeeID: modeldata.employeeId,
projectId: projectId,
date: new Date().toISOString(),
markTime: data.markTime,
latitude: coords.latitude.toString(),
longitude: coords.longitude.toString(),
action: modeldata.action,
image: null,
};
MarkAttendance({payload,forWhichTab:modeldata.forWhichTab})
// } else {
// dispatch(markAttendance(record))
// .unwrap()
// .then((data) => {
// if ( modeldata?.currentDate && checkIfCurrentDate( modeldata?.currentDate ) ) // showToast("Attendance Marked Successfully", "success");
// { // })
dispatch(markAttendance(record)) // .catch((error) => {
.unwrap()
.then((data) => {
showToast("Attendance Marked Successfully", "success"); // showToast(error, "error");
})
.catch((error) => {
showToast(error, "error"); // });
// }
});
// } else
// {
// let formData = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,projectId:projectId,action:modeldata.action,id:modeldata?.id || null}
// }
}
closeModal() closeModal()
}; };
@ -175,7 +182,6 @@ export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
const onSubmit = (data) => { const onSubmit = (data) => {
let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, } let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, }
handleSubmitForm(record) handleSubmitForm(record)
closeModal() closeModal()

164
src/components/Activities/Regularization.jsx
View File

@ -8,8 +8,10 @@ import moment from "moment";
import usePagination from "../../hooks/usePagination"; import usePagination from "../../hooks/usePagination";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
import { cacheData, clearCacheKey } from "../../slices/apiDataManager"; import { cacheData, clearCacheKey } from "../../slices/apiDataManager";
import { useQueryClient } from "@tanstack/react-query";
const Regularization = ({ handleRequest }) => { const Regularization = ({ handleRequest }) => {
const queryClient = useQueryClient();
var selectedProject = useSelector((store) => store.localVariables.projectId); var selectedProject = useSelector((store) => store.localVariables.projectId);
const [regularizesList, setregularizedList] = useState([]); const [regularizesList, setregularizedList] = useState([]);
const { regularizes, loading, error, refetch } = const { regularizes, loading, error, refetch } =
@ -28,13 +30,25 @@ const Regularization = ({ handleRequest }) => {
const handler = useCallback( const handler = useCallback(
(msg) => { (msg) => {
if (selectedProject == msg.projectId) { if (selectedProject == msg.projectId) {
const updatedAttendance = regularizes?.filter( item => item.id !== msg.response.id ); // const updatedAttendance = regularizes?.filter(
cacheData("regularizedList", { // (item) => item.id !== msg.response.id
data: updatedAttendance, // );
projectId: selectedProject, // cacheData("regularizedList", {
}); // data: updatedAttendance,
// clearCacheKey("regularizedList") // projectId: selectedProject,
refetch(); // });
// refetch();
queryClient.setQueryData(
["regularizedList", selectedProject],
(oldData) => {
if (!oldData) {
queryClient.invalidateQueries({ queryKey: ["regularizedList"] });
}
return oldData.filter((record) => record.id !== msg.response.id);
}
),
queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] });
} }
}, },
[selectedProject, regularizes] [selectedProject, regularizes]
@ -51,7 +65,7 @@ const Regularization = ({ handleRequest }) => {
return () => eventBus.off("regularization", handler); return () => eventBus.off("regularization", handler);
}, [handler]); }, [handler]);
const employeeHandler = useCallback( const employeeHandler = useCallback(
(msg) => { (msg) => {
if (regularizes.some((item) => item.employeeId == msg.employeeId)) { if (regularizes.some((item) => item.employeeId == msg.employeeId)) {
refetch(); refetch();
@ -60,91 +74,73 @@ const Regularization = ({ handleRequest }) => {
[regularizes] [regularizes]
); );
useEffect(() => { useEffect(() => {
eventBus.on("employee", employeeHandler); eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler); return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]); }, [employeeHandler]);
return ( return (
<div <div className="table-responsive text-nowrap pb-4">
className="table-responsive text-nowrap pb-4" {loading ? (
<div className="my-2">
> <p className="text-secondary">Loading...</p>
<table className="table mb-0"> </div>
<thead> ) : currentItems?.length > 0 ? (
<tr> <table className="table mb-0">
<th colSpan={2}>Name</th> <thead>
<th>Date</th> <tr>
<th> <th colSpan={2}>Name</th>
<i className="bx bxs-down-arrow-alt text-success"></i>Check-In <th>Date</th>
</th> <th>
<th> <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
<i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out </th>
</th> <th>
<th>Action</th> <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
</tr> </th>
</thead> <th>Action</th>
<tbody> </tr>
{/* {loading && ( </thead>
<td colSpan={6} className="text-center py-5"> <tbody>
Loading... {currentItems?.map((att, index) => (
</td> <tr key={index}>
)} */} <td colSpan={2}>
<div className="d-flex justify-content-start align-items-center">
{!loading && <Avatar
(currentItems?.length > 0 ? ( firstName={att.firstName}
currentItems?.map((att, index) => ( lastName={att.lastName}
<tr key={index}> ></Avatar>
<td colSpan={2}> <div className="d-flex flex-column">
<div className="d-flex justify-content-start align-items-center"> <a href="#" className="text-heading text-truncate">
<Avatar <span className="fw-normal">
firstName={att.firstName} {att.firstName} {att.lastName}
lastName={att.lastName} </span>
></Avatar> </a>
<div className="d-flex flex-column">
<a href="#" className="text-heading text-truncate">
<span className="fw-normal">
{att.firstName} {att.lastName}
</span>
</a>
</div>
</div> </div>
</td> </div>
<td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td> </td>
<td>{convertShortTime(att.checkInTime)}</td> <td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td>
<td> <td>{convertShortTime(att.checkInTime)}</td>
{att.checkOutTime <td>
? convertShortTime(att.checkOutTime) {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
: "--"} </td>
</td> <td className="text-center ">
<td className="text-center "> <RegularizationActions
{/* <div className='d-flex justify-content-center align-items-center gap-3'> */} attendanceData={att}
<RegularizationActions handleRequest={handleRequest}
attendanceData={att} refresh={refetch}
handleRequest={handleRequest} />
refresh={refetch} {/* </div> */}
/>
{/* </div> */}
</td>
</tr>
))
) : (
<tr>
<td
colSpan={6}
className="text-center"
style={{
height: "200px",
verticalAlign: "middle",
borderBottom: "none",
}}
>
No Record Found
</td> </td>
</tr> </tr>
))} ))}
</tbody> </tbody>
</table> </table>
) : (
<div className="my-4">
{" "}
<span className="text-secondary">No Requests Found !</span>
</div>
)}
{!loading && totalPages > 1 && ( {!loading && totalPages > 1 && (
<nav aria-label="Page "> <nav aria-label="Page ">
<ul className="pagination pagination-sm justify-content-end py-1 mt-3"> <ul className="pagination pagination-sm justify-content-end py-1 mt-3">

58
src/components/Activities/RegularizationActions.jsx
View File

@ -6,12 +6,16 @@ import { usePositionTracker } from '../../hooks/usePositionTracker';
import {markCurrentAttendance} from '../../slices/apiSlice/attendanceAllSlice'; import {markCurrentAttendance} from '../../slices/apiSlice/attendanceAllSlice';
import {cacheData, getCachedData} from '../../slices/apiDataManager'; import {cacheData, getCachedData} from '../../slices/apiDataManager';
import showToast from '../../services/toastService'; import showToast from '../../services/toastService';
import { useMarkAttendance } from '../../hooks/useAttendance';
import { useQueryClient } from '@tanstack/react-query';
const RegularizationActions = ({attendanceData,handleRequest,refresh}) => { const RegularizationActions = ({attendanceData,handleRequest,refresh}) => {
const [status,setStatus] = useState() const [status,setStatus] = useState()
const [loadingApprove,setLoadingForApprove] = useState(false) const [loadingApprove,setLoadingForApprove] = useState(false)
const [loadingReject,setLoadingForReject] = useState(false) const [loadingReject,setLoadingForReject] = useState(false)
const {mutate:MarkAttendance,isPending} = useMarkAttendance()
const queryClient = useQueryClient()
const projectId = useSelector((store)=>store.localVariables.projectId) const projectId = useSelector((store)=>store.localVariables.projectId)
const {latitude,longitude} = usePositionTracker(); const {latitude,longitude} = usePositionTracker();
@ -24,11 +28,11 @@ const dispatch = useDispatch()
}else{ }else{
setLoadingForReject(true) setLoadingForReject(true)
} }
// setLoading(true)
let req_Data = { let payload = {
id:request_attendance.id || null, id:request_attendance.id || null,
description: ` ${IsReqularize ? "Approved" : "Rejected"}! regularization request`, comment: ` ${IsReqularize ? "Approved" : "Rejected"}! regularization request`,
employeeId:request_attendance?.employeeId, employeeID:request_attendance?.employeeId,
projectId:projectId, projectId:projectId,
date:new Date().toISOString(), date:new Date().toISOString(),
markTime:new Date().toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit" }), markTime:new Date().toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit" }),
@ -38,21 +42,45 @@ const dispatch = useDispatch()
image:null image:null
} }
dispatch( markCurrentAttendance( req_Data ) ).then( ( action ) =>
MarkAttendance(
{ payload, forWhichTab: 3 },
{ {
onSuccess: () => {
queryClient.invalidateQueries({queryKey:["regularizedList"]})
if (IsReqularize) {
setLoadingForApprove(false);
} else {
setLoadingForReject(false);
}
showToast(`Successfully ${IsReqularize ? "approved" : "rejected"}`, "success");
},
onError: (error) => {
showToast(error.message || "Failed to submit", "error");
if (IsReqularize) {
setLoadingForApprove(false);
} else {
setLoadingForReject(false);
}
},
}
);
const regularizedList = getCachedData("regularizedList") // dispatch( markCurrentAttendance( req_Data ) ).then( ( action ) =>
// {
const updatedata = regularizedList?.data?.filter( item => item.id !== action.payload.id ); // const regularizedList = getCachedData("regularizedList")
cacheData("regularizedList",{data:updatedata,projectId:projectId}) // const updatedata = regularizedList?.data?.filter( item => item.id !== action.payload.id );
setLoadingForApprove( false )
setLoadingForReject( false ) // cacheData("regularizedList",{data:updatedata,projectId:projectId})
refresh() // setLoadingForApprove( false )
}).catch( ( error ) => // setLoadingForReject( false )
{ // refresh()
showToast(error.message,"error") // }).catch( ( error ) =>
}); // {
// showToast(error.message,"error")
// });
} }

2
src/components/Project/Infrastructure/WorkItem.jsx
View File

@ -32,7 +32,7 @@ const WorkItem = ({
forWorkArea, forWorkArea,
deleteHandleTask, deleteHandleTask,
}) => { }) => {
// const projectId = useSelector((store)=>store.localVariables.projectId) const projectId = useSelector((store)=>store.localVariables.projectId)
const isTaskPlanning = /^\/activities\/task$/.test(location.pathname); const isTaskPlanning = /^\/activities\/task$/.test(location.pathname);
const [itemName, setItemName] = useState(""); const [itemName, setItemName] = useState("");

358
src/hooks/useAttendance.js
View File

@ -1,109 +1,293 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { cacheData, getCachedData } from "../slices/apiDataManager"; import { cacheData, getCachedData } from "../slices/apiDataManager";
import AttendanceRepository from "../repositories/AttendanceRepository"; import AttendanceRepository from "../repositories/AttendanceRepository";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import showToast from "../services/toastService";
import { useDispatch, useSelector } from "react-redux";
import { store } from "../store/store";
import { setDefaultDateRange } from "../slices/localVariablesSlice";
export const useAttendace =(projectId)=>{ // export const useAttendace =(projectId)=>{
const [attendance, setAttendance] = useState([]); // const [attendance, setAttendance] = useState([]);
const[loading,setLoading] = useState(true) // const[loading,setLoading] = useState(true)
const [error, setError] = useState(null); // const [error, setError] = useState(null);
const fetchData = () => { // const fetchData = () => {
const Attendance_cache = getCachedData("Attendance"); // const Attendance_cache = getCachedData("Attendance");
if(!Attendance_cache || Attendance_cache.projectId !== projectId){ // if(!Attendance_cache || Attendance_cache.projectId !== projectId){
setLoading(true); // setLoading(true);
AttendanceRepository.getAttendance(projectId) // AttendanceRepository.getAttendance(projectId)
.then((response) => { // .then((response) => {
setAttendance(response.data); // setAttendance(response.data);
cacheData( "Attendance", {data: response.data, projectId} ) // cacheData( "Attendance", {data: response.data, projectId} )
setLoading(false) // setLoading(false)
}) // })
.catch((error) => { // .catch((error) => {
setLoading(false) // setLoading(false)
setError("Failed to fetch data."); // setError("Failed to fetch data.");
}) // })
} else { // } else {
setAttendance(Attendance_cache.data); // setAttendance(Attendance_cache.data);
setLoading(false) // setLoading(false)
} // }
}; // };
useEffect(()=>{ // useEffect(()=>{
if ( projectId && projectId != 1 ) // if ( projectId && projectId != 1 )
{ // {
fetchData(projectId); // fetchData(projectId);
} // }
},[projectId]) // },[projectId])
return {attendance,loading,error,recall:fetchData} // return {attendance,loading,error,recall:fetchData}
} // }
export const useEmployeeAttendacesLog = (id) => { // export const useEmployeeAttendacesLog = (id) => {
const [logs, setLogs] = useState([]); // const [logs, setLogs] = useState([]);
const [loading, setLoading] = useState(false); // const [loading, setLoading] = useState(false);
const [error, setError] = useState(null); // const [error, setError] = useState(null);
const fetchData = () => { // const fetchData = () => {
const AttendanceLog_cache = getCachedData("AttendanceLogs"); // const AttendanceLog_cache = getCachedData("AttendanceLogs");
if(!AttendanceLog_cache || AttendanceLog_cache.id !== id ){ // if(!AttendanceLog_cache || AttendanceLog_cache.id !== id ){
setLoading(true) // setLoading(true)
AttendanceRepository.getAttendanceLogs(id).then((response)=>{ // AttendanceRepository.getAttendanceLogs(id).then((response)=>{
setLogs(response.data) // setLogs(response.data)
cacheData("AttendanceLogs", { data: response.data, id }) // cacheData("AttendanceLogs", { data: response.data, id })
setLoading(false) // setLoading(false)
}).catch((error)=>{ // }).catch((error)=>{
setError("Failed to fetch data."); // setError("Failed to fetch data.");
setLoading(false); // setLoading(false);
}) // })
}else{ // }else{
setLogs(AttendanceLog_cache.data); // setLogs(AttendanceLog_cache.data);
} // }
// };
// useEffect(() => {
// if (id) {
// fetchData();
// }
// }, [id]);
// return { logs, loading, error };
// };
// export const useRegularizationRequests = ( projectId ) =>
// {
// const [regularizes, setregularizes] = useState([]);
// const [loading, setLoading] = useState(false);
// const [error, setError] = useState(null);
// const fetchData = () => {
// const regularizedList_cache = getCachedData("regularizedList");
// if(!regularizedList_cache || regularizedList_cache.projectId !== projectId ){
// setLoading(true)
// AttendanceRepository.getRegularizeList(projectId).then((response)=>{
// setregularizes( response.data )
// cacheData("regularizedList", { data: response.data, projectId })
// setLoading(false)
// }).catch((error)=>{
// setError("Failed to fetch data.");
// setLoading(false);
// })
// }else{
// setregularizes(regularizedList_cache.data);
// }
// };
// useEffect(() => {
// if (projectId) {
// fetchData();
// }
// }, [ projectId ] );
// return {regularizes,loading,error,refetch:fetchData}
// }
// ----------------------------Query-----------------------------
export const useAttendance = (projectId) => {
const dispatch = useDispatch()
const {
data: attendance = [],
isLoading: loading,
error,
refetch: recall,
isFetching
} = useQuery({
queryKey: ["attendance", projectId],
queryFn: async () => {
const response = await AttendanceRepository.getAttendance(projectId);
return response.data;
},
enabled: !!projectId,
onError: (error) => {
showToast(error.message || "Error while fetching Attendance", "error");
},
});
return {
attendance,
loading,
error,
recall,
isFetching
}; };
useEffect(() => {
if (id) {
fetchData();
}
}, [id]);
return { logs, loading, error };
}; };
export const useRegularizationRequests = ( projectId ) => export const useAttendancesLogs = (projectId, fromDate, toDate) => {
{ const dispatch = useDispatch();
const [regularizes, setregularizes] = useState([]); const enabled = !!projectId && !!fromDate && !!toDate;
const [loading, setLoading] = useState(false);
const [error, setError] = useState(null);
const query = useQuery({
const fetchData = () => { queryKey: ['attendanceLogs', projectId, fromDate, toDate],
const regularizedList_cache = getCachedData("regularizedList"); queryFn: async () => {
if(!regularizedList_cache || regularizedList_cache.projectId !== projectId ){ const res = await AttendanceRepository.getAttendanceFilteredByDate(
setLoading(true) projectId,
AttendanceRepository.getRegularizeList(projectId).then((response)=>{ fromDate,
setregularizes( response.data ) toDate
cacheData("regularizedList", { data: response.data, projectId }) );
setLoading(false) return res.data;
}).catch((error)=>{ },
setError("Failed to fetch data."); enabled,
setLoading(false); });
})
}else{
setregularizes(regularizedList_cache.data);
}
};
useEffect(() => { useEffect(() => {
if (projectId) { if (query.data && fromDate && toDate) {
fetchData(); dispatch(
setDefaultDateRange({
startDate: fromDate,
endDate: toDate,
})
);
} }
}, [dispatch, query.data, fromDate, toDate]);
return query;
};
}, [ projectId ] );
return {regularizes,loading,error,refetch:fetchData}
} export const useEmployeeAttendacesLog = (id) => {
const {
data: logs = [],
isLoading: loading,
error,
refetch: recall,
} = useQuery({
queryKey: ["employeeAttendanceLogs", id],
queryFn: async () => {
const response = await AttendanceRepository.getAttendanceLogs(id);
return response.data;
},
enabled: !!id,
onError: (error) => {
showToast(error.message || "Error while fetching Attendance Logs", "error");
},
});
return {
logs,
loading,
error,
recall,
};
};
export const useAttendanceByEmployee = (employeeId, fromDate, toDate) => {
const enabled = !!employeeId && !!fromDate && !!toDate;
return useQuery({
queryKey: ["employeeAttendance", employeeId, fromDate, toDate],
queryFn: async () => {
const res = await AttendanceRepository.getAttendanceByEmployee(employeeId, fromDate, toDate);
return res.data;
},
enabled,
});
};
export const useRegularizationRequests = (projectId) => {
const {
data: regularizes = [],
isLoading: loading,
error,
refetch,
} = useQuery({
queryKey: ["regularizedList", projectId],
queryFn: async () => {
const response = await AttendanceRepository.getRegularizeList(projectId);
return response.data;
},
enabled: !!projectId,
onError: (error) => {
showToast(error.message || "Error while fetching Regularization Requests", "error");
},
});
return {
regularizes,
loading,
error,
refetch,
};
};
// -------------------Mutation--------------------------------------
export const useMarkAttendance = () => {
const queryClient = useQueryClient();
const selectedProject = useSelector((store)=>store.localVariables.projectId)
const selectedDateRange = useSelector((store)=>store.localVariables.defaultDateRange)
return useMutation({
mutationFn: async ({payload,forWhichTab}) => {
const res = await AttendanceRepository.markAttendance(payload);
return res.data;
},
onSuccess: (data,variables) => {
if(variables.forWhichTab == 1){
queryClient.setQueryData(["attendance",selectedProject], (oldData) => {
if (!oldData) return oldData;
return oldData.map((emp) =>
emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
);
});
}else if(variables.forWhichTab == 2){
// queryClient.invalidateQueries({
// queryKey: ["attendanceLogs"],
// });
queryClient.setQueryData(["attendanceLogs",selectedProject,selectedDateRange.startDate,selectedDateRange.endDate], (oldData) => {
if (!oldData) return oldData;
return oldData.map((record) =>
record.id === data.id ? { ...record, ...data } : record
);
});
queryClient.invalidateQueries({queryKey:["regularizedList"]})
}else(
queryClient.setQueryData(["regularizedList",selectedProject], (oldData) => {
if (!oldData) return oldData;
return oldData.filter((record) => record.id !== data.id)
}),
queryClient.invalidateQueries({queryKey:["attendanceLogs"]})
)
if(variables.forWhichTab !== 3) showToast("Attendance marked successfully", "success");
},
onError: (error) => {
showToast(error.message || "Failed to mark attendance", "error");
},
});
};

173
src/hooks/useImageGallery.js
View File

@ -2,84 +2,115 @@ import { useState, useCallback } from "react";
// import { ImageGalleryAPI } from "../repositories/ImageGalleyRepository"; // import { ImageGalleryAPI } from "../repositories/ImageGalleyRepository";
import { ImageGalleryAPI } from "../repositories/ImageGalleryAPI"; import { ImageGalleryAPI } from "../repositories/ImageGalleryAPI";
// const PAGE_SIZE = 10;
// const useImageGallery = (selectedProjectId) => {
// const [images, setImages] = useState([]);
// const [allImagesData, setAllImagesData] = useState([]);
// const [pageNumber, setPageNumber] = useState(1);
// const [hasMore, setHasMore] = useState(true);
// const [loading, setLoading] = useState(false);
// const [loadingMore, setLoadingMore] = useState(false);
// const fetchImages = useCallback(async (page = 1, filters = {}, reset = false) => {
// if (!selectedProjectId) return;
// try {
// if (page === 1) {
// setLoading(true);
// } else {
// setLoadingMore(true);
// }
// const res = await ImageGalleryAPI.ImagesGet(
// selectedProjectId,
// filters,
// page,
// PAGE_SIZE
// );
// const newBatches = res.data || [];
// const receivedCount = newBatches.length;
// setImages((prev) => {
// if (page === 1 || reset) return newBatches;
// const uniqueNew = newBatches.filter(
// (batch) => !prev.some((b) => b.batchId === batch.batchId)
// );
// return [...prev, ...uniqueNew];
// });
// setAllImagesData((prev) => {
// if (page === 1 || reset) return newBatches;
// const uniqueAll = newBatches.filter(
// (batch) => !prev.some((b) => b.batchId === batch.batchId)
// );
// return [...prev, ...uniqueAll];
// });
// setHasMore(receivedCount === PAGE_SIZE);
// } catch (error) {
// console.error("Error fetching images:", error);
// if (page === 1) {
// setImages([]);
// setAllImagesData([]);
// }
// setHasMore(false);
// } finally {
// setLoading(false);
// setLoadingMore(false);
// }
// }, [selectedProjectId]);
// const resetGallery = useCallback(() => {
// setImages([]);
// setAllImagesData([]);
// setPageNumber(1);
// setHasMore(true);
// }, []);
// return {
// images,
// allImagesData,
// pageNumber,
// setPageNumber,
// hasMore,
// loading,
// loadingMore,
// fetchImages,
// resetGallery,
// };
// };
// export default useImageGallery;
import { useInfiniteQuery } from "@tanstack/react-query";
const PAGE_SIZE = 10; const PAGE_SIZE = 10;
const useImageGallery = (selectedProjectId) => { const useImageGallery = (selectedProjectId, filters) => {
const [images, setImages] = useState([]); const hasFilters = filters && Object.values(filters).some(
const [allImagesData, setAllImagesData] = useState([]); value => Array.isArray(value) ? value.length > 0 : value !== null && value !== ""
const [pageNumber, setPageNumber] = useState(1); );
const [hasMore, setHasMore] = useState(true);
const [loading, setLoading] = useState(false);
const [loadingMore, setLoadingMore] = useState(false);
const fetchImages = useCallback(async (page = 1, filters = {}, reset = false) => {
if (!selectedProjectId) return;
try {
if (page === 1) {
setLoading(true);
} else {
setLoadingMore(true);
}
return useInfiniteQuery({
queryKey: ["imageGallery", selectedProjectId, hasFilters ? filters : null],
enabled: !!selectedProjectId,
getNextPageParam: (lastPage, allPages) => {
if (!lastPage?.data?.length) return undefined;
return allPages.length + 1;
},
queryFn: async ({ pageParam = 1 }) => {
const res = await ImageGalleryAPI.ImagesGet( const res = await ImageGalleryAPI.ImagesGet(
selectedProjectId, selectedProjectId,
filters, hasFilters ? filters : undefined,
page, pageParam,
PAGE_SIZE PAGE_SIZE
); );
return res;
const newBatches = res.data || []; },
const receivedCount = newBatches.length; });
setImages((prev) => {
if (page === 1 || reset) return newBatches;
const uniqueNew = newBatches.filter(
(batch) => !prev.some((b) => b.batchId === batch.batchId)
);
return [...prev, ...uniqueNew];
});
setAllImagesData((prev) => {
if (page === 1 || reset) return newBatches;
const uniqueAll = newBatches.filter(
(batch) => !prev.some((b) => b.batchId === batch.batchId)
);
return [...prev, ...uniqueAll];
});
setHasMore(receivedCount === PAGE_SIZE);
} catch (error) {
console.error("Error fetching images:", error);
if (page === 1) {
setImages([]);
setAllImagesData([]);
}
setHasMore(false);
} finally {
setLoading(false);
setLoadingMore(false);
}
}, [selectedProjectId]);
const resetGallery = useCallback(() => {
setImages([]);
setAllImagesData([]);
setPageNumber(1);
setHasMore(true);
}, []);
return {
images,
allImagesData,
pageNumber,
setPageNumber,
hasMore,
loading,
loadingMore,
fetchImages,
resetGallery,
};
}; };
export default useImageGallery; export default useImageGallery;

18
src/index.css
View File

@ -101,25 +101,7 @@ button:focus-visible {
flex: 1; flex: 1;
} }
/* Custom Scrollbar for Webkit browsers (Chrome, Safari, Edge) */
::-webkit-scrollbar {
width: 6px; /* Width of the scrollbar */
height: 6px; /* Height of the scrollbar (for horizontal scrollbar) */
}
::-webkit-scrollbar-track {
background-color: #f1f1f1; /* Background of the scrollbar track */
border-radius: 2px; /* Rounded corners for the track */
}
::-webkit-scrollbar-thumb {
background-color: #888; /* Color of the scrollbar thumb */
border-radius: 10px; /* Rounded corners for the thumb */
}
::-webkit-scrollbar-thumb:hover {
background-color: #555; /* Color of the thumb on hover */
}
@keyframes spin { @keyframes spin {
100% { 100% {

258
src/pages/Activities/AttendancePage.jsx
View File

@ -8,32 +8,38 @@ import {
import Breadcrumb from "../../components/common/Breadcrumb"; import Breadcrumb from "../../components/common/Breadcrumb";
import AttendanceLog from "../../components/Activities/AttendcesLogs"; import AttendanceLog from "../../components/Activities/AttendcesLogs";
import Attendance from "../../components/Activities/Attendance"; import Attendance from "../../components/Activities/Attendance";
import AttendanceModel from "../../components/Activities/AttendanceModel"; // import AttendanceModel from "../../components/Activities/AttendanceModel";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
// import { useProjects } from "../../hooks/useProjects"; // import { useProjects } from "../../hooks/useProjects";
import Regularization from "../../components/Activities/Regularization"; import Regularization from "../../components/Activities/Regularization";
import { useAttendace } from "../../hooks/useAttendance"; import { useAttendance } from "../../hooks/useAttendance";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice"; import { setProjectId } from "../../slices/localVariablesSlice";
import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice"; // import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
import { hasUserPermission } from "../../utils/authUtils"; import { hasUserPermission } from "../../utils/authUtils";
import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { REGULARIZE_ATTENDANCE } from "../../utils/constants"; import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
import AttendanceRepository from "../../repositories/AttendanceRepository"; // import AttendanceRepository from "../../repositories/AttendanceRepository";
import { useProjectName } from "../../hooks/useProjects"; import { useProjectName } from "../../hooks/useProjects";
import GlobalModel from "../../components/common/GlobalModel";
import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm";
import AttendLogs from "../../components/Activities/AttendLogs";
// import Confirmation from "../../components/Activities/Confirmation";
import { useQueryClient } from "@tanstack/react-query";
const AttendancePage = () => { const AttendancePage = () => {
const [activeTab, setActiveTab] = useState("all"); const [activeTab, setActiveTab] = useState("all");
const [ShowPending, setShowPending] = useState(false); const [ShowPending, setShowPending] = useState(false);
const queryClient = useQueryClient();
const loginUser = getCachedProfileData(); const loginUser = getCachedProfileData();
var selectedProject = useSelector((store) => store.localVariables.projectId); var selectedProject = useSelector((store) => store.localVariables.projectId);
const dispatch = useDispatch() const dispatch = useDispatch();
const { // const {
attendance, // attendance,
loading: attLoading, // loading: attLoading,
recall: attrecall, // recall: attrecall,
} = useAttendace(selectedProject); // } = useAttendance(selectedProject);
const [attendances, setAttendances] = useState(); const [attendances, setAttendances] = useState();
const [empRoles, setEmpRoles] = useState(null); const [empRoles, setEmpRoles] = useState(null);
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false); const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
@ -41,46 +47,44 @@ const AttendancePage = () => {
const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE); const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
const { projectNames, loading: projectLoading, fetchData } = useProjectName(); const { projectNames, loading: projectLoading, fetchData } = useProjectName();
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
markTime: "", markTime: "",
description: "", description: "",
date: new Date().toLocaleDateString(), date: new Date().toLocaleDateString(),
}); });
const handler = useCallback( // const handler = useCallback(
(msg) => { // (msg) => {
if (selectedProject == msg.projectId) { // if (selectedProject == msg.projectId) {
const updatedAttendance = attendances.map((item) => // const updatedAttendance = attendances.map((item) =>
item.employeeId === msg.response.employeeId // item.employeeId === msg.response.employeeId
? { ...item, ...msg.response } // ? { ...item, ...msg.response }
: item // : item
); // );
cacheData("Attendance", { // queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
data: updatedAttendance, // if (!oldData) return oldData;
projectId: selectedProject, // return oldData.map((emp) =>
}); // emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
setAttendances(updatedAttendance); // );
} // });
}, // }
[selectedProject, attrecall] // },
); // [selectedProject, attrecall]
// );
const employeeHandler = useCallback( // const employeeHandler = useCallback(
(msg) => { // (msg) => {
if (attendances.some((item) => item.employeeId == msg.employeeId)) { // if (attendances.some((item) => item.employeeId == msg.employeeId)) {
AttendanceRepository.getAttendance(selectedProject) // attrecall();
.then((response) => { // }
cacheData("Attendance", { data: response.data, selectedProject }); // },
setAttendances(response.data); // [selectedProject, attendances]
}) // );
.catch((error) => { useEffect(() => {
console.error(error); if (selectedProject == null) {
}); dispatch(setProjectId(projectNames[0]?.id));
} }
}, }, []);
[selectedProject, attendances]
);
const getRole = (roleId) => { const getRole = (roleId) => {
if (!empRoles) return "Unassigned"; if (!empRoles) return "Unassigned";
@ -100,43 +104,11 @@ const AttendancePage = () => {
const closeModal = () => { const closeModal = () => {
setModelConfig(null); setModelConfig(null);
setIsCreateModalOpen(false); setIsCreateModalOpen(false);
const modalElement = document.getElementById("check-Out-modal");
if (modalElement) {
modalElement.classList.remove("show");
modalElement.style.display = "none";
document.body.classList.remove("modal-open");
document.querySelector(".modal-backdrop")?.remove();
}
};
const handleSubmit = (formData) => {
dispatch(markCurrentAttendance(formData))
.then((action) => {
const updatedAttendance = attendances.map((item) =>
item.employeeId === action.payload.employeeId
? { ...item, ...action.payload }
: item
);
cacheData("Attendance", {
data: updatedAttendance,
projectId: selectedProject,
});
setAttendances(updatedAttendance);
showToast("Attedance Marked Successfully", "success");
})
.catch((error) => {
showToast(error.message, "error");
});
}; };
const handleToggle = (event) => { const handleToggle = (event) => {
setShowOnlyCheckout(event.target.checked); setShowOnlyCheckout(event.target.checked);
}; };
useEffect(() => {
if(selectedProject == null){
dispatch(setProjectId(projectNames[0]?.id));
}
},[])
useEffect(() => { useEffect(() => {
@ -144,33 +116,23 @@ const AttendancePage = () => {
openModel(); openModel();
} }
}, [modelConfig, isCreateModalOpen]); }, [modelConfig, isCreateModalOpen]);
useEffect(() => {
setAttendances(attendance);
}, [attendance]);
// useEffect(() => {
// eventBus.on("attendance", handler);
// return () => eventBus.off("attendance", handler);
// }, [handler]);
const filteredAttendance = ShowPending // useEffect(() => {
? attendances?.filter( // eventBus.on("employee", employeeHandler);
(att) => att?.checkInTime !== null && att?.checkOutTime === null // return () => eventBus.off("employee", employeeHandler);
) // }, [employeeHandler]);
: attendances;
useEffect(() => {
eventBus.on("attendance", handler);
return () => eventBus.off("attendance", handler);
}, [handler]);
useEffect(() => {
eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]);
return ( return (
<> <>
{isCreateModalOpen && modelConfig && ( {/* {isCreateModalOpen && modelConfig && (
<div <div
className="modal fade show" className="modal fade show"
style={{ display: "block" }} style={{ display: "block" }}
id="check-Out-modal" id="check-Out-modalg"
tabIndex="-1" tabIndex="-1"
aria-hidden="true" aria-hidden="true"
> >
@ -180,6 +142,29 @@ const AttendancePage = () => {
handleSubmitForm={handleSubmit} handleSubmitForm={handleSubmit}
/> />
</div> </div>
)} */}
{isCreateModalOpen && modelConfig && (
<GlobalModel
isOpen={isCreateModalOpen}
size={modelConfig?.action === 6 && "lg"}
closeModal={closeModal}
>
{(modelConfig?.action === 0 ||
modelConfig?.action === 1 ||
modelConfig?.action === 2) && (
<CheckCheckOutmodel
modeldata={modelConfig}
closeModal={closeModal}
/>
)}
{/* For view logs */}
{modelConfig?.action === 6 && (
<AttendLogs Id={modelConfig?.id} closeModal={closeModal} />
)}
{modelConfig?.action === 7 && (
<Confirmation closeModal={closeModal} />
)}
</GlobalModel>
)} )}
<div className="container-fluid"> <div className="container-fluid">
@ -189,48 +174,14 @@ const AttendancePage = () => {
{ label: "Attendance", link: null }, { label: "Attendance", link: null },
]} ]}
></Breadcrumb> ></Breadcrumb>
<div className="nav-align-top nav-tabs-shadow"> <div className="nav-align-top nav-tabs-shadow" >
{/* <ul className="nav nav-tabs" role="tablist">
<div
className="dataTables_length text-start py-2 px-2 d-flex "
id="DataTables_Table_0_length"
>
{loginUser && loginUser?.projects?.length > 1 && (
<label>
<select
name="DataTables_Table_0_length"
aria-controls="DataTables_Table_0"
className="form-select form-select-sm"
value={selectedProject}
onChange={(e) => dispatch(setProjectId(e.target.value))}
aria-label=""
>
{!projectLoading &&
projects
?.filter((project) =>
loginUser?.projects?.map(String).includes(project.id)
)
.map((project) => (
<option value={project.id} key={project.id}>
{project.name}
</option>
))}
{projectLoading && (
<option value="Loading..." disabled>
Loading...
</option>
)}
</select>
</label>
)}
</div>
</ul> */}
<ul className="nav nav-tabs" role="tablist"> <ul className="nav nav-tabs" role="tablist">
<li className="nav-item"> <li className="nav-item">
<button <button
type="button" type="button"
className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`} className={`nav-link ${
activeTab === "all" ? "active" : ""
} fs-6`}
onClick={() => setActiveTab("all")} onClick={() => setActiveTab("all")}
data-bs-toggle="tab" data-bs-toggle="tab"
data-bs-target="#navs-top-home" data-bs-target="#navs-top-home"
@ -241,7 +192,9 @@ const AttendancePage = () => {
<li className="nav-item"> <li className="nav-item">
<button <button
type="button" type="button"
className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`} className={`nav-link ${
activeTab === "logs" ? "active" : ""
} fs-6`}
onClick={() => setActiveTab("logs")} onClick={() => setActiveTab("logs")}
data-bs-toggle="tab" data-bs-toggle="tab"
data-bs-target="#navs-top-profile" data-bs-target="#navs-top-profile"
@ -263,50 +216,27 @@ const AttendancePage = () => {
</button> </button>
</li> </li>
</ul> </ul>
<div className="tab-content attedanceTabs py-0 px-1 px-sm-3"> <div className="tab-content attedanceTabs py-0 px-1 px-sm-3" >
{activeTab === "all" && ( {activeTab === "all" && (
<>
{!attLoading && (
<div className="tab-pane fade show active py-0"> <div className="tab-pane fade show active py-0">
<Attendance <Attendance
attendance={filteredAttendance} handleModalData={handleModalData}
handleModalData={handleModalData} getRole={getRole}
getRole={getRole} />
setshowOnlyCheckout={setShowPending} </div>
showOnlyCheckout={ShowPending}
/>
</div>
)}
{!attLoading && filteredAttendance?.length === 0 && (
<p>
{" "}
{ShowPending
? "No Pending Available"
: "No Employee assigned yet."}{" "}
</p>
)}
</>
)} )}
{activeTab === "logs" && ( {activeTab === "logs" && (
<div className="tab-pane fade show active py-0"> <div className="tab-pane fade show active py-0">
<AttendanceLog <AttendanceLog
handleModalData={handleModalData} handleModalData={handleModalData}
projectId={selectedProject}
setshowOnlyCheckout={setShowPending}
showOnlyCheckout={ShowPending}
/> />
</div> </div>
)} )}
{activeTab === "regularization" && DoRegularized && ( {activeTab === "regularization" && DoRegularized && (
<div className="tab-pane fade show active py-0"> <div className="tab-pane fade show active py-0">
<Regularization handleRequest={handleSubmit} /> <Regularization />
</div> </div>
)} )}
{attLoading && <span>Loading..</span>}
{!attLoading && !attendances && <span>Not Found</span>}
</div> </div>
</div> </div>
</div> </div>

555
src/pages/Gallary/ImageGallary.jsx
View File

@ -16,32 +16,20 @@ import { setProjectId } from "../../slices/localVariablesSlice";
const SCROLL_THRESHOLD = 5; const SCROLL_THRESHOLD = 5;
const ImageGallery = () => { const ImageGallery = () => {
const selectedProjectId = useSelector((store) => store.localVariables.projectId); const selectedProjectId = useSelector(
(store) => store.localVariables.projectId
);
const dispatch = useDispatch();
const { projectNames } = useProjectName();
const dispatch = useDispatch() // Auto-select a project on mount
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
useEffect(() => { useEffect(() => {
if(selectedProjectId == null){ if (!selectedProjectId && projectNames?.length) {
dispatch(setProjectId(projectNames[0]?.id)); dispatch(setProjectId(projectNames[0].id));
} }
},[]) }, [selectedProjectId, projectNames, dispatch]);
const {
images,
allImagesData,
pageNumber,
setPageNumber,
hasMore,
loading,
loadingMore,
fetchImages,
resetGallery,
} = useImageGallery(selectedProjectId);
const { openModal } = useModal();
const yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
// Filter states
const [selectedFilters, setSelectedFilters] = useState({ const [selectedFilters, setSelectedFilters] = useState({
building: [], building: [],
floor: [], floor: [],
@ -52,7 +40,6 @@ const ImageGallery = () => {
startDate: "", startDate: "",
endDate: "", endDate: "",
}); });
const [appliedFilters, setAppliedFilters] = useState({ const [appliedFilters, setAppliedFilters] = useState({
buildingIds: null, buildingIds: null,
floorIds: null, floorIds: null,
@ -63,7 +50,6 @@ const ImageGallery = () => {
startDate: null, startDate: null,
endDate: null, endDate: null,
}); });
const [collapsedFilters, setCollapsedFilters] = useState({ const [collapsedFilters, setCollapsedFilters] = useState({
dateRange: false, dateRange: false,
building: false, building: false,
@ -73,7 +59,6 @@ const ImageGallery = () => {
workCategory: false, workCategory: false,
workArea: false, workArea: false,
}); });
const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false); const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false);
const [hoveredImage, setHoveredImage] = useState(null); const [hoveredImage, setHoveredImage] = useState(null);
@ -81,133 +66,113 @@ const ImageGallery = () => {
const loaderRef = useRef(null); const loaderRef = useRef(null);
const filterPanelRef = useRef(null); const filterPanelRef = useRef(null);
const filterButtonRef = useRef(null); const filterButtonRef = useRef(null);
const { openModal } = useModal();
const {
data,
fetchNextPage,
hasNextPage,
isLoading,
isFetchingNextPage,
refetch,
} = useImageGallery(selectedProjectId, appliedFilters);
const images = data?.pages.flatMap((page) => page.data) || [];
useEffect(() => { useEffect(() => {
const handleClickOutside = (event) => { const handleClick = (e) => {
if ( if (
filterPanelRef.current && filterPanelRef.current &&
!filterPanelRef.current.contains(event.target) && !filterPanelRef.current.contains(e.target) &&
filterButtonRef.current && filterButtonRef.current &&
!filterButtonRef.current.contains(event.target) !filterButtonRef.current.contains(e.target)
) { ) {
setIsFilterPanelOpen(false); setIsFilterPanelOpen(false);
} }
}; };
document.addEventListener("mousedown", handleClick);
return () => document.removeEventListener("mousedown", handleClick);
}, []);
if (isFilterPanelOpen) { useEffect(() => {
document.addEventListener("mousedown", handleClickOutside); if (selectedProjectId) refetch();
} else { }, [selectedProjectId, appliedFilters, refetch]);
document.removeEventListener("mousedown", handleClickOutside);
}
return () => { useEffect(() => {
document.removeEventListener("mousedown", handleClickOutside); const handler = (data) => {
if (data.projectId === selectedProjectId) refetch();
}; };
}, [isFilterPanelOpen]); eventBus.on("image_gallery", handler);
return () => eventBus.off("image_gallery", handler);
}, [selectedProjectId, refetch]);
useEffect(() => { useEffect(() => {
if (!selectedProjectId) { if (!loaderRef.current) return;
resetGallery();
return;
}
resetGallery(); const observer = new IntersectionObserver(
fetchImages(1, appliedFilters, true); ([entry]) => {
}, [selectedProjectId, appliedFilters]); if (entry.isIntersecting && hasNextPage && !isFetchingNextPage && !isLoading) {
fetchNextPage();
useEffect(() => {
const handleExternalEvent = (data) => {
if (selectedProjectId === data.projectId) {
resetGallery();
fetchImages(1, appliedFilters, true);
} }
}; },
{ rootMargin: "200px", threshold: 0.1 }
);
eventBus.on("image_gallery", handleExternalEvent); observer.observe(loaderRef.current);
return () => { return () => {
eventBus.off("image_gallery", handleExternalEvent); if (loaderRef.current) {
}; observer.unobserve(loaderRef.current);
}, [appliedFilters, fetchImages, selectedProjectId]); }
};
}, [hasNextPage, isFetchingNextPage, isLoading, fetchNextPage]);
useEffect(() => {
if (!loaderRef.current) return;
const observer = new IntersectionObserver( // Utility: derive filter options
(entries) => { const getUniqueValues = useCallback(
if (entries[0].isIntersecting && hasMore && !loadingMore && !loading) { (idKey, nameKey) => {
setPageNumber((prevPageNumber) => prevPageNumber + 1); const m = new Map();
images.forEach((batch) => {
const id = idKey === "floorIds" ? batch.floorIds : batch[idKey];
if (id && batch[nameKey] && !m.has(id)) {
m.set(id, batch[nameKey]);
} }
}, });
{ return [...m.entries()].sort((a, b) => a[1].localeCompare(b[1]));
root: null, },
rootMargin: "200px", [images]
threshold: 0.1, );
}
);
observer.observe(loaderRef.current); const getUploadedBy = useCallback(() => {
const m = new Map();
return () => { images.forEach((batch) => {
if (loaderRef.current) { batch.documents.forEach((doc) => {
observer.unobserve(loaderRef.current); const name = `${doc.uploadedBy?.firstName || ""} ${
} doc.uploadedBy?.lastName || ""
}; }`.trim();
}, [hasMore, loadingMore, loading]); if (doc.uploadedBy?.id && name && !m.has(doc.uploadedBy.id)) {
m.set(doc.uploadedBy.id, name);
useEffect(() => {
if (pageNumber > 1) {
fetchImages(pageNumber, appliedFilters);
}
}, [pageNumber]);
const getUniqueValuesWithIds = useCallback((idKey, nameKey) => {
const map = new Map();
allImagesData.forEach(batch => {
let id = idKey === "floorIds" ? batch.floorIds : batch[idKey];
const name = batch[nameKey];
if (id && name && !map.has(id)) {
map.set(id, name);
}
});
return Array.from(map.entries()).sort((a, b) => a[1].localeCompare(b[1]));
}, [allImagesData]);
const getUniqueUploadedByUsers = useCallback(() => {
const uniqueUsersMap = new Map();
allImagesData.forEach(batch => {
batch.documents.forEach(doc => {
if (doc.uploadedBy && doc.uploadedBy.id) {
const fullName = `${doc.uploadedBy.firstName || ""} ${doc.uploadedBy.lastName || ""}`.trim();
if (fullName) {
uniqueUsersMap.set(doc.uploadedBy.id, fullName);
}
} }
}); });
}); });
return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1])); return [...m.entries()].sort((a, b) => a[1].localeCompare(b[1]));
}, [allImagesData]); }, [images]);
const buildings = getUniqueValuesWithIds("buildingId", "buildingName"); const buildings = getUniqueValues("buildingId", "buildingName");
const floors = getUniqueValuesWithIds("floorIds", "floorName"); const floors = getUniqueValues("floorIds", "floorName");
const activities = getUniqueValuesWithIds("activityId", "activityName"); const activities = getUniqueValues("activityId", "activityName");
const workAreas = getUniqueValuesWithIds("workAreaId", "workAreaName"); const workAreas = getUniqueValues("workAreaId", "workAreaName");
const uploadedByUsers = getUniqueUploadedByUsers(); const workCategories = getUniqueValues("workCategoryId", "workCategoryName");
const workCategories = getUniqueValuesWithIds("workCategoryId", "workCategoryName"); const uploadedByUsers = getUploadedBy();
const toggleFilter = useCallback((type, itemId, itemName) => { const toggleFilter = useCallback((type, id, name) => {
setSelectedFilters((prev) => { setSelectedFilters((prev) => {
const current = prev[type]; const arr = prev[type];
const isSelected = current.some((item) => item[0] === itemId); const exists = arr.some(([x]) => x === id);
const updated = exists
const newArray = isSelected ? arr.filter(([x]) => x !== id)
? current.filter((item) => item[0] !== itemId) : [...arr, [id, name]];
: [...current, [itemId, itemName]]; return { ...prev, [type]: updated };
return {
...prev,
[type]: newArray,
};
}); });
}, []); }, []);
@ -220,48 +185,33 @@ const ImageGallery = () => {
}, []); }, []);
const toggleCollapse = useCallback((type) => { const toggleCollapse = useCallback((type) => {
setCollapsedFilters((prev) => ({ setCollapsedFilters((prev) => ({ ...prev, [type]: !prev[type] }));
...prev,
[type]: !prev[type],
}));
}, []); }, []);
const handleApplyFilters = useCallback(() => { const handleApplyFilters = useCallback(() => {
const payload = { const payload = {
buildingIds: selectedFilters.building.length ? selectedFilters.building.map((item) => item[0]) : null, buildingIds: selectedFilters.building.map(([x]) => x) || null,
floorIds: selectedFilters.floor.length ? selectedFilters.floor.map((item) => item[0]) : null, floorIds: selectedFilters.floor.map(([x]) => x) || null,
workAreaIds: selectedFilters.workArea.length ? selectedFilters.workArea.map((item) => item[0]) : null, activityIds: selectedFilters.activity.map(([x]) => x) || null,
workCategoryIds: selectedFilters.workCategory.length ? selectedFilters.workCategory.map((item) => item[0]) : null, uploadedByIds: selectedFilters.uploadedBy.map(([x]) => x) || null,
activityIds: selectedFilters.activity.length ? selectedFilters.activity.map((item) => item[0]) : null, workCategoryIds: selectedFilters.workCategory.map(([x]) => x) || null,
uploadedByIds: selectedFilters.uploadedBy.length ? selectedFilters.uploadedBy.map((item) => item[0]) : null, workAreaIds: selectedFilters.workArea.map(([x]) => x) || null,
startDate: selectedFilters.startDate || null, startDate: selectedFilters.startDate || null,
endDate: selectedFilters.endDate || null, endDate: selectedFilters.endDate || null,
}; };
const changed = Object.keys(payload).some((key) => {
const areFiltersChanged = Object.keys(payload).some(key => { const oldVal = appliedFilters[key],
const oldVal = appliedFilters[key]; newVal = payload[key];
const newVal = payload[key]; return Array.isArray(oldVal)
if (Array.isArray(oldVal) && Array.isArray(newVal)) { ? oldVal.length !== newVal.length ||
if (oldVal.length !== newVal.length) return true; oldVal.some((x) => !newVal.includes(x))
const oldSet = new Set(oldVal); : oldVal !== newVal;
const newSet = new Set(newVal);
for (const item of newSet) {
if (!oldSet.has(item)) return true;
}
return false;
}
if ((oldVal === null && newVal === "") || (oldVal === "" && newVal === null)) return false;
return oldVal !== newVal;
}); });
if (changed) setAppliedFilters(payload);
if (areFiltersChanged) {
setAppliedFilters(payload);
resetGallery();
}
}, [selectedFilters, appliedFilters]); }, [selectedFilters, appliedFilters]);
const handleClearAllFilters = useCallback(() => { const handleClear = useCallback(() => {
const initialStateSelected = { setSelectedFilters({
building: [], building: [],
floor: [], floor: [],
activity: [], activity: [],
@ -270,10 +220,8 @@ const ImageGallery = () => {
workArea: [], workArea: [],
startDate: "", startDate: "",
endDate: "", endDate: "",
}; });
setSelectedFilters(initialStateSelected); setAppliedFilters({
const initialStateApplied = {
buildingIds: null, buildingIds: null,
floorIds: null, floorIds: null,
activityIds: null, activityIds: null,
@ -282,69 +230,70 @@ const ImageGallery = () => {
workAreaIds: null, workAreaIds: null,
startDate: null, startDate: null,
endDate: null, endDate: null,
}; });
setAppliedFilters(initialStateApplied);
resetGallery();
}, []); }, []);
const scrollLeft = useCallback((key) => { const scrollLeft = useCallback(
imageGroupRefs.current[key]?.scrollBy({ left: -200, behavior: "smooth" }); (key) =>
}, []); imageGroupRefs.current[key]?.scrollBy({ left: -200, behavior: "smooth" }),
[]
);
const scrollRight = useCallback(
(key) =>
imageGroupRefs.current[key]?.scrollBy({ left: 200, behavior: "smooth" }),
[]
);
const scrollRight = useCallback((key) => { const renderCategory = (label, items, type) => (
imageGroupRefs.current[key]?.scrollBy({ left: 200, behavior: "smooth" }); <div
}, []); className={`dropdown my-2 ${collapsedFilters[type] ? "collapsed" : ""}`}
>
const renderFilterCategory = (label, items, type) => ( <div
<div className={`dropdown my-2 ${collapsedFilters[type] ? "collapsed" : ""}`}> className="dropdown-header bg-label-primary"
<div className="dropdown-header bg-label-primary" onClick={() => toggleCollapse(type)}> onClick={() => toggleCollapse(type)}
>
<strong>{label}</strong> <strong>{label}</strong>
<div className="header-controls"> <div className="header-controls">
{type === "dateRange" && (selectedFilters.startDate || selectedFilters.endDate) && ( {((type === "dateRange" &&
(selectedFilters.startDate || selectedFilters.endDate)) ||
(type !== "dateRange" && selectedFilters[type]?.length > 0)) && (
<button <button
className="clear-button" className="clear-button"
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
setSelectedFilters((prev) => ({ ...prev, startDate: "", endDate: "" })); setSelectedFilters((prev) => ({
...prev,
[type]: type === "dateRange" ? "" : [],
...(type === "dateRange" && { startDate: "", endDate: "" }),
}));
}} }}
> >
Clear Clear
</button> </button>
)} )}
{type !== "dateRange" && selectedFilters[type]?.length > 0 && ( <span className="collapse-icon">
<button {collapsedFilters[type] ? "+" : "-"}
className="clear-button" </span>
onClick={(e) => {
e.stopPropagation();
setSelectedFilters((prev) => ({ ...prev, [type]: [] }));
}}
>
Clear
</button>
)}
<span className="collapse-icon">{collapsedFilters[type] ? '+' : '-'}</span>
</div> </div>
</div> </div>
{!collapsedFilters[type] && ( {!collapsedFilters[type] && (
<div className="dropdown-content"> <div className="dropdown-content">
{type === "dateRange" ? ( {type === "dateRange" ? (
<div className="date-range-inputs"> <DateRangePicker
<DateRangePicker onRangeChange={setDateRange}
onRangeChange={setDateRange} endDateMode="today"
endDateMode="today" startDate={selectedFilters.startDate}
startDate={selectedFilters.startDate} endDate={selectedFilters.endDate}
endDate={selectedFilters.endDate} />
/>
</div>
) : ( ) : (
items.map(([itemId, itemName]) => ( items.map(([id, name]) => (
<label key={itemId}> <label key={id}>
<input <input
type="checkbox" type="checkbox"
checked={selectedFilters[type].some((item) => item[0] === itemId)} checked={selectedFilters[type].some(([x]) => x === id)}
onChange={() => toggleFilter(type, itemId, itemName)} onChange={() => toggleFilter(type, id, name)}
/> />
{itemName} {name}
</label> </label>
)) ))
)} )}
@ -354,105 +303,193 @@ const ImageGallery = () => {
); );
return ( return (
<div className={`gallery-container container-fluid ${isFilterPanelOpen ? "filter-panel-open-end" : ""}`}> <div
<Breadcrumb data={[{ label: "Home", link: "/" }, { label: "Gallary", link: null }]} /> className={`gallery-container container-fluid ${
isFilterPanelOpen ? "filter-panel-open-end" : ""
}`}
>
<Breadcrumb data={[{ label: "Home", link: "/" }, { label: "Gallery" }]} />
<div className="main-content"> <div className="main-content">
<button <button
className={`filter-button btn-primary ${isFilterPanelOpen ? "closed-icon" : ""}`} className={`filter-button btn-primary ${
onClick={() => setIsFilterPanelOpen(!isFilterPanelOpen)} isFilterPanelOpen ? "closed-icon" : ""
}`}
onClick={() => setIsFilterPanelOpen((p) => !p)}
ref={filterButtonRef} ref={filterButtonRef}
> >
{isFilterPanelOpen ? <i className="fa-solid fa-times fs-5"></i> : <i className="fa-solid fa-filter ms-1 fs-5"></i>} {isFilterPanelOpen ? (
<i className="fa-solid fa-times fs-5" />
) : (
<i className="fa-solid fa-filter ms-1 fs-5" />
)}
</button> </button>
<div className="activity-section"> <div className="activity-section">
{loading && pageNumber === 1 ? ( {isLoading ? (
<div className="spinner-container"><div className="spinner" /></div> <div className="text-center">
) : images.length > 0 ? ( <p>Loading...</p>
</div>
) : images.length ? (
images.map((batch) => { images.map((batch) => {
const firstDoc = batch.documents[0]; const doc = batch.documents[0];
const userName = `${firstDoc?.uploadedBy?.firstName || ""} ${firstDoc?.uploadedBy?.lastName || ""}`.trim(); const userName = `${doc.uploadedBy?.firstName || ""} ${
const date = formatUTCToLocalTime(firstDoc?.uploadedAt); doc.uploadedBy?.lastName || ""
const showScrollButtons = batch.documents.length > SCROLL_THRESHOLD; }`.trim();
const date = formatUTCToLocalTime(doc.uploadedAt);
const hasArrows = batch.documents.length > SCROLL_THRESHOLD;
return ( return (
<div key={batch.batchId} className="grouped-section"> <div key={batch.batchId} className="grouped-section">
<div className="group-heading"> <div className="group-heading">
<div className="d-flex flex-column"> {/* Uploader Info */}
<div className="d-flex align-items-center mb-1"> <div className="d-flex align-items-center mb-1">
<Avatar size="xs" firstName={firstDoc?.uploadedBy?.firstName} lastName={firstDoc?.uploadedBy?.lastName} className="me-2" /> <Avatar
<div className="d-flex flex-column align-items-start"> size="xs"
<strong className="user-name-text">{userName}</strong> firstName={doc.uploadedBy?.firstName}
<span className="me-2">{date}</span> lastName={doc.uploadedBy?.lastName}
</div> className="me-2"
/>
<div className="d-flex flex-column align-items-start">
<strong className="user-name-text">{userName}</strong>
<span className="text-muted small">{date}</span>
</div> </div>
</div> </div>
<div className="location-line">
<div>{batch.buildingName} &gt; {batch.floorName} &gt; <strong>{batch.workAreaName || "Unknown"} &gt; {batch.activityName}</strong></div> {/* Location Info */}
<div className="location-line text-secondary">
<div className="d-flex align-items-center flex-wrap gap-1 text-secondary">
{" "}
<span className="d-flex align-items-center">
<span>{batch.buildingName}</span>
<i className="bx bx-chevron-right " />
</span>
<span className="d-flex align-items-center">
<span>{batch.floorName}</span>
<i className="bx bx-chevron-right m" />
</span>
<span className="d-flex align-items-center ">
<span>{batch.workAreaName || "Unknown"}</span>
<i className="bx bx-chevron-right " />
<span>{batch.activityName}</span>
</span>
</div>
{batch.workCategoryName && ( {batch.workCategoryName && (
<div className="work-category-display ms-2"> <span className="badge bg-label-primary ms-2">
<span className="badge bg-label-primary rounded-pill d-flex align-items-center gap-1"> {batch.workCategoryName}
{batch.workCategoryName} </span>
</span>
</div>
)} )}
</div> </div>
</div> </div>
<div className="image-group-wrapper">
{showScrollButtons && <button className="scroll-arrow left-arrow" onClick={() => scrollLeft(batch.batchId)}>&#8249;</button>}
<div className="image-group-horizontal" ref={(el) => (imageGroupRefs.current[batch.batchId] = el)}>
{batch.documents.map((doc, idx) => {
const hoverDate = moment(doc.uploadedAt).format("DD-MM-YYYY");
const hoverTime = moment(doc.uploadedAt).format("hh:mm A");
<div className="image-group-wrapper">
{hasArrows && (
<button
className="scroll-arrow left-arrow"
onClick={() => scrollLeft(batch.batchId)}
>
‹
</button>
)}
<div
className="image-group-horizontal"
ref={(el) => (imageGroupRefs.current[batch.batchId] = el)}
>
{batch.documents.map((d, i) => {
const hoverDate = moment(d.uploadedAt).format(
"DD-MM-YYYY"
);
const hoverTime = moment(d.uploadedAt).format(
"hh:mm A"
);
return ( return (
<div key={doc.id} className="image-card" onClick={() => openModal(<ImagePop batch={batch} initialIndex={idx} />)} onMouseEnter={() => setHoveredImage(doc)} onMouseLeave={() => setHoveredImage(null)}> <div
key={d.id}
className="image-card"
onClick={() =>
openModal(
<ImagePop batch={batch} initialIndex={i} />
)
}
onMouseEnter={() => setHoveredImage(d)}
onMouseLeave={() => setHoveredImage(null)}
>
<div className="image-wrapper"> <div className="image-wrapper">
<img src={doc.url} alt={`Image ${idx + 1}`} /> <img src={d.url} alt={`Image ${i + 1}`} />
</div> </div>
{hoveredImage === doc && ( {hoveredImage === d && (
<div className="image-hover-description"> <div className="image-hover-description">
<p><strong>Date:</strong> {hoverDate}</p> <p>
<p><strong>Time:</strong> {hoverTime}</p> <strong>Date:</strong> {hoverDate}
<p><strong>Activity:</strong> {batch.activityName}</p> </p>
<p>
<strong>Time:</strong> {hoverTime}
</p>
<p>
<strong>Activity:</strong>{" "}
{batch.activityName}
</p>
</div> </div>
)} )}
</div> </div>
); );
})} })}
</div> </div>
{showScrollButtons && <button className="scroll-arrow right-arrow" onClick={() => scrollRight(batch.batchId)}>&#8250;</button>} {hasArrows && (
<button
className="scroll-arrow right-arrow"
onClick={() => scrollRight(batch.batchId)}
>
<i className="bx bx-chevron-right"></i>
</button>
)}
</div> </div>
</div> </div>
); );
}) })
) : ( ) : (
!loading && <p style={{ textAlign: "center", color: "#777", marginTop: "50px" }}>No images match the selected filters.</p> <p className="text-center text-muted mt-5">
No images match the selected filters.
</p>
)} )}
<div ref={loaderRef} style={{ height: '50px', margin: '20px 0', display: 'flex', justifyContent: 'center', alignItems: 'center' }}> <div ref={loaderRef}>
{loadingMore && hasMore && <div className="spinner" />} {isFetchingNextPage && hasNextPage && <p>Loading...</p>}
{!hasMore && !loading && images.length > 0 && <p style={{ color: '#aaa' }}>You've reached the end of the images.</p>} {!hasNextPage && !isLoading && images.length > 0 && (
<p className="text-muted">
You've reached the end of the images.
</p>
)}
</div> </div>
</div> </div>
</div> </div>
<div className={`offcanvas offcanvas-end ${isFilterPanelOpen ? "show" : ""}`} tabIndex="-1" id="filterOffcanvas" aria-labelledby="filterOffcanvasLabel" ref={filterPanelRef}> <div
className={`offcanvas offcanvas-end ${isFilterPanelOpen ? "show" : ""}`}
ref={filterPanelRef}
>
<div className="offcanvas-header"> <div className="offcanvas-header">
<h5 className="offcanvas-title" id="filterOffcanvasLabel">Filters</h5> <h5>Filters</h5>
<button type="button" className="btn-close" onClick={() => setIsFilterPanelOpen(false)} aria-label="Close" /> <button
className="btn-close"
onClick={() => setIsFilterPanelOpen(false)}
/>
</div> </div>
<div className="filter-actions mt-auto mx-2"> <div className="filter-actions mt-auto mx-2">
<button className="btn btn-secondary btn-xs" onClick={handleClearAllFilters}>Clear All</button> <button className="btn btn-secondary btn-xs" onClick={handleClear}>
<button className="btn btn-primary btn-xs" onClick={handleApplyFilters}>Apply Filters</button> Clear All
</button>
<button
className="btn btn-primary btn-xs"
onClick={handleApplyFilters}
>
Apply Filters
</button>
</div> </div>
<div className="offcanvas-body d-flex flex-column"> <div className="offcanvas-body d-flex flex-column">
{renderFilterCategory("Date Range", [], "dateRange")} {renderCategory("Date Range", [], "dateRange")}
{renderFilterCategory("Building", buildings, "building")} {renderCategory("Building", buildings, "building")}
{renderFilterCategory("Floor", floors, "floor")} {renderCategory("Floor", floors, "floor")}
{renderFilterCategory("Work Area", workAreas, "workArea")} {renderCategory("Work Area", workAreas, "workArea")}
{renderFilterCategory("Activity", activities, "activity")} {renderCategory("Activity", activities, "activity")}
{renderFilterCategory("Uploaded By (User)", uploadedByUsers, "uploadedBy")} {renderCategory("Uploaded By (User)", uploadedByUsers, "uploadedBy")}
{renderFilterCategory("Work Category", workCategories, "workCategory")} {renderCategory("Work Category", workCategories, "workCategory")}
</div> </div>
</div> </div>
</div> </div>

23
src/pages/Gallary/ImagePop.css
View File

@ -42,14 +42,23 @@
} }
/* Image Styles */ /* Image Styles */
.modal-image {
max-width: 100%; .image-container {
max-height: 70vh; aspect-ratio: 1 / 1; /* Square shape: width and height are equal */
width: auto; width: 100%; /* or set a fixed width like 300px */
max-width: 400px; /* Optional: limit how large it grows */
border-radius: 10px; border-radius: 10px;
object-fit: contain; overflow: hidden;
margin-bottom: 20px; display: flex;
flex-shrink: 0; justify-content: center;
align-items: center;
background-color: #f5f5f5;
}
.modal-image {
width: 100%;
height: 100%;
object-fit: cover;
} }
/* Scrollable Container for Text Details */ /* Scrollable Container for Text Details */

40
src/pages/Gallary/ImagePop.jsx
View File

@ -54,44 +54,34 @@ const ImagePop = ({ batch, initialIndex = 0 }) => {
return ( return (
<div className="image-modal-overlay"> <div className="image-modal-overlay">
<div className="image-modal-content"> <div className="image-modal-content">
{/* Close button */}
<button className="close-button" onClick={closeModal}>
×
</button>
{/* Previous button, only shown if there's a previous image */} <i className='bx bx-x close-button' onClick={closeModal}></i>
{hasPrev && ( {hasPrev && (
<button className="nav-button prev-button" onClick={handlePrev}> <button className="nav-button prev-button" onClick={handlePrev}>
&#8249; {/* Unicode for single left angle quotation mark */} <i className='bx bx-chevron-left'></i>
</button> </button>
)} )}
{/* The main image display */} <div className="image-container">
<img src={image.url} alt="Preview" className="modal-image" /> <img src={image.url} alt="Preview" className="modal-image" />
</div>
{/* Next button, only shown if there's a next image */}
{hasNext && ( {hasNext && (
<button className="nav-button next-button" onClick={handleNext}> <button className="nav-button next-button" onClick={handleNext}>
&#8250; {/* Unicode for single right angle quotation mark */} <i className='bx bx-chevron-right'></i>
</button> </button>
)} )}
{/* Image details */}
<div className="image-details"> <div className="image-details">
<p>
<strong>👤 Uploaded By:</strong> {fullName} <div className="flex alig-items-center"> <i className='bx bxs-user'></i> <span className="text-muted">Uploaded By : </span> <span className="text-secondary">{fullName}</span></div>
</p> <div className="flex alig-items-center"> <i class='bx bxs-calendar' ></i> <span className="text-muted">Date : </span> <span className="text-secondary"> {date}</span></div>
<p> <div className="flex alig-items-center"> <i class='bx bx-map' ></i> <span className="text-muted">Uploaded By : </span> <span className="text-secondary">{buildingName} <i className='bx bx-chevron-right'></i> {floorName} <i className='bx bx-chevron-right'></i>
<strong>📅 Date:</strong> {date} {workAreaName || "Unknown"} <i className='bx bx-chevron-right'></i> {activityName}</span></div>
</p> <div className="flex alig-items-center"> <i className='bx bx-comment-dots'></i> <span className="text-muted">comment : </span> <span className="text-secondary">{batchComment}</span></div>
<p>
<strong>🏢 Location:</strong> {buildingName} &gt; {floorName} &gt;{" "}
{workAreaName || "Unknown"} &gt; {activityName}
</p>
<p>
{/* Display the comment from the batch object */}
<strong>📝 Comments:</strong> {batchComment || "N/A"}
</p>
</div> </div>
</div> </div>
</div> </div>

61
src/pages/employee/AttendancesEmployeeRecords.jsx
View File

@ -8,6 +8,9 @@ import Avatar from "../../components/common/Avatar";
import { convertShortTime } from "../../utils/dateUtils"; import { convertShortTime } from "../../utils/dateUtils";
import RenderAttendanceStatus from "../../components/Activities/RenderAttendanceStatus"; import RenderAttendanceStatus from "../../components/Activities/RenderAttendanceStatus";
import AttendLogs from "../../components/Activities/AttendLogs"; import AttendLogs from "../../components/Activities/AttendLogs";
import { useAttendanceByEmployee } from "../../hooks/useAttendance";
import GlobalModel from "../../components/common/GlobalModel";
import { ITEMS_PER_PAGE } from "../../utils/constants";
const AttendancesEmployeeRecords = ({ employee }) => { const AttendancesEmployeeRecords = ({ employee }) => {
const [attendances, setAttendnaces] = useState([]); const [attendances, setAttendnaces] = useState([]);
@ -15,10 +18,12 @@ const AttendancesEmployeeRecords = ({ employee }) => {
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
const [isModalOpen, setIsModalOpen] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false);
const [attendanceId, setAttendanecId] = useState(); const [attendanceId, setAttendanecId] = useState();
const {data =[],isLoading:loading,isFetching,error,refetch} = useAttendanceByEmployee(employee,dateRange.startDate, dateRange.endDate)
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading, error } = useSelector(
(store) => store.employeeAttendance // const { data, loading, error } = useSelector(
); // (store) => store.employeeAttendance
// );
const [isRefreshing, setIsRefreshing] = useState(true); const [isRefreshing, setIsRefreshing] = useState(true);
@ -85,21 +90,10 @@ const AttendancesEmployeeRecords = ({ employee }) => {
const currentDate = new Date().toLocaleDateString("en-CA"); const currentDate = new Date().toLocaleDateString("en-CA");
const { currentPage, totalPages, currentItems, paginate } = usePagination( const { currentPage, totalPages, currentItems, paginate } = usePagination(
sortedFinalList, sortedFinalList,
20 ITEMS_PER_PAGE
); );
useEffect(() => {
const { startDate, endDate } = dateRange;
if (startDate && endDate) {
dispatch(
fetchEmployeeAttendanceData({
employeeId: employee,
fromDate: startDate,
toDate: endDate,
})
);
}
}, [dateRange, employee, isRefreshing]);
const openModal = (id) => { const openModal = (id) => {
setAttendanecId(id); setAttendanecId(id);
@ -109,32 +103,13 @@ const AttendancesEmployeeRecords = ({ employee }) => {
return ( return (
<> <>
<div
className={`modal fade ${isModalOpen ? "show" : ""}`}
tabIndex="-1"
role="dialog"
style={{ display: isModalOpen ? "block" : "none" }}
aria-hidden={!isModalOpen}
>
{" "}
<div
className="modal-dialog modal-lg modal-simple attendance-log-modal mx-sm-auto mx-1"
role="document"
>
<div className="modal-content">
<div className="modal-body p-sm-4 p-0">
<button
type="button"
className="btn-close"
onClick={closeModal}
aria-label="Close"
></button>
<AttendLogs Id={attendanceId} />
</div> {isModalOpen && (
</div> <GlobalModel size="lg" isOpen={isModalOpen} closeModal={closeModal}>
</div> <AttendLogs Id={attendanceId} />
</div> </GlobalModel>
)}
<div className="px-4 py-2 " style={{ minHeight: "500px" }}> <div className="px-4 py-2 " style={{ minHeight: "500px" }}>
<div <div
className="dataTables_length text-start py-2 d-flex justify-content-between " className="dataTables_length text-start py-2 d-flex justify-content-between "
@ -145,11 +120,11 @@ const AttendancesEmployeeRecords = ({ employee }) => {
</div> </div>
<div className="col-md-2 m-0 text-end"> <div className="col-md-2 m-0 text-end">
<i <i
className={`bx bx-refresh cursor-pointer fs-4 ${loading ? "spin" : "" className={`bx bx-refresh cursor-pointer fs-4 ${isFetching ? "spin" : ""
}`} }`}
data-toggle="tooltip" data-toggle="tooltip"
title="Refresh" title="Refresh"
onClick={() => setIsRefreshing(!isRefreshing)} onClick={() => refetch()}
/> />
</div> </div>
</div> </div>

11
src/slices/localVariablesSlice.jsx
View File

@ -5,6 +5,10 @@ const localVariablesSlice = createSlice({
initialState: { initialState: {
selectedMaster:"Application Role", selectedMaster:"Application Role",
regularizationCount:0, regularizationCount:0,
defaultDateRange: {
startDate: null,
endDate: null,
},
projectId: null, projectId: null,
reload:false reload:false
@ -22,9 +26,12 @@ const localVariablesSlice = createSlice({
refreshData: ( state, action ) => refreshData: ( state, action ) =>
{ {
state.reload = action.payload state.reload = action.payload
} },
setDefaultDateRange: (state, action) => {
state.defaultDateRange = action.payload;
},
}, },
}); });
export const { changeMaster ,updateRegularizationCount,setProjectId,refreshData} = localVariablesSlice.actions; export const { changeMaster ,updateRegularizationCount,setProjectId,refreshData,setDefaultDateRange} = localVariablesSlice.actions;
export default localVariablesSlice.reducer; export default localVariablesSlice.reducer;