diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx index 32d9e378..2da0cbb4 100644 --- a/src/components/Activities/AttendLogs.jsx +++ b/src/components/Activities/AttendLogs.jsx @@ -84,7 +84,7 @@ const AttendLogs = ({ Id }) => { document.querySelectorAll('[data-bs-toggle="tooltip"]') ); tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); - }, [] ); + }, []); return (
@@ -106,13 +106,12 @@ const AttendLogs = ({ Id }) => { - - - - - - - + + + + + + @@ -127,7 +126,7 @@ const AttendLogs = ({ Id }) => { - - - ))} diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index 6aaee98c..d8ac6830 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -62,7 +62,7 @@ const AttendancePage = () => { modalElement.classList.remove("show"); modalElement.style.display = "none"; document.body.classList.remove("modal-open"); - document.querySelector(".modal-backdrop").remove(); + document.querySelector(".modal-backdrop")?.remove(); } }; @@ -93,11 +93,10 @@ const AttendancePage = () => { }, [modelConfig, isCreateModalOpen]); useEffect(() => { setAttendances(attendance); - }, [ attendance ] ); - + }, [attendance]); useEffect(() => { - if (selectedProject === 1 || selectedProject === undefined ) { + if (selectedProject === 1 || selectedProject === undefined) { dispatch(setProjectId(loginUser?.projects[0])); } }, [selectedProject, loginUser?.projects]); @@ -108,7 +107,7 @@ const AttendancePage = () => { className="modal fade show" style={{ display: "block" }} id="check-Out-modal" - tabindex="-1" + tabIndex="-1" aria-hidden="true" > { task.assignmentDate.includes(date) ).map((task, index) => { const refIndex = index * 10 + i; - console.log(refIndex); return (
DateTimeActivityLocationRecored ByDescriptionDateTimeActivityLocationRecored ByDescription
{log?.latitude != 0 ? ( { "--" )} - {`${logs[0]?.updatedByEmployee?.firstName ?? ''} ${logs[0]?.updatedByEmployee?.lastName ?? ''}`} + + {`${logs[0]?.updatedByEmployee?.firstName ?? ""} ${ + logs[0]?.updatedByEmployee?.lastName ?? "" + }`} + {log?.comment || "--"}