Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory
This commit is contained in:
commit
1a04dd51fc
@ -221,10 +221,10 @@ useEffect(() => {
|
|||||||
recallEmployeeData(
|
recallEmployeeData(
|
||||||
showInactive,
|
showInactive,
|
||||||
showAllEmployees ? null : selectedProjectId
|
showAllEmployees ? null : selectedProjectId
|
||||||
); // Use selectedProjectId here
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[employees, showInactive, showAllEmployees, selectedProjectId] // Add all relevant dependencies
|
[employees, showInactive, showAllEmployees, selectedProjectId]
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -247,7 +247,7 @@ useEffect(() => {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{showModal && (
|
{showModal && (
|
||||||
<GlobalModel
|
<GlobalModel
|
||||||
isOpen={showModal}
|
isOpen={showModal}
|
||||||
size="lg"
|
size="lg"
|
||||||
closeModal={() => setShowModal(false)}
|
closeModal={() => setShowModal(false)}
|
||||||
@ -259,40 +259,22 @@ useEffect(() => {
|
|||||||
/>
|
/>
|
||||||
</GlobalModel>
|
</GlobalModel>
|
||||||
)}
|
)}
|
||||||
|
{IsDeleteModalOpen && (
|
||||||
{IsDeleteModalOpen && (
|
<ConfirmModal
|
||||||
<div
|
isOpen={IsDeleteModalOpen}
|
||||||
className={`modal fade ${IsDeleteModalOpen ? "show" : ""}`}
|
type="delete"
|
||||||
tabIndex="-1"
|
header="Suspend Employee"
|
||||||
role="dialog"
|
message="Are you sure you want suspend?"
|
||||||
style={{
|
onSubmit={(id) =>
|
||||||
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={() =>
|
|
||||||
suspendEmployee({
|
suspendEmployee({
|
||||||
employeeId: selectedEmpFordelete.id,
|
employeeId:id ,
|
||||||
active: !selectedEmpFordelete.isActive,
|
active: !selectedEmpFordelete.isActive,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
onClose={() => setIsDeleteModalOpen(false)}
|
onClose={() => setIsDeleteModalOpen(false)}
|
||||||
loading={employeeLodaing}
|
loading={employeeLodaing}
|
||||||
/>
|
paramData={selectedEmpFordelete.id}
|
||||||
</div>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="container-fluid">
|
<div className="container-fluid">
|
||||||
@ -665,7 +647,7 @@ useEffect(() => {
|
|||||||
<button
|
<button
|
||||||
className="dropdown-item py-1"
|
className="dropdown-item py-1"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
handleOpenDelete(item.id)
|
handleOpenDelete(item)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-task-x bx-sm"></i>{" "}
|
<i className="bx bx-task-x bx-sm"></i>{" "}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user