From 26191bccfe4b79a93384d39e3c76d0e05ee0be01 Mon Sep 17 00:00:00 2001 From: Umesh Desai Date: Fri, 6 Jun 2025 16:37:44 +0530 Subject: [PATCH] Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. --- .../Activities/ReportTaskComments.jsx | 41 ++- src/components/common/FilterIcon.jsx | 240 ++++++++++++++++++ src/pages/Activities/DailyTask.jsx | 170 ++++++++----- 3 files changed, 373 insertions(+), 78 deletions(-) create mode 100644 src/components/common/FilterIcon.jsx diff --git a/src/components/Activities/ReportTaskComments.jsx b/src/components/Activities/ReportTaskComments.jsx index 9db42b3a..054390e3 100644 --- a/src/components/Activities/ReportTaskComments.jsx +++ b/src/components/Activities/ReportTaskComments.jsx @@ -56,9 +56,9 @@ const ReportTaskComments = ({ commentsData, closeModal }) => { if (!firstRender.current && containerRef.current) { containerRef.current.scrollTop = containerRef.current.scrollHeight; } else { - firstRender.current = false; + firstRender.current = false; } - }, [comments]); + }, [comments]); const onSubmit = async (data) => { let sendComment = { @@ -69,11 +69,11 @@ const ReportTaskComments = ({ commentsData, closeModal }) => { try { setloading(true); const resp = await TasksRepository.taskComments(sendComment); - + setComment((prevItems) => [...prevItems, resp.data]); const taskList = getCachedData("taskList"); - + if (taskList && taskList.data) { const updatedTaskList = taskList.data.map((task) => { if (task.id === resp.data.taskAllocationId) { @@ -87,14 +87,14 @@ const ReportTaskComments = ({ commentsData, closeModal }) => { } return task; }); - + cacheData("taskList", { data: updatedTaskList, - projectId: taskList.projectId, + projectId: taskList.projectId, }); } - reset(); + reset(); setloading(false); showToast("Successfully Sent", "success"); } catch (error) { @@ -134,7 +134,16 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {

- Loaction : + Reported By : + - + {/* {commentsData?.assignedBy?.firstName + + " " + + commentsData?.assignedBy?.lastName} */} + {" "} +

+ +

+ Location : {`${commentsData?.workItem?.workArea?.floor?.building?.name}`}{" "} {" "} @@ -146,11 +155,19 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {

- Planned Work: {commentsData?.plannedTask} + Planned Work: {commentsData?.plannedTask}{" "} + { + commentsData?.workItem?.activityMaster + ?.unitOfMeasurement + }

{" "} - Completed Work : {commentsData?.completedTask} + Completed Work : {commentsData?.completedTask}{" "} + { + commentsData?.workItem?.activityMaster + ?.unitOfMeasurement + }

Team :

@@ -196,12 +213,12 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {