fix conflict

OneCommunityGlobal · Feb 2, 2025 · 9cdc978 · 9cdc978
1 parent 4be9f9a
commit 9cdc978
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 226 deletions.
diff --git a/src/components/Reports/BadgeSummaryViz.jsx b/src/components/Reports/BadgeSummaryViz.jsx
@@ -52,7 +52,6 @@ function BadgeSummaryViz({ authId, userId, badges, dashboard }) {
         setSortedBadges([]);
       }
     } catch (error) {
-      console.error("Error sorting badges:", error);
       setSortedBadges([]);
     }
   }, [badges]);
@@ -198,7 +197,7 @@ function BadgeSummaryViz({ authId, userId, badges, dashboard }) {
                               />
                             )}
                           </td>
-                          // ... rest of the code
+                          {/* ... rest of the code */}
                           <UncontrolledPopover trigger="hover" target={`popover_${value._id}`}>
                             <Card className="text-center">
                               <CardImg className="badge_image_lg" src={value?.badge?.imageUrl} />

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -301,12 +301,12 @@ class PeopleReport extends Component {
     }
 
     // eslint-disable-next-line react/no-unstable-nested-components,no-unused-vars
-    const UserProject = props => {
+    function UserProject(props) {
       const userProjectList = [];
       return <div>{userProjectList}</div>;
-    };
+    }
     // eslint-disable-next-line react/no-unstable-nested-components
-    const Infringements = props => {
+    function Infringements(props) {
       const dict = {};
 
       // aggregate infringements
@@ -340,10 +340,10 @@ class PeopleReport extends Component {
           <div />
         </div>
       );
-    };
+    }
 
     // eslint-disable-next-line react/no-unstable-nested-components,no-unused-vars
