From 7ac3268514f58c541b5d6058edd5a11e0096bf9f Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Fri, 26 Sep 2025 12:15:12 +0530 Subject: [PATCH] =?UTF-8?q?Add=20an=20info=20(=E2=84=B9=EF=B8=8F)=20icon?= =?UTF-8?q?=20to=20the=20Daily=20Progress=20Report=E2=80=99s=20Total=20Pen?= =?UTF-8?q?ding=20Task?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyProgressRport/TaskReportList.jsx | 29 ++++++++++++------- src/components/common/HoverPopup.jsx | 4 +-- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/components/DailyProgressRport/TaskReportList.jsx b/src/components/DailyProgressRport/TaskReportList.jsx index 254b1ddf..c46e07ae 100644 --- a/src/components/DailyProgressRport/TaskReportList.jsx +++ b/src/components/DailyProgressRport/TaskReportList.jsx @@ -40,7 +40,7 @@ const TaskReportList = () => { service ); -const ProgrssReportColumn = [ + const ProgrssReportColumn = [ { key: "activity", label: "Activity", @@ -149,20 +149,19 @@ const ProgrssReportColumn = [ data-bs-content={`
${task.teamMembers - .map( - (m) => ` + .map( + (m) => `
- ${m?.firstName?.charAt(0) || ""}${ - m?.lastName?.charAt(0) || "" + ${m?.firstName?.charAt(0) || ""}${m?.lastName?.charAt(0) || "" }
${m.firstName} ${m.lastName}
` - ) - .join("")} + ) + .join("")}
`} > @@ -194,17 +193,27 @@ const ProgrssReportColumn = [ if (isError) return
Loading....
; return (
- +
- +
ActivityTotal Pending + + Total Pending{" "} + This shows the total pending tasks for each activity on that date.

} + > + +
+
+
Reported/Planned{" "} This shows the reported versus planned tasks for each activity. on that Date

} + content={

This shows the reported versus planned tasks for each activity on that date.

} >
diff --git a/src/components/common/HoverPopup.jsx b/src/components/common/HoverPopup.jsx index ddf0a062..d65f365e 100644 --- a/src/components/common/HoverPopup.jsx +++ b/src/components/common/HoverPopup.jsx @@ -53,8 +53,8 @@ const HoverPopup = ({ title, content, children }) => { marginTop: "8px", }} > - {title &&
{title}
} -
{content}
+ {title &&
{title}
} +
{content}
)}