Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory

This commit is contained in:
pramod mahajan 2025-09-11 16:25:49 +05:30
commit 1a04dd51fc

View File

@ -221,10 +221,10 @@ useEffect(() => {
recallEmployeeData(
showInactive,
showAllEmployees ? null : selectedProjectId
); // Use selectedProjectId here
);
}
},
[employees, showInactive, showAllEmployees, selectedProjectId] // Add all relevant dependencies
[employees, showInactive, showAllEmployees, selectedProjectId]
);
useEffect(() => {
@ -259,40 +259,22 @@ useEffect(() => {
/>
</GlobalModel>
)}
{IsDeleteModalOpen && (
<div
className={`modal fade ${IsDeleteModalOpen ? "show" : ""}`}
tabIndex="-1"
role="dialog"
style={{
display: IsDeleteModalOpen ? "block" : "none",
backgroundColor: IsDeleteModalOpen
? "rgba(0,0,0,0.5)"
: "transparent",
}}
aria-hidden="false"
>
<ConfirmModal
type={"delete"}
header={
selectedEmpFordelete?.isActive
? "Suspend Employee"
: "Reactivate Employee"
}
message={`Are you sure you want to ${
selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
} this employee?`}
onSubmit={() =>
{IsDeleteModalOpen && (
<ConfirmModal
isOpen={IsDeleteModalOpen}
type="delete"
header="Suspend Employee"
message="Are you sure you want suspend?"
onSubmit={(id) =>
suspendEmployee({
employeeId: selectedEmpFordelete.id,
employeeId:id ,
active: !selectedEmpFordelete.isActive,
})
}
onClose={() => setIsDeleteModalOpen(false)}
loading={employeeLodaing}
/>
</div>
onClose={() => setIsDeleteModalOpen(false)}
loading={employeeLodaing}
paramData={selectedEmpFordelete.id}
/>
)}
<div className="container-fluid">
@ -665,7 +647,7 @@ useEffect(() => {
<button
className="dropdown-item py-1"
onClick={() =>
handleOpenDelete(item.id)
handleOpenDelete(item)
}
>
<i className="bx bx-task-x bx-sm"></i>{" "}