Adding Switch button in attendence component. #129

Merged
vikas.nale merged 3 commits from Kartik_Enhancement#274 into Issue_May_4W 2025-05-24 10:17:21 +00:00
2 changed files with 56 additions and 17 deletions
Showing only changes of commit 141bb866d2 - Show all commits

View File

@ -9,7 +9,7 @@ import DateRangePicker from "../common/DateRangePicker";
import { getCachedData } from "../../slices/apiDataManager"; import { getCachedData } from "../../slices/apiDataManager";
import usePagination from "../../hooks/usePagination"; import usePagination from "../../hooks/usePagination";
const AttendanceLog = ({ handleModalData, projectId }) => { const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
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 { data, loading, error } = useSelector((store) => store.attendanceLogs);
@ -56,21 +56,26 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
}, [dateRange, projectId, isRefreshing]); }, [dateRange, projectId, isRefreshing]);
useEffect(() => { useEffect(() => {
const group1 = data // Filter the raw data based on showOnlyCheckout
const filteredData = showOnlyCheckout
? data.filter((item) => item.checkInTime && item.checkOutTime)
: data;
const group1 = filteredData
.filter((d) => d.activity === 1 && isSameDay(d.checkInTime)) .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
.sort(sortByName); .sort(sortByName);
const group2 = data const group2 = filteredData
.filter((d) => d.activity === 4 && isSameDay(d.checkOutTime)) .filter((d) => d.activity === 4 && isSameDay(d.checkOutTime))
.sort(sortByName); .sort(sortByName);
const group3 = data const group3 = filteredData
.filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime)) .filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime))
.sort(sortByName); .sort(sortByName);
const group4 = data const group4 = filteredData
.filter((d) => d.activity === 4 && isBeforeToday(d.checkOutTime)); .filter((d) => d.activity === 4 && isBeforeToday(d.checkOutTime));
const group5 = data const group5 = filteredData
.filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime)) .filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
.sort(sortByName); .sort(sortByName);
const group6 = data.filter((d) => d.activity === 5).sort(sortByName); const group6 = filteredData.filter((d) => d.activity === 5).sort(sortByName);
const sortedList = [...group1, ...group2, ...group3, ...group4, ...group5, ...group6]; const sortedList = [...group1, ...group2, ...group3, ...group4, ...group5, ...group6];
@ -90,7 +95,7 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
// Create the final sorted array // Create the final sorted array
const finalData = sortedDates.flatMap((date) => groupedByDate[date]); const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
setProcessedData(finalData); setProcessedData(finalData);
}, [data]); }, [data, showOnlyCheckout]); // Re-run this effect when data or showOnlyCheckout changes
const { currentPage, totalPages, currentItems: paginatedAttendances, paginate } = usePagination( const { currentPage, totalPages, currentItems: paginatedAttendances, paginate } = usePagination(
processedData, processedData,
@ -227,3 +232,5 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
}; };
export default AttendanceLog; export default AttendanceLog;

View File

@ -21,7 +21,7 @@ import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
const AttendancePage = () => { const AttendancePage = () => {
const [activeTab, setActiveTab] = useState("all"); const [activeTab, setActiveTab] = useState("all");
const [showOnlyCheckout, setShowOnlyCheckout] = useState(false);
const loginUser = getCachedProfileData(); const loginUser = getCachedProfileData();
var selectedProject = useSelector((store) => store.localVariables.projectId); var selectedProject = useSelector((store) => store.localVariables.projectId);
const { projects, loading: projectLoading } = useProjects(); const { projects, loading: projectLoading } = useProjects();
@ -86,6 +86,10 @@ const AttendancePage = () => {
}); });
}; };
const handleToggle = (event) => {
setShowOnlyCheckout(event.target.checked);
};
useEffect(() => { useEffect(() => {
if (modelConfig !== null) { if (modelConfig !== null) {
openModel(); openModel();
@ -100,6 +104,16 @@ const AttendancePage = () => {
dispatch(setProjectId(loginUser?.projects[0])); dispatch(setProjectId(loginUser?.projects[0]));
} }
}, [selectedProject, loginUser?.projects]); }, [selectedProject, loginUser?.projects]);
// Filter attendance data based on the toggle
const filteredAttendance = showOnlyCheckout
? attendances?.filter(
(att) => att?.checkOutTime !== null && att?.checkInTime !== null
)
: attendances;
return ( return (
<> <>
{isCreateModalOpen && modelConfig && ( {isCreateModalOpen && modelConfig && (
@ -188,9 +202,8 @@ const AttendancePage = () => {
<li className={`nav-item ${!DoRegularized && "d-none"}`}> <li className={`nav-item ${!DoRegularized && "d-none"}`}>
<button <button
type="button" type="button"
className={`nav-link ${ className={`nav-link ${activeTab === "regularization" ? "active" : ""
activeTab === "regularization" ? "active" : "" }`}
}`}
onClick={() => setActiveTab("regularization")} onClick={() => setActiveTab("regularization")}
data-bs-toggle="tab" data-bs-toggle="tab"
data-bs-target="#navs-top-messages" data-bs-target="#navs-top-messages"
@ -198,6 +211,24 @@ const AttendancePage = () => {
Regularization Regularization
</button> </button>
</li> </li>
<li className="nav-item ms-auto"> {/* Added ms-auto to push to the right */}
<label className="switch switch-primary">
<input
type="checkbox"
className="switch-input"
checked={showOnlyCheckout}
onChange={handleToggle}
/>
<span className="switch-toggle-slider">
<span className="switch-on"></span>
<span className="switch-off"></span>
</span>
<span className="switch-label m-2">
Show Employees
</span>
</label>
</li>
</ul> </ul>
<div className="tab-content attedanceTabs py-2"> <div className="tab-content attedanceTabs py-2">
{projectLoading && <span>Loading..</span>} {projectLoading && <span>Loading..</span>}
@ -205,12 +236,12 @@ const AttendancePage = () => {
{activeTab === "all" && ( {activeTab === "all" && (
<> <>
{!projectLoading && attendances.length === 0 && ( {!projectLoading && filteredAttendance?.length === 0 && (
<p>No Employee assigned yet.</p> <p>No Employee assigned yet.</p>
)} )}
<div className="tab-pane fade show active py-0"> <div className="tab-pane fade show active py-0">
<Attendance <Attendance
attendance={attendances} attendance={filteredAttendance}
handleModalData={handleModalData} handleModalData={handleModalData}
getRole={getRole} getRole={getRole}
/> />
@ -224,6 +255,7 @@ const AttendancePage = () => {
<AttendanceLog <AttendanceLog
handleModalData={handleModalData} handleModalData={handleModalData}
projectId={selectedProject} projectId={selectedProject}
showOnlyCheckout={showOnlyCheckout}
/> />
</div> </div>
)} )}