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