From 76e88aad88b4351f02d78852fdb3cfb5ccaffb9a Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 12:53:18 +0530 Subject: [PATCH 01/15] removed unused code , console --- src/components/Activities/AttendLogs.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx index b755d891..286856b9 100644 --- a/src/components/Activities/AttendLogs.jsx +++ b/src/components/Activities/AttendLogs.jsx @@ -85,7 +85,6 @@ const AttendLogs = ({ Id }) => { ); tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); }, [] ); - console.log(logs[0]?.updatedByEmployee?.firstName) return (
@@ -143,7 +142,7 @@ const AttendLogs = ({ Id }) => { )} - {`${logs[0]?.updatedByEmployee?.firstName ?? ''} ${logs[0]?.updatedByEmployee?.lastName ?? ''}`} mahajan + {`${logs[0]?.updatedByEmployee?.firstName ?? ''} ${logs[0]?.updatedByEmployee?.lastName ?? ''}`} {log?.comment || "--"} From cf0a0f00b202df851637672584501204d8b0c845 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:22:11 +0530 Subject: [PATCH 02/15] removed unused code --- src/components/Activities/InfraPlanning.jsx | 42 --------------------- 1 file changed, 42 deletions(-) diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx index 084fd562..ef417ded 100644 --- a/src/components/Activities/InfraPlanning.jsx +++ b/src/components/Activities/InfraPlanning.jsx @@ -52,49 +52,7 @@ const InfraPlanning = () => ))}
- {/*
- - - - -
*/}
{project_deatilsLoader && (

Loading...

)} From 9682de08543286a5fbaff9fdad66b2c76eec6c48 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:23:35 +0530 Subject: [PATCH 03/15] customize confirm modal --- src/components/common/ConfirmModal.jsx | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/components/common/ConfirmModal.jsx b/src/components/common/ConfirmModal.jsx index 0a26ece8..04e39cc4 100644 --- a/src/components/common/ConfirmModal.jsx +++ b/src/components/common/ConfirmModal.jsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; -const ConfirmModal = ({ type, onSubmit, onClose, message, loading }) => { +const ConfirmModal = ({ type, onSubmit, onClose, message, loading ,header}) => { const TypeofIcon = (type) => { switch (type) { case "delete": - return ; + return ; default: return null; } @@ -34,9 +34,15 @@ const ConfirmModal = ({ type, onSubmit, onClose, message, loading }) => { aria-label="Close" onClick={onClose} /> -
-

{TypeofIcon(type)} {message}

-
+
+ + + {header && < strong className='mb-0 font-weight-bold'>{header }} +
+
{TypeofIcon(type)}
+
+ {message} +
+
+
+ +
From cc1c378a3de159483baf87e437d806fce5d345de Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:27:19 +0530 Subject: [PATCH 04/15] changed class to className --- src/components/master/CreateActivity.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/master/CreateActivity.jsx b/src/components/master/CreateActivity.jsx index 841ef3a6..b9958280 100644 --- a/src/components/master/CreateActivity.jsx +++ b/src/components/master/CreateActivity.jsx @@ -204,7 +204,7 @@ const CreateActivity = ({ onClose }) => { onClick={() => removeChecklistItem(index)} className="btn btn-xs btn-icon btn-text-secondary" > - @@ -219,7 +219,7 @@ const CreateActivity = ({ onClose }) => { className="btn btn-xs btn-primary mt-2" onClick={addChecklistItem} > - From 7c81c87f1801f3a396e658cb445c1b249ac043e7 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:32:34 +0530 Subject: [PATCH 05/15] removed unused code --- src/components/Project/Infrastructure/FloorModel.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Project/Infrastructure/FloorModel.jsx b/src/components/Project/Infrastructure/FloorModel.jsx index 199e263b..e10aa511 100644 --- a/src/components/Project/Infrastructure/FloorModel.jsx +++ b/src/components/Project/Infrastructure/FloorModel.jsx @@ -205,7 +205,7 @@ const FloorModel = ({ {formData.buildingId !== "0" && (
-
@@ -37,7 +37,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => { Work Area:  {" "} - + {workArea.areaName}
From e5f6ac23ef745cd21db74d40750c2a2f5341fb4a Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:38:01 +0530 Subject: [PATCH 08/15] removed console and unused code --- .../Project/Infrastructure/WorkItem.jsx | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx index b353987b..90383e14 100644 --- a/src/components/Project/Infrastructure/WorkItem.jsx +++ b/src/components/Project/Infrastructure/WorkItem.jsx @@ -4,12 +4,12 @@ import { useParams } from "react-router-dom"; import EditActivityModal from "./EditActivityModal"; import { useHasUserPermission } from "../../../hooks/useHasUserPermission"; import { MANAGE_PROJECT_INFRA, MANAGE_TASK } from "../../../utils/constants"; -import DleleteActivity from "./DleleteActivity"; + import ConfirmModal from "../../common/ConfirmModal"; import ProjectRepository from '../../../repositories/ProjectRepository' import {useProjectDetails} from '../../../hooks/useProjects' import showToast from "../../../services/toastService"; -import {cacheData} from "../../../slices/apiDataManager"; +import {cacheData, getCachedData} from "../../../slices/apiDataManager"; import {useDispatch} from "react-redux"; import {refreshData} from "../../../slices/localVariablesSlice"; @@ -23,9 +23,10 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => { const ManageTasks = useHasUserPermission(MANAGE_TASK); const ManageInfra = useHasUserPermission( MANAGE_PROJECT_INFRA ); const [ loadingDelete, setLoadingDelete ] = useState( false ) + const project = getCachedData("projectInfo"); const dispatch = useDispatch() - const {projects_Details} = useProjectDetails(projectId) + const {projects_Details} = useProjectDetails(projectId || project?.projectId) const openModal = () => setIsModalOpen(true); const closeModal = () => setIsModalOpen(false); @@ -63,7 +64,6 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => { const showModalDelete = () => setShowModal2(true); const closeModalDelete = () => setShowModal2( false ); -console.log(workItem) const handleSubmit = async() => { setLoadingDelete(true); @@ -102,28 +102,26 @@ console.log(workItem) : building ), }; - - console.log(newProject) + cacheData("projectInfo", { projectId: newProject.id, data: newProject, }); dispatch( refreshData( true ) ); - + closeModalDelete() setLoadingDelete(false) - showToast("Activity Updated Successfully","success") - - + showToast("Activity Deleted Successfully","success") } catch ( error ) { - setLoadingDelete(false) + setLoadingDelete( false ) + closeModalDelete() const message = error.response?.data?.message || error.message || "An unexpected error occurred"; showToast( message, "error" ); - console.log(error) + } }; return ( @@ -156,6 +154,7 @@ console.log(workItem) /> } + {showModal2 &&
- {/* */} - +
} From e0994c6f43ce2223dc7271b407d888234f91622b Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:40:04 +0530 Subject: [PATCH 09/15] deleted this component. no more used --- .../Infrastructure/DleleteActivity.jsx | 104 ------------------ 1 file changed, 104 deletions(-) delete mode 100644 src/components/Project/Infrastructure/DleleteActivity.jsx diff --git a/src/components/Project/Infrastructure/DleleteActivity.jsx b/src/components/Project/Infrastructure/DleleteActivity.jsx deleted file mode 100644 index efdc32b7..00000000 --- a/src/components/Project/Infrastructure/DleleteActivity.jsx +++ /dev/null @@ -1,104 +0,0 @@ -import React, {useState} from 'react' -import ProjectRepository from '../../../repositories/ProjectRepository' -import {useProjectDetails} from '../../../hooks/useProjects' - -const DleleteActivity = ( {workItem, workArea, building, floor, onClose} ) => -{ - const {projects_Details, refetch} = useProjectDetails() - const [loading,setLoading] = useState(false) - - - const handleDeleteActivity =async () => - { - try - { - setLoading(false) - const updatedProject = { ...projects_Details }; - const response = await ProjectRepository.deleteProjectTask( workItem.workItemId ); - const newProject = { - ...updatedProject, - buildings: updatedProject.buildings.map((building) => - building.id === building.buildingID - ? { - ...building, - floors: building.floors.map((floor) => - floor.id === building.floorId - ? { - ...floor, - workAreas: floor.workAreas.map((workArea) => - workArea.id === workItem?.workAreaId - ? { - ...workArea, - workItems: (() => { - const exists = workArea.workItems.some( - (item) => - String( - item?.workItem?.id ?? item?.id - ) === String(finalData.id) - ); - - finalUpdatedWorkItem = workItem; - - return exists - ? workArea.workItems.map((item) => - String( - item?.workItem?.id ?? item?.id - ) === String(finalData.id) - ? workItem - : item - ) - : [...workArea.workItems, workItem]; - })(), - } - : workArea - ), - } - : floor - ), - } - : building - ), - }; - cacheData("projectInfo", { - projectId: newProject.id, - data: newProject, - }); - resetForm(); - dispatch( refreshData( true ) ); - setLoading(false) - showToast("Activity Updated Successfully","success") - - onClose(); - } catch ( error ) - { - console.log(error) - } - } - return ( -
-
-
-
-
- - -
-
-
-
-
- - - ) -} - -export default DleleteActivity \ No newline at end of file From f3bedf5826e3644168992acbbf62aa72a4bc67d9 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:41:25 +0530 Subject: [PATCH 10/15] handled console error --- src/pages/Activities/AttendancePage.jsx | 4 ++-- src/pages/Activities/TaskPlannng.jsx | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index 6aaee98c..0694e399 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(); } }; @@ -108,7 +108,7 @@ const AttendancePage = () => { className="modal fade show" style={{ display: "block" }} id="check-Out-modal" - tabindex="-1" + tabIndex="-1" aria-hidden="true" > { const { profile } = useProfile(); @@ -22,6 +23,7 @@ const TaskPlannng = () => { (store) => store.localVariables.projectId ); + const [project, setProject] = useState(null); const [projectDetails, setProjectDetails] = useState(null); const [activities, setActivities] = useState(null); @@ -66,14 +68,22 @@ const TaskPlannng = () => { }); }) .catch((error) => { - console.error(error); - setError("Failed to fetch data."); + const message = + error.response?.data?.message || + error.message || + "An unexpected error occurred"; + showToast( message, "error" ); }); } else { setProjectDetails(project_cache); } } catch (err) { - setError("Failed to fetch data."); + setError( "Failed to fetch data." ); + const message = + error.response?.data?.message || + error.message || + "An unexpected error occurred"; + showToast( message, "error" ); } finally { setLoading(false); } From 7c7b5a9be77e4970ed37c89c3bcceecd8f962f10 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:42:19 +0530 Subject: [PATCH 11/15] changed class to className --- src/pages/master/MasterTable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx index b39d0472..efb72057 100644 --- a/src/pages/master/MasterTable.jsx +++ b/src/pages/master/MasterTable.jsx @@ -83,7 +83,7 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => { currentItems.map((item, index) => ( - + {updatedColumns.map((col) => ( From 620bf064c99d99e1a53e4bb2cffc402aad1e2569 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 16:58:54 +0530 Subject: [PATCH 12/15] changed class to className --- src/components/Activities/AttendLogs.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx index 286856b9..43a38907 100644 --- a/src/components/Activities/AttendLogs.jsx +++ b/src/components/Activities/AttendLogs.jsx @@ -127,7 +127,7 @@ const AttendLogs = ({ Id }) => { {log?.latitude != 0 ? ( Date: Wed, 7 May 2025 17:14:30 +0530 Subject: [PATCH 13/15] removed directory menu --- src/data/menuData.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/data/menuData.json b/src/data/menuData.json index 3995459b..1d362b68 100644 --- a/src/data/menuData.json +++ b/src/data/menuData.json @@ -24,11 +24,7 @@ "available": true, "link": "/employees" }, - { - "text": "Directory", - "available": true, - "link": "/directory" - }, + { "text": "Project Status", "available": true, From 71bb1c25dd32ee49213c9debb52f9a75f480ed6e Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 17:18:57 +0530 Subject: [PATCH 14/15] changed position of header --- src/components/common/ConfirmModal.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/common/ConfirmModal.jsx b/src/components/common/ConfirmModal.jsx index 04e39cc4..a92cf3af 100644 --- a/src/components/common/ConfirmModal.jsx +++ b/src/components/common/ConfirmModal.jsx @@ -28,16 +28,19 @@ const ConfirmModal = ({ type, onSubmit, onClose, message, loading ,header}) => {
+ +
+ +
+ {header && < strong className='mb-0 font-weight-bold'>{header }}
From 15988424368d1323f78370d7d4da699b72ebaab1 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 7 May 2025 17:19:41 +0530 Subject: [PATCH 15/15] modified delete modal msg --- src/components/Project/Infrastructure/WorkItem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx index 90383e14..140eb671 100644 --- a/src/components/Project/Infrastructure/WorkItem.jsx +++ b/src/components/Project/Infrastructure/WorkItem.jsx @@ -162,7 +162,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => { style={{ display: showModal2 ? "block" : "none" }} aria-hidden='false' > - +
}