-    const PeopleDataTable = props => {
+    function PeopleDataTable(props) {
       const peopleData = {
         alertVisible: false,
         taskData: [],
@@ -425,7 +425,7 @@ class PeopleReport extends Component {
           darkMode={darkMode}
         />
       );
-    };
+    }
 
     const renderProfileInfo = () => {
       const { isRehireable, bioStatus, authRole } = this.state;

diff --git a/src/components/Reports/ProjectReport/PiechartByProject/PieChartByProject.jsx b/src/components/Reports/ProjectReport/PiechartByProject/PieChartByProject.jsx
@@ -23,6 +23,14 @@ export function PieChartByProject({
   const [globalInactiveHours, setGlobalInactiveHours] = useState(0);
   const [globalactiveHours, setGlobalActiveHours] = useState(0);
 
+  const noDataPlaceholder = [{
+    name: "No Data",
+    value: 1/1000,
+    projectName,
+    totalHoursCalculated: totalHours,
+    lastName: ""
+  }];
+
   useEffect(() => {
     const totalHoursCalculated = mergedProjectUsersArray.reduce((acc, curr) => {
       return ((acc + curr.totalSeconds));
@@ -125,13 +133,79 @@ export function PieChartByProject({
     }
   };
 
-  const noDataPlaceholder = [{
-    name: "No Data",
-    value: 1/1000,
-    projectName: projectName,
-    totalHoursCalculated: totalHours,
-    lastName: ""
-  }];
+  useEffect(() => {
+    const totalHoursCalculated = mergedProjectUsersArray.reduce((acc, curr) => {
+      return ((acc + curr.totalSeconds));
+    }, 0) / 3600;
+    setTotalHours(totalHoursCalculated);
+    const activeUsers = mergedProjectUsersArray.filter(member => member.personId.isActive )
+    setActiveData(activeUsers);
+
+    const arrData = mergedProjectUsersArray.map(member => {
+      const data = {
+        name: `${member.personId.firstName}`,
+        value: member.totalSeconds/3600,
+        projectName,
+        totalHoursCalculated,
+        lastName: member.personId.lastName
+      }
+      return data
+    });
+
+
+    if (showMembers === false) {
+      const inactiveUsers = mergedProjectUsersArray.filter(member => !member.personId.isActive )
+      setInactiveData(inactiveUsers);
+
+      if (inactiveUsers.length ===0) {
+        setUserData(noDataPlaceholder)
+      }
+      else {
+        const totalHoursInactive = inactiveUsers.reduce((acc, curr) => {
+          return ((acc + curr.totalSeconds));
+        }, 0) / 3600;
+        setGlobalInactiveHours(totalHoursInactive);
+
+        const inactiveArr = inactiveData.map(member => {
+          const data = {
+            name: `${member.personId.firstName}`,
+            value: member.totalSeconds/3600,
+            projectName,
+            totalHoursCalculated: totalHoursInactive,
+            lastName: member.personId.lastName
+          }
+          return data;
+        });
+        const sortedArr = inactiveArr.sort((a, b) => (a.name).localeCompare(b.name))
+        setUserData(sortedArr)
+      }
+    } else    if (showMembers === true) {
+      const au = mergedProjectUsersArray.filter(member => member.personId.isActive )
+      setActiveData(au);
+
+      const totalHoursActive = activeUsers.reduce((acc, curr) => {
+        return ((acc + curr.totalSeconds));
+      }, 0) / 3600;
+      setGlobalActiveHours(totalHoursActive);
+
+      const activeArr = activeData.map(member => {
+        const data = {
+          name: `${member.personId.firstName}`,
+          value: member.totalSeconds/3600,
+          projectName,
+          totalHoursCalculated: totalHoursActive,
+          lastName: member.personId.lastName
+        }
+        return data;
+      });
+      const sortedArr = activeArr.sort((a, b) => (a.name).localeCompare(b.name))
+      setUserData(sortedArr)
+    } else {
+      const sortedArr = arrData.sort((a, b) => (a.name).localeCompare(b.name))
+      setUserData(sortedArr)
+    }
+
+  }, [mergedProjectUsersArray,showMembers])
 
   return (
     <div className={`${darkMode ? 'text-light' : ''} w-100`}>

diff --git a/src/components/Reports/ProjectReport/ProjectPieChart/ProjectPieChart.jsx b/src/components/Reports/ProjectReport/ProjectPieChart/ProjectPieChart.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { PieChart, Pie, Sector, ResponsiveContainer, LabelList} from 'recharts';
 import TwoWayToggleSwitch from '../../../common/TwoWayToggleSwitch/TwoWayToggleSwitch';
 import './ProjectPieChart.css';
@@ -19,8 +19,6 @@ const renderActiveShape = (props, darkMode, showAllValues, accumulatedValues) =>
   const { cx, cy, midAngle, innerRadius, outerRadius, startAngle, endAngle, fill, payload, percent, value } = props;
   const sin = Math.sin(-RADIAN * midAngle);
   const cos = Math.cos(-RADIAN * midAngle);
-  const sx = cx + (outerRadius + 10) * cos;
-  const sy = cy + (outerRadius + 10) * sin;
   const mx = cx + (outerRadius + 30) * cos;
   const my = cy + (outerRadius + 30) * sin;
   const ex = mx + (cos >= 0 ? 1 : -1) * 22;
@@ -99,11 +97,11 @@ export function ProjectPieChart  ({ userData, windowSize, darkMode }) {
           const newAccumulatedValues = newIndices.reduce((acc, i) => acc + userData[i].value, 0);
           setAccumulatedValues(newAccumulatedValues);
           return newIndices;
-        } else {
+        } 
           const newAccumulatedValues = accumulatedValues + userData[index].value;
           setAccumulatedValues(newAccumulatedValues);
           return [...prevIndices, index];
-        }
+
       });
     } else {
       setActiveIndices([index]);
@@ -145,6 +143,7 @@ export function ProjectPieChart  ({ userData, windowSize, darkMode }) {
                 position="outside"
                 fill={darkMode ? 'white' : '#333'}
                 color={darkMode ? "white" : "black"}
+                // eslint-disable-next-line react/no-unstable-nested-components
                 content={(props) => {
                   const { cx, cy, value, index, viewBox} = props;
                   const entry = userData[index];

diff --git a/src/components/Reports/Reports.jsx b/src/components/Reports/Reports.jsx
@@ -703,7 +703,7 @@ class ReportsPage extends Component {
               <TotalProjectReport
               startDate={this.state.startDate}
               endDate={this.state.endDate}
-              userProfiles={userProfiles}
+              userProfiles={userProfilesBasicInfo}
               projects={projects}
               darkMode={darkMode}
             />

diff --git a/src/components/Reports/TasksDetail/TasksDetail.jsx b/src/components/Reports/TasksDetail/TasksDetail.jsx
@@ -32,26 +32,6 @@ function ShowCollapse(props) {
         </>
       )}
       {}
-      <Button onClick={() => setOpen(!open)} aria-expanded={open} size="sm">
-        {open ? 'Show less' : `Show more (${props.resources.length})`} ➤
-      <div>
-        {props.resources[0].name}
-        {props.resources.length > 1 && ','}
-      </div>
-      {}
-      {open && (
-        <>
-          {props.resources.slice(1).map((resource, index) => (
-            <Collapse in={open} key={resource._id}>
-              <div>
-                {resource.name}
-                {index < props.resources.length - 2 && ','}
-              </div>
-            </Collapse>
-          ))}
-        </>
-      )}
-      {}
       <Button onClick={() => setOpen(!open)} aria-expanded={open} size="sm">
         {open ? 'Show less' : `Show more (${props.resources.length})`} ➤
       </Button>
@@ -112,10 +92,10 @@ export function TasksDetail(props) {
       </td>
       <td className="tasks-detail-center-cells">
   {task.resources.length <= 2 ? (
-    task.resources.map((resource, index) => (
+    task.resources.map((resource, innerIndex) => (
       <span key={resource._id}>
         {resource.name}
-        {index < task.resources.length - 1 && ', '}
+        {innerIndex < task.resources.length - 1 && ', '}
       </span>
     ))
   ) : (