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

Merge branch 'Kartik_Enhancement#274' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Enhancement#274

Browse Source
This commit is contained in:
kartik.sharma 2025-05-24 16:01:44 +05:30
commit d931eca2fd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,6 @@ const AttendancePage = () => {
} }
}, [selectedProject, loginUser?.projects]); }, [selectedProject, loginUser?.projects]);
// Filter attendance data based on the toggle // Filter attendance data based on the toggle
// const filteredAttendance = showOnlyCheckout // const filteredAttendance = showOnlyCheckout
// ? attendances?.filter( // ? attendances?.filter(
@ -116,7 +115,6 @@ const AttendancePage = () => {
? attendances?.filter((att) => att?.checkOutTime === null) ? attendances?.filter((att) => att?.checkOutTime === null)
: attendances; : attendances;
return ( return (
<> <>
{isCreateModalOpen && modelConfig && ( {isCreateModalOpen && modelConfig && (
@ -205,8 +203,9 @@ 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 ${activeTab === "regularization" ? "active" : "" className={`nav-link ${
}`} 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"
@ -215,7 +214,11 @@ const AttendancePage = () => {
</button> </button>
</li> </li>
<li className={`nav-item ms-auto ${activeTab === "regularization" ? "d-none" : ""}`}> <li
className={`nav-item ms-auto ${
activeTab === "regularization" ? "d-none" : ""
}`}
>
<label className="switch switch-primary"> <label className="switch switch-primary">
<input <input
type="checkbox" type="checkbox"
@ -227,9 +230,7 @@ const AttendancePage = () => {
<span className="switch-on"></span> <span className="switch-on"></span>
<span className="switch-off"></span> <span className="switch-off"></span>
</span> </span>
<span className="switch-label m-2"> <span className="switch-label m-2">Pending Actions</span>
Pending
</span>
</label> </label>
</li> </li>
</ul> </ul>
@ -252,7 +253,6 @@ const AttendancePage = () => {
</> </>
)} )}
{activeTab === "logs" && ( {activeTab === "logs" && (
<div className="tab-pane fade show active py-0"> <div className="tab-pane fade show active py-0">
<AttendanceLog <AttendanceLog