Merge pull request #4981 from OneCommunityGlobal/Diya_Fix_PeopleReportUI

Diya 🔥 Fixed People Report UI

Author: one-community

src/components/Reports/PeopleReport/selectors.jsx

@@ -39,32 +39,36 @@ export const peopleTasksPieChartViewData = (state) => {
   const completedUserEntries = allUserEntries.filter(e => e.isActive === true);
 
   const projectHours = {};
+  const projectNames = {};
+
   allUserEntries.forEach(entry => {
-    const { projectId } = entry;
-    if (!projectId) return;
+    const { projectId, taskId, projectName } = entry;
+    if (!projectId || taskId) return;
     const time = (entry.hours || 0) + (entry.minutes || 0) / 60;
     projectHours[projectId] = (projectHours[projectId] || 0) + time;
+    if (projectName) projectNames[projectId] = projectName;
+  });
+
+  const hoursLoggedToProjectsOnly = Object.entries(projectHours).map(([projectId, totalTime]) => {
+    const project = (userProjects?.projects || []).find(p => p.projectId === projectId);
+    return {
+      projectId,
+      projectName: project?.projectName || projectNames[projectId] || `Unknown (${projectId.slice(-6)})`,
+      totalTime,
+    };
   });
 
-  const hoursLoggedToProjectsOnly = (userProjects?.projects || []).map(project => ({
-    projectId: project.projectId,
-    projectName: project.projectName,
-    totalTime: projectHours[project.projectId] || 0,
-  }));
+  const userTasks = state.userTask?.tasks || [];
 
   const taskHours = {};
-  completedUserEntries.forEach(entry => {
+  allUserEntries.forEach(entry => {
     if (entry.taskId == null) return;
     const taskKey = entry.taskId;
-    const taskName = entry.taskName || 'Unnamed Task';
+    const taskName = entry.taskName || `Task in "${entry.projectName || 'Unknown Project'}"`;
     const time = (entry.hours || 0) + (entry.minutes || 0) / 60;
 
     if (!taskHours[taskKey]) {
-      taskHours[taskKey] = {
-        totalTime: 0,
-        projectId: entry.projectId,
-        taskName,
-      };
+      taskHours[taskKey] = { totalTime: 0, projectId: entry.projectId, taskName };
     }
     taskHours[taskKey].totalTime += time;
   });

src/components/common/PieChart/ProjectPieChart.jsx

@@ -68,7 +68,7 @@ function CenterLabel({ viewBox, total, darkMode, showPct, onToggle }) {
         >
           <label className={styles['switch']}>
             {/* Accessible text for the label */}
-            <span className={styles['sr-only']}>Show percentage</span>
+            {/* <span className={styles['sr-only']}>Show percentage</span> */}
 
             {/* The control associated with the label */}
             <input