Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Showing only changes of commit 9afee2934a - Show all commits

View File

@ -177,33 +177,26 @@ const AttendanceLog = ({
resetPage, // Destructure resetPage here
} = usePagination(processedData, 20);
// Reset page when processedData changes (due to filters/search)
useEffect(() => {
resetPage();
}, [processedData, resetPage]); // Add resetPage to dependency array
const handler = useCallback(
(msg) => {
const { startDate, endDate } = dateRange;
const checkIn = msg.response.checkInTime.substring(0, 10);
if (
projectId === msg.projectId &&
startDate <= checkIn &&
checkIn <= endDate
) {
const updatedAttendance = data.map((item) =>
item.id === msg.response.id
? { ...item, ...msg.response }
: item
);
const handler = useCallback(
(msg) => {
const { startDate, endDate } = dateRange;
const checkIn = msg.response.checkInTime ? msg.response.checkInTime.substring(0, 10) : null;
if (
projectId === msg.projectId &&
checkIn &&
startDate <= checkIn &&
checkIn <= endDate
) {
dispatch(
fetchAttendanceData({
projectId,
fromDate: startDate,
toDate: endDate,
})
);
}
},
[projectId, dateRange, dispatch]
);
filtering(updatedAttendance);
}
},
[projectId, dateRange, data, filtering] // removed resetPage from deps
);
useEffect(() => {
useEffect(() => {