Enhancement implemented in the Attendance component to include search functionality.
This commit is contained in:
parent
75d4ca176d
commit
3709346d42
@ -4,31 +4,24 @@ import Avatar from "../common/Avatar";
|
|||||||
import { convertShortTime } from "../../utils/dateUtils";
|
import { convertShortTime } from "../../utils/dateUtils";
|
||||||
import RenderAttendanceStatus from "./RenderAttendanceStatus";
|
import RenderAttendanceStatus from "./RenderAttendanceStatus";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
import { fetchAttendanceData, setAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
|
import { fetchAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
|
||||||
import DateRangePicker from "../common/DateRangePicker";
|
import DateRangePicker from "../common/DateRangePicker";
|
||||||
|
import { clearCacheKey, getCachedData } from "../../slices/apiDataManager";
|
||||||
import eventBus from "../../services/eventBus";
|
import eventBus from "../../services/eventBus";
|
||||||
|
import AttendanceRepository from "../../repositories/AttendanceRepository";
|
||||||
|
import { useAttendancesLogs } from "../../hooks/useAttendance";
|
||||||
|
import { queryClient } from "../../layouts/AuthLayout";
|
||||||
|
|
||||||
const usePagination = (data, itemsPerPage) => {
|
const usePagination = (data, itemsPerPage) => {
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
const [currentPage, setCurrentPage] = useState(1);
|
||||||
const totalItems = Array.isArray(data) ? data.length : 0;
|
const maxPage = Math.ceil(data.length / itemsPerPage);
|
||||||
const maxPage = Math.ceil(totalItems / itemsPerPage);
|
|
||||||
|
|
||||||
const currentItems = useMemo(() => {
|
const currentItems = useMemo(() => {
|
||||||
if (!Array.isArray(data) || data.length === 0) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
const startIndex = (currentPage - 1) * itemsPerPage;
|
const startIndex = (currentPage - 1) * itemsPerPage;
|
||||||
const endIndex = startIndex + itemsPerPage;
|
const endIndex = startIndex + itemsPerPage;
|
||||||
return data.slice(startIndex, endIndex);
|
return data.slice(startIndex, endIndex);
|
||||||
}, [data, currentPage, itemsPerPage]);
|
}, [data, currentPage, itemsPerPage]);
|
||||||
|
|
||||||
const paginate = useCallback((pageNumber) => {
|
const paginate = useCallback((pageNumber) => setCurrentPage(pageNumber), []);
|
||||||
if (pageNumber > 0 && pageNumber <= maxPage) {
|
|
||||||
setCurrentPage(pageNumber);
|
|
||||||
}
|
|
||||||
}, [maxPage]);
|
|
||||||
|
|
||||||
// Ensure resetPage is returned by the hook
|
|
||||||
const resetPage = useCallback(() => setCurrentPage(1), []);
|
const resetPage = useCallback(() => setCurrentPage(1), []);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -42,91 +35,59 @@ const usePagination = (data, itemsPerPage) => {
|
|||||||
|
|
||||||
const AttendanceLog = ({
|
const AttendanceLog = ({
|
||||||
handleModalData,
|
handleModalData,
|
||||||
projectId,
|
|
||||||
setshowOnlyCheckout,
|
|
||||||
showOnlyCheckout, // Prop for showPending state
|
|
||||||
searchQuery, // Prop for search query
|
|
||||||
}) => {
|
}) => {
|
||||||
const selectedProject = useSelector(
|
const selectedProject = useSelector(
|
||||||
(store) => store.localVariables.projectId
|
(store) => store.localVariables.projectId
|
||||||
);
|
);
|
||||||
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [showPending,setShowPending] = useState(false)
|
||||||
|
|
||||||
// Get data, loading, and fetching state from the Redux store's attendanceLogs slice
|
const [isRefreshing, setIsRefreshing] = useState(false);
|
||||||
const { data: attendanceLogsData, loading: logsLoading, isFetching: logsFetching } = useSelector(
|
const [processedData, setProcessedData] = useState([]);
|
||||||
(state) => state.attendanceLogs // Assuming your slice is named 'attendanceLogs'
|
|
||||||
);
|
|
||||||
|
|
||||||
const [isRefreshing, setIsRefreshing] = useState(false); // Local state for refresh spinner
|
const today = new Date();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const today = useMemo(() => {
|
const yesterday = new Date();
|
||||||
const d = new Date();
|
yesterday.setDate(yesterday.getDate() - 1);
|
||||||
d.setHours(0, 0, 0, 0);
|
|
||||||
return d;
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const yesterday = useMemo(() => {
|
const isSameDay = (dateStr) => {
|
||||||
const d = new Date();
|
|
||||||
d.setDate(d.getDate() - 1);
|
|
||||||
return d;
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const isSameDay = useCallback((dateStr) => {
|
|
||||||
if (!dateStr) return false;
|
if (!dateStr) return false;
|
||||||
const d = new Date(dateStr);
|
const d = new Date(dateStr);
|
||||||
d.setHours(0, 0, 0, 0);
|
d.setHours(0, 0, 0, 0);
|
||||||
return d.getTime() === today.getTime();
|
return d.getTime() === today.getTime();
|
||||||
}, [today]);
|
};
|
||||||
|
|
||||||
const isBeforeToday = useCallback((dateStr) => {
|
const isBeforeToday = (dateStr) => {
|
||||||
if (!dateStr) return false;
|
if (!dateStr) return false;
|
||||||
const d = new Date(dateStr);
|
const d = new Date(dateStr);
|
||||||
d.setHours(0, 0, 0, 0);
|
d.setHours(0, 0, 0, 0);
|
||||||
return d.getTime() < today.getTime();
|
return d.getTime() < today.getTime();
|
||||||
}, [today]);
|
};
|
||||||
|
|
||||||
const sortByName = useCallback((a, b) => {
|
const sortByName = (a, b) => {
|
||||||
const nameA = `${a.firstName || ""} ${a.lastName || ""}`.toLowerCase();
|
const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
|
||||||
const nameB = `${b.firstName || ""} ${b.lastName || ""}`.toLowerCase();
|
const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
|
||||||
return nameA.localeCompare(nameB);
|
return nameA?.localeCompare(nameB);
|
||||||
}, []);
|
};
|
||||||
|
|
||||||
// Effect to fetch attendance data when dateRange or projectId changes
|
const {
|
||||||
useEffect(() => {
|
data = [],
|
||||||
const { startDate, endDate } = dateRange;
|
isLoading,
|
||||||
dispatch(
|
error,
|
||||||
fetchAttendanceData({
|
refetch,
|
||||||
projectId,
|
isFetching,
|
||||||
fromDate: startDate,
|
} = useAttendancesLogs(
|
||||||
toDate: endDate,
|
selectedProject,
|
||||||
})
|
dateRange.startDate,
|
||||||
);
|
dateRange.endDate
|
||||||
setIsRefreshing(false); // Reset refreshing state after fetch attempt
|
);
|
||||||
}, [dateRange, projectId, dispatch, isRefreshing]); // isRefreshing is a dependency because it triggers a re-fetch
|
const filtering = (data) => {
|
||||||
|
const filteredData = showPending
|
||||||
const processedData = useMemo(() => {
|
? data.filter((item) => item.checkOutTime === null)
|
||||||
let filteredData = showOnlyCheckout // Use the prop directly
|
: data;
|
||||||
? attendanceLogsData.filter((item) => item.checkOutTime === null) // Use attendanceLogsData
|
|
||||||
: attendanceLogsData; // Use attendanceLogsData
|
|
||||||
|
|
||||||
// Apply search query filter
|
|
||||||
if (searchQuery) {
|
|
||||||
const lowerCaseSearchQuery = searchQuery.toLowerCase();
|
|
||||||
filteredData = filteredData.filter((att) => {
|
|
||||||
// Construct a full name from available parts, filtering out null/undefined
|
|
||||||
const fullName = [att.firstName, att.middleName, att.lastName]
|
|
||||||
.filter(Boolean) // This removes null, undefined, or empty string parts
|
|
||||||
.join(" ")
|
|
||||||
.toLowerCase();
|
|
||||||
|
|
||||||
return (
|
|
||||||
att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
fullName.includes(lowerCaseSearchQuery)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const group1 = filteredData
|
const group1 = filteredData
|
||||||
.filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
|
.filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
|
||||||
@ -170,41 +131,49 @@ const AttendanceLog = ({
|
|||||||
(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]);
|
||||||
return sortedDates.flatMap((date) => groupedByDate[date]);
|
setProcessedData(finalData);
|
||||||
}, [attendanceLogsData, showOnlyCheckout, searchQuery, isSameDay, isBeforeToday, sortByName]); // Added attendanceLogsData to dependencies
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
filtering(data);
|
||||||
|
}, [data, showPending]);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
currentPage,
|
currentPage,
|
||||||
totalPages,
|
totalPages,
|
||||||
currentItems: paginatedAttendances,
|
currentItems: paginatedAttendances,
|
||||||
paginate,
|
paginate,
|
||||||
resetPage, // Destructure resetPage here
|
resetPage,
|
||||||
} = usePagination(processedData, 20);
|
} = usePagination(processedData, 20);
|
||||||
|
|
||||||
// Effect to reset pagination when search query changes
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
resetPage();
|
resetPage();
|
||||||
}, [searchQuery, resetPage]); // Add resetPage to dependencies
|
}, [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
|
||||||
);
|
);
|
||||||
dispatch(setAttendanceData(updatedAttendance)); // Update Redux store
|
})
|
||||||
|
|
||||||
|
filtering(updatedAttendance);
|
||||||
|
resetPage();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[projectId, dateRange, data, dispatch]
|
[selectedProject, dateRange, data, filtering, resetPage]
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -215,28 +184,26 @@ const AttendanceLog = ({
|
|||||||
const employeeHandler = useCallback(
|
const employeeHandler = useCallback(
|
||||||
(msg) => {
|
(msg) => {
|
||||||
const { startDate, endDate } = dateRange;
|
const { startDate, endDate } = dateRange;
|
||||||
dispatch(
|
if (data.some((item) => item.employeeId == msg.employeeId)) {
|
||||||
fetchAttendanceData({
|
// dispatch(
|
||||||
projectId,
|
// fetchAttendanceData({
|
||||||
fromDate: startDate,
|
// ,
|
||||||
toDate: endDate,
|
// fromDate: startDate,
|
||||||
})
|
// toDate: endDate,
|
||||||
);
|
// })
|
||||||
|
// );
|
||||||
|
|
||||||
|
refetch()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
[projectId, dateRange, dispatch]
|
[selectedProject, dateRange, data]
|
||||||
);
|
);
|
||||||
|
|
||||||
// Removed duplicate useEffect, keeping only one
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
eventBus.on("employee", employeeHandler);
|
eventBus.on("employee", employeeHandler);
|
||||||
return () => eventBus.off("employee", employeeHandler);
|
return () => eventBus.off("employee", employeeHandler);
|
||||||
}, [employeeHandler]);
|
}, [employeeHandler]);
|
||||||
|
|
||||||
const handleRefreshClick = () => {
|
|
||||||
setIsRefreshing(true); // Set refreshing state to true
|
|
||||||
// The useEffect for fetching data will trigger because isRefreshing is a dependency
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
@ -253,28 +220,28 @@ const AttendanceLog = ({
|
|||||||
type="checkbox"
|
type="checkbox"
|
||||||
className="form-check-input"
|
className="form-check-input"
|
||||||
role="switch"
|
role="switch"
|
||||||
disabled={logsFetching} // Use logsFetching from Redux store
|
disabled={isFetching}
|
||||||
id="inactiveEmployeesCheckbox"
|
id="inactiveEmployeesCheckbox"
|
||||||
checked={showOnlyCheckout} // Use the prop directly
|
checked={showPending}
|
||||||
onChange={(e) => setshowOnlyCheckout(e.target.checked)} // Use the prop setter
|
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>
|
||||||
<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 ${logsLoading || isRefreshing ? "spin" : "" // Use logsLoading for overall loading, isRefreshing for local spinner
|
className={`bx bx-refresh cursor-pointer fs-4 ${
|
||||||
}`}
|
isFetching ? "spin" : ""
|
||||||
|
}`}
|
||||||
title="Refresh"
|
title="Refresh"
|
||||||
onClick={handleRefreshClick} // Call the new handler
|
onClick={() => refetch()}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div className="table-responsive text-nowrap">
|
||||||
className="table-responsive text-nowrap"
|
{isLoading ? (
|
||||||
style={{ minHeight: "200px", display: 'flex' }}
|
<div><p className="text-secondary">Loading...</p></div>
|
||||||
>
|
) : data?.length > 0 ? (
|
||||||
{processedData && processedData.length > 0 ? (
|
|
||||||
<table className="table mb-0">
|
<table className="table mb-0">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -293,96 +260,82 @@ const AttendanceLog = ({
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{(logsLoading || isRefreshing) && ( // Use logsLoading and 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];
|
||||||
{!logsLoading && // Use logsLoading
|
const previousDate = previousAttendance
|
||||||
!isRefreshing && // Use isRefreshing
|
? moment(
|
||||||
paginatedAttendances.reduce((acc, attendance, index, arr) => {
|
|
||||||
const currentDate = moment(
|
|
||||||
attendance.checkInTime || attendance.checkOutTime
|
|
||||||
).format("YYYY-MM-DD");
|
|
||||||
const previousAttendance = arr[index - 1];
|
|
||||||
const previousDate = previousAttendance
|
|
||||||
? moment(
|
|
||||||
previousAttendance.checkInTime ||
|
previousAttendance.checkInTime ||
|
||||||
previousAttendance.checkOutTime
|
previousAttendance.checkOutTime
|
||||||
).format("YYYY-MM-DD")
|
).format("YYYY-MM-DD")
|
||||||
: null;
|
: 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={attendance.id || 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>
|
||||||
) : (
|
) : (
|
||||||
!logsLoading && // Use logsLoading
|
<div className="my-4"><span className="text-secondary">No Record Available !</span></div>
|
||||||
!isRefreshing && ( // Use isRefreshing
|
|
||||||
<div
|
|
||||||
className="d-flex justify-content-center align-items-center text-muted"
|
|
||||||
style={{
|
|
||||||
width: "100%",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
No employee logs.
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{!logsLoading && !isRefreshing && processedData.length > 20 && ( // Use logsLoading and isRefreshing
|
{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" : ""}`}>
|
||||||
@ -397,8 +350,9 @@ const AttendanceLog = ({
|
|||||||
(pageNumber) => (
|
(pageNumber) => (
|
||||||
<li
|
<li
|
||||||
key={pageNumber}
|
key={pageNumber}
|
||||||
className={`page-item ${currentPage === pageNumber ? "active" : ""
|
className={`page-item ${
|
||||||
}`}
|
currentPage === pageNumber ? "active" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className="page-link"
|
className="page-link"
|
||||||
@ -410,8 +364,9 @@ const AttendanceLog = ({
|
|||||||
)
|
)
|
||||||
)}
|
)}
|
||||||
<li
|
<li
|
||||||
className={`page-item ${currentPage === totalPages ? "disabled" : ""
|
className={`page-item ${
|
||||||
}`}
|
currentPage === totalPages ? "disabled" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className="page-link"
|
className="page-link"
|
||||||
@ -427,4 +382,4 @@ const AttendanceLog = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default AttendanceLog;
|
export default AttendanceLog;
|
||||||
|
|||||||
@ -7,39 +7,64 @@ import { useRegularizationRequests } from "../../hooks/useAttendance";
|
|||||||
import moment from "moment";
|
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 } from "../../slices/apiDataManager";
|
import { cacheData, clearCacheKey } from "../../slices/apiDataManager";
|
||||||
|
import { useQueryClient } from "@tanstack/react-query";
|
||||||
|
|
||||||
const Regularization = ({ handleRequest, searchQuery }) => {
|
const Regularization = ({ handleRequest }) => {
|
||||||
const selectedProject = useSelector((store) => store.localVariables.projectId);
|
const queryClient = useQueryClient();
|
||||||
const [regularizesList, setRegularizedList] = useState([]);
|
var selectedProject = useSelector((store) => store.localVariables.projectId);
|
||||||
const { regularizes, loading, refetch } = useRegularizationRequests(selectedProject);
|
const [regularizesList, setregularizedList] = useState([]);
|
||||||
|
const { regularizes, loading, error, refetch } =
|
||||||
|
useRegularizationRequests(selectedProject);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setRegularizedList(regularizes);
|
setregularizedList(regularizes);
|
||||||
}, [regularizes]);
|
}, [regularizes]);
|
||||||
|
|
||||||
const sortByName = (a, b) => {
|
const sortByName = (a, b) => {
|
||||||
const nameA = (a.firstName + a.lastName).toLowerCase();
|
const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
|
||||||
const nameB = (b.firstName + b.lastName).toLowerCase();
|
const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
|
||||||
return nameA.localeCompare(nameB);
|
return nameA?.localeCompare(nameB);
|
||||||
};
|
};
|
||||||
|
|
||||||
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,
|
||||||
refetch();
|
// projectId: selectedProject,
|
||||||
|
// });
|
||||||
|
// 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]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
const employeeHandler = useCallback(
|
const filteredData = [...regularizesList]?.sort(sortByName);
|
||||||
|
|
||||||
|
const { currentPage, totalPages, currentItems, paginate } = usePagination(
|
||||||
|
filteredData,
|
||||||
|
20
|
||||||
|
);
|
||||||
|
useEffect(() => {
|
||||||
|
eventBus.on("regularization", handler);
|
||||||
|
return () => eventBus.off("regularization", handler);
|
||||||
|
}, [handler]);
|
||||||
|
|
||||||
const employeeHandler = useCallback(
|
const employeeHandler = useCallback(
|
||||||
(msg) => {
|
(msg) => {
|
||||||
if (regularizes.some((item) => item.employeeId == msg.employeeId)) {
|
if (regularizes.some((item) => item.employeeId == msg.employeeId)) {
|
||||||
@ -49,59 +74,41 @@ const Regularization = ({ handleRequest, searchQuery }) => {
|
|||||||
[regularizes]
|
[regularizes]
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
useEffect(() => {
|
|
||||||
eventBus.on("regularization", handler);
|
|
||||||
return () => eventBus.off("regularization", handler);
|
|
||||||
}, [handler]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
eventBus.on("employee", employeeHandler);
|
eventBus.on("employee", employeeHandler);
|
||||||
return () => eventBus.off("employee", employeeHandler);
|
return () => eventBus.off("employee", employeeHandler);
|
||||||
}, [employeeHandler]);
|
}, [employeeHandler]);
|
||||||
|
|
||||||
// ✅ Search filter logic added here
|
|
||||||
const filteredData = [...regularizesList]
|
|
||||||
?.filter((item) => {
|
|
||||||
if (!searchQuery) return true;
|
|
||||||
const lowerSearch = searchQuery.toLowerCase();
|
|
||||||
const fullName = `${item.firstName || ""} ${item.lastName || ""}`.toLowerCase();
|
|
||||||
|
|
||||||
return (
|
|
||||||
item.firstName?.toLowerCase().includes(lowerSearch) ||
|
|
||||||
item.lastName?.toLowerCase().includes(lowerSearch) ||
|
|
||||||
fullName.includes(lowerSearch) ||
|
|
||||||
item.employeeId?.toLowerCase().includes(lowerSearch)
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.sort(sortByName);
|
|
||||||
|
|
||||||
const { currentPage, totalPages, currentItems, paginate } = usePagination(filteredData, 20);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="table-responsive text-nowrap pb-4">
|
<div className="table-responsive text-nowrap pb-4">
|
||||||
<table className="table mb-0">
|
{loading ? (
|
||||||
<thead>
|
<div className="my-2">
|
||||||
<tr>
|
<p className="text-secondary">Loading...</p>
|
||||||
<th colSpan={2}>Name</th>
|
</div>
|
||||||
<th>Date</th>
|
) : currentItems?.length > 0 ? (
|
||||||
<th>
|
<table className="table mb-0">
|
||||||
<i className="bx bxs-down-arrow-alt text-success"></i>Check-In
|
<thead>
|
||||||
</th>
|
<tr>
|
||||||
<th>
|
<th colSpan={2}>Name</th>
|
||||||
<i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
|
<th>Date</th>
|
||||||
</th>
|
<th>
|
||||||
<th>Action</th>
|
<i className="bx bxs-down-arrow-alt text-success"></i>Check-In
|
||||||
</tr>
|
</th>
|
||||||
</thead>
|
<th>
|
||||||
<tbody>
|
<i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
|
||||||
{!loading && currentItems?.length > 0 ? (
|
</th>
|
||||||
currentItems.map((att, index) => (
|
<th>Action</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{currentItems?.map((att, index) => (
|
||||||
<tr key={index}>
|
<tr key={index}>
|
||||||
<td colSpan={2}>
|
<td colSpan={2}>
|
||||||
<div className="d-flex justify-content-start align-items-center">
|
<div className="d-flex justify-content-start align-items-center">
|
||||||
<Avatar firstName={att.firstName} lastName={att.lastName} />
|
<Avatar
|
||||||
|
firstName={att.firstName}
|
||||||
|
lastName={att.lastName}
|
||||||
|
></Avatar>
|
||||||
<div className="d-flex flex-column">
|
<div className="d-flex flex-column">
|
||||||
<a href="#" className="text-heading text-truncate">
|
<a href="#" className="text-heading text-truncate">
|
||||||
<span className="fw-normal">
|
<span className="fw-normal">
|
||||||
@ -116,33 +123,24 @@ const Regularization = ({ handleRequest, searchQuery }) => {
|
|||||||
<td>
|
<td>
|
||||||
{att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
|
{att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
|
||||||
</td>
|
</td>
|
||||||
<td className="text-center">
|
<td className="text-center ">
|
||||||
<RegularizationActions
|
<RegularizationActions
|
||||||
attendanceData={att}
|
attendanceData={att}
|
||||||
handleRequest={handleRequest}
|
handleRequest={handleRequest}
|
||||||
refresh={refetch}
|
refresh={refetch}
|
||||||
/>
|
/>
|
||||||
|
{/* </div> */}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))
|
))}
|
||||||
) : (
|
</tbody>
|
||||||
<tr>
|
</table>
|
||||||
<td
|
) : (
|
||||||
colSpan={6}
|
<div className="my-4">
|
||||||
className="text-center"
|
{" "}
|
||||||
style={{
|
<span className="text-secondary">No Requests Found !</span>
|
||||||
height: "200px",
|
</div>
|
||||||
verticalAlign: "middle",
|
)}
|
||||||
borderBottom: "none",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{loading ? "Loading..." : "No Record Found"}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
{!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">
|
||||||
@ -157,18 +155,25 @@ const Regularization = ({ handleRequest, searchQuery }) => {
|
|||||||
{[...Array(totalPages)].map((_, index) => (
|
{[...Array(totalPages)].map((_, index) => (
|
||||||
<li
|
<li
|
||||||
key={index}
|
key={index}
|
||||||
className={`page-item ${currentPage === index + 1 ? "active" : ""}`}
|
className={`page-item ${
|
||||||
|
currentPage === index + 1 ? "active" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<button className="page-link" onClick={() => paginate(index + 1)}>
|
<button
|
||||||
|
className="page-link "
|
||||||
|
onClick={() => paginate(index + 1)}
|
||||||
|
>
|
||||||
{index + 1}
|
{index + 1}
|
||||||
</button>
|
</button>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
<li
|
<li
|
||||||
className={`page-item ${currentPage === totalPages ? "disabled" : ""}`}
|
className={`page-item ${
|
||||||
|
currentPage === totalPages ? "disabled" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className="page-link"
|
className="page-link "
|
||||||
onClick={() => paginate(currentPage + 1)}
|
onClick={() => paginate(currentPage + 1)}
|
||||||
>
|
>
|
||||||
»
|
»
|
||||||
@ -182,5 +187,3 @@ const Regularization = ({ handleRequest, searchQuery }) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default Regularization;
|
export default Regularization;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -8,35 +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 Regularization from "../../components/Activities/Regularization";
|
import Regularization from "../../components/Activities/Regularization";
|
||||||
import { useAttendance } 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 { 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); // Renamed for consistency
|
const [ShowPending, setShowPending] = useState(false);
|
||||||
const [searchQuery, setSearchQuery] = useState("");
|
const queryClient = useQueryClient();
|
||||||
const [showPending, setShowPending] = useState(false); // Renamed for consistency
|
|
||||||
const [searchQuery, setSearchQuery] = useState("");
|
|
||||||
const loginUser = getCachedProfileData();
|
const loginUser = getCachedProfileData();
|
||||||
const selectedProject = useSelector((store) => store.localVariables.projectId);
|
var selectedProject = useSelector((store) => store.localVariables.projectId);
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const selectedProject = useSelector((store) => store.localVariables.projectId);
|
// const {
|
||||||
const dispatch = useDispatch();
|
// attendance,
|
||||||
const {
|
// loading: attLoading,
|
||||||
attendance,
|
// recall: attrecall,
|
||||||
loading: attLoading,
|
// } = useAttendance(selectedProject);
|
||||||
recall: attrecall,
|
|
||||||
} = useAttendance(selectedProject); // Corrected typo: useAttendace to useAttendance
|
|
||||||
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);
|
||||||
@ -44,57 +47,49 @@ 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) {
|
||||||
// Ensure attendances is not null before mapping
|
// const updatedAttendance = attendances.map((item) =>
|
||||||
const updatedAttendance = attendances
|
// item.employeeId === msg.response.employeeId
|
||||||
? attendances.map((item) =>
|
// ? { ...item, ...msg.response }
|
||||||
item.employeeId === msg.response.employeeId
|
// : item
|
||||||
? { ...item, ...msg.response }
|
// );
|
||||||
: item
|
// queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
|
||||||
)
|
// if (!oldData) return oldData;
|
||||||
: [msg.response]; // If attendances is null, initialize with new response
|
// return oldData.map((emp) =>
|
||||||
|
// emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
|
||||||
|
// );
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
// [selectedProject, attrecall]
|
||||||
|
// );
|
||||||
|
|
||||||
cacheData("Attendance", {
|
// const employeeHandler = useCallback(
|
||||||
data: updatedAttendance,
|
// (msg) => {
|
||||||
projectId: selectedProject,
|
// if (attendances.some((item) => item.employeeId == msg.employeeId)) {
|
||||||
});
|
// attrecall();
|
||||||
setAttendances(updatedAttendance);
|
// }
|
||||||
}
|
// },
|
||||||
},
|
// [selectedProject, attendances]
|
||||||
[selectedProject, attendances] // Removed attrecall as it's not a direct dependency for this state update
|
// );
|
||||||
);
|
useEffect(() => {
|
||||||
|
if (selectedProject == null) {
|
||||||
const employeeHandler = useCallback(
|
dispatch(setProjectId(projectNames[0]?.id));
|
||||||
(msg) => {
|
}
|
||||||
if (attendances?.some((item) => item.employeeId === msg.employeeId)) {
|
}, []);
|
||||||
AttendanceRepository.getAttendance(selectedProject)
|
|
||||||
.then((response) => {
|
|
||||||
cacheData("Attendance", { data: response.data, selectedProject });
|
|
||||||
setAttendances(response.data);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error(error);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[selectedProject, attendances]
|
|
||||||
);
|
|
||||||
|
|
||||||
const getRole = (roleId) => {
|
const getRole = (roleId) => {
|
||||||
if (!empRoles) return "Unassigned";
|
if (!empRoles) return "Unassigned";
|
||||||
if (!roleId) return "Unassigned";
|
if (!roleId) return "Unassigned";
|
||||||
const role = empRoles.find((b) => b.id === roleId);
|
const role = empRoles.find((b) => b.id == roleId);
|
||||||
const role = empRoles.find((b) => b.id === roleId);
|
|
||||||
return role ? role.role : "Unassigned";
|
return role ? role.role : "Unassigned";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -109,154 +104,35 @@ 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");
|
|
||||||
const modalBackdrop = document.querySelector(".modal-backdrop");
|
|
||||||
if (modalBackdrop) {
|
|
||||||
modalBackdrop.remove();
|
|
||||||
}
|
|
||||||
const modalBackdrop = document.querySelector(".modal-backdrop");
|
|
||||||
if (modalBackdrop) {
|
|
||||||
modalBackdrop.remove();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSubmit = (formData) => {
|
|
||||||
dispatch(markCurrentAttendance(formData))
|
|
||||||
.then((action) => {
|
|
||||||
// Check if payload and employeeId exist before mapping
|
|
||||||
if (action.payload && action.payload.employeeId) {
|
|
||||||
const updatedAttendance = attendances
|
|
||||||
? attendances.map((item) =>
|
|
||||||
item.employeeId === action.payload.employeeId
|
|
||||||
? { ...item, ...action.payload }
|
|
||||||
: item
|
|
||||||
)
|
|
||||||
: [action.payload]; // If attendances is null, initialize with new payload
|
|
||||||
|
|
||||||
cacheData("Attendance", {
|
|
||||||
data: updatedAttendance,
|
|
||||||
projectId: selectedProject,
|
|
||||||
});
|
|
||||||
setAttendances(updatedAttendance);
|
|
||||||
showToast("Attendance Marked Successfully", "success");
|
|
||||||
} else {
|
|
||||||
showToast("Failed to mark attendance: Invalid response", "error");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
showToast(error.message, "error");
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleToggle = (event) => {
|
const handleToggle = (event) => {
|
||||||
setShowPending(event.target.checked);
|
setShowOnlyCheckout(event.target.checked);
|
||||||
setShowPending(event.target.checked);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (selectedProject === null && projectNames.length > 0) {
|
|
||||||
dispatch(setProjectId(projectNames[0]?.id));
|
|
||||||
}
|
|
||||||
}, [selectedProject, projectNames, dispatch]);
|
|
||||||
|
|
||||||
// Open modal when modelConfig is set
|
|
||||||
if (selectedProject === null && projectNames.length > 0) {
|
|
||||||
dispatch(setProjectId(projectNames[0]?.id));
|
|
||||||
}
|
|
||||||
}, [selectedProject, projectNames, dispatch]);
|
|
||||||
|
|
||||||
// Open modal when modelConfig is set
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (modelConfig !== null) {
|
if (modelConfig !== null) {
|
||||||
openModel();
|
openModel();
|
||||||
}
|
}
|
||||||
}, [modelConfig]); // Removed isCreateModalOpen from here as it's set by openModel()
|
}, [modelConfig, isCreateModalOpen]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setAttendances(attendance);
|
|
||||||
}, [attendance]);
|
|
||||||
|
|
||||||
// Filter and search logic for the 'Today's' tab (Attendance component)
|
// useEffect(() => {
|
||||||
const filteredAndSearchedTodayAttendance = useCallback(() => {
|
// eventBus.on("attendance", handler);
|
||||||
let currentData = attendances;
|
// return () => eventBus.off("attendance", handler);
|
||||||
// Filter and search logic for the 'Today's' tab (Attendance component)
|
// }, [handler]);
|
||||||
const filteredAndSearchedTodayAttendance = useCallback(() => {
|
|
||||||
let currentData = attendances;
|
|
||||||
|
|
||||||
if (showPending) {
|
// useEffect(() => {
|
||||||
currentData = currentData?.filter(
|
// eventBus.on("employee", employeeHandler);
|
||||||
if (showPending) {
|
// return () => eventBus.off("employee", employeeHandler);
|
||||||
currentData = currentData?.filter(
|
// }, [employeeHandler]);
|
||||||
(att) => att?.checkInTime !== null && att?.checkOutTime === null
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (searchQuery) {
|
|
||||||
const lowerCaseSearchQuery = searchQuery.toLowerCase();
|
|
||||||
currentData = currentData?.filter((att) => {
|
|
||||||
// Combine first, middle, and last names for a comprehensive search
|
|
||||||
const fullName = [att.firstName, att.middleName, att.lastName]
|
|
||||||
.filter(Boolean) // Remove null or undefined parts
|
|
||||||
.join(" ")
|
|
||||||
.toLowerCase();
|
|
||||||
|
|
||||||
return (
|
|
||||||
att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
fullName.includes(lowerCaseSearchQuery)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return currentData;
|
|
||||||
}, [attendances, showPending, searchQuery]);
|
|
||||||
|
|
||||||
|
|
||||||
// Event bus listeners
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (searchQuery) {
|
|
||||||
const lowerCaseSearchQuery = searchQuery.toLowerCase();
|
|
||||||
currentData = currentData?.filter((att) => {
|
|
||||||
// Combine first, middle, and last names for a comprehensive search
|
|
||||||
const fullName = [att.firstName, att.middleName, att.lastName]
|
|
||||||
.filter(Boolean) // Remove null or undefined parts
|
|
||||||
.join(" ")
|
|
||||||
.toLowerCase();
|
|
||||||
|
|
||||||
return (
|
|
||||||
att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
|
|
||||||
fullName.includes(lowerCaseSearchQuery)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return currentData;
|
|
||||||
}, [attendances, showPending, searchQuery]);
|
|
||||||
|
|
||||||
|
|
||||||
// Event bus listeners
|
|
||||||
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"
|
||||||
>
|
>
|
||||||
@ -266,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">
|
||||||
@ -275,158 +174,69 @@ 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 d-flex justify-content-between align-items-center" role="tablist">
|
<ul className="nav nav-tabs" role="tablist">
|
||||||
<div className="d-flex">
|
<li className="nav-item">
|
||||||
<li className="nav-item">
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
className={`nav-link ${
|
||||||
className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`}
|
activeTab === "all" ? "active" : ""
|
||||||
onClick={() => setActiveTab("all")}
|
} fs-6`}
|
||||||
data-bs-toggle="tab"
|
onClick={() => setActiveTab("all")}
|
||||||
data-bs-target="#navs-top-home"
|
data-bs-toggle="tab"
|
||||||
>
|
data-bs-target="#navs-top-home"
|
||||||
Today's
|
>
|
||||||
</button>
|
Today's
|
||||||
</li>
|
</button>
|
||||||
<li className="nav-item">
|
</li>
|
||||||
<button
|
<li className="nav-item">
|
||||||
type="button"
|
<button
|
||||||
className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`}
|
type="button"
|
||||||
onClick={() => setActiveTab("logs")}
|
className={`nav-link ${
|
||||||
data-bs-toggle="tab"
|
activeTab === "logs" ? "active" : ""
|
||||||
data-bs-target="#navs-top-profile"
|
} fs-6`}
|
||||||
>
|
onClick={() => setActiveTab("logs")}
|
||||||
Logs
|
data-bs-toggle="tab"
|
||||||
</button>
|
data-bs-target="#navs-top-profile"
|
||||||
</li>
|
>
|
||||||
<li className={`nav-item ${!DoRegularized && "d-none"}`}>
|
Logs
|
||||||
<button
|
</button>
|
||||||
type="button"
|
</li>
|
||||||
className={`nav-link ${activeTab === "regularization" ? "active" : ""
|
<li className={`nav-item ${!DoRegularized && "d-none"}`}>
|
||||||
} fs-6`}
|
<button
|
||||||
onClick={() => setActiveTab("regularization")}
|
type="button"
|
||||||
data-bs-toggle="tab"
|
className={`nav-link ${
|
||||||
data-bs-target="#navs-top-messages"
|
activeTab === "regularization" ? "active" : ""
|
||||||
>
|
} fs-6`}
|
||||||
Regularization
|
onClick={() => setActiveTab("regularization")}
|
||||||
</button>
|
data-bs-toggle="tab"
|
||||||
</li>
|
data-bs-target="#navs-top-messages"
|
||||||
</div>
|
>
|
||||||
{/* Search Box remains here */}
|
Regularization
|
||||||
<div className="p-2">
|
</button>
|
||||||
<input
|
</li>
|
||||||
type="text"
|
|
||||||
className="form-control form-control-sm" // Bootstrap small size input
|
|
||||||
placeholder="Search employee..."
|
|
||||||
value={searchQuery}
|
|
||||||
onChange={(e) => setSearchQuery(e.target.value)}
|
|
||||||
// style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul className="nav nav-tabs d-flex justify-content-between align-items-center" role="tablist">
|
|
||||||
<div className="d-flex">
|
|
||||||
<li className="nav-item">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`}
|
|
||||||
onClick={() => setActiveTab("all")}
|
|
||||||
data-bs-toggle="tab"
|
|
||||||
data-bs-target="#navs-top-home"
|
|
||||||
>
|
|
||||||
Today's
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li className="nav-item">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`}
|
|
||||||
onClick={() => setActiveTab("logs")}
|
|
||||||
data-bs-toggle="tab"
|
|
||||||
data-bs-target="#navs-top-profile"
|
|
||||||
>
|
|
||||||
Logs
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li className={`nav-item ${!DoRegularized && "d-none"}`}>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`nav-link ${activeTab === "regularization" ? "active" : ""
|
|
||||||
} fs-6`}
|
|
||||||
onClick={() => setActiveTab("regularization")}
|
|
||||||
data-bs-toggle="tab"
|
|
||||||
data-bs-target="#navs-top-messages"
|
|
||||||
>
|
|
||||||
Regularization
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</div>
|
|
||||||
{/* Search Box remains here */}
|
|
||||||
<div className="p-2">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
className="form-control form-control-sm" // Bootstrap small size input
|
|
||||||
placeholder="Search employee..."
|
|
||||||
value={searchQuery}
|
|
||||||
onChange={(e) => setSearchQuery(e.target.value)}
|
|
||||||
// style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</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={filteredAndSearchedTodayAttendance()}
|
|
||||||
handleModalData={handleModalData}
|
handleModalData={handleModalData}
|
||||||
getRole={getRole}
|
getRole={getRole}
|
||||||
setshowOnlyCheckout={setShowPending}
|
|
||||||
showOnlyCheckout={showPending}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
{!attLoading && filteredAndSearchedTodayAttendance()?.length === 0 && (
|
|
||||||
<p>
|
|
||||||
{" "}
|
|
||||||
{showPending
|
|
||||||
{showPending
|
|
||||||
? "No Pending Available"
|
|
||||||
: "No Employee assigned yet."}{" "}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
{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}
|
|
||||||
searchQuery={searchQuery} // Pass search query to AttendanceLog
|
|
||||||
showOnlyCheckout={showPending}
|
|
||||||
searchQuery={searchQuery} // Pass search query to AttendanceLog
|
|
||||||
/>
|
/>
|
||||||
</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
|
<Regularization />
|
||||||
handleRequest={handleSubmit}
|
|
||||||
searchQuery={searchQuery} // ✅ Pass it here
|
|
||||||
/>
|
|
||||||
<Regularization
|
|
||||||
handleRequest={handleSubmit}
|
|
||||||
searchQuery={searchQuery} // ✅ Pass it here
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!attLoading && !attendances && <span>Not Found</span>}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -434,4 +244,4 @@ const AttendancePage = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default AttendancePage;
|
export default AttendancePage;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user