From 6f614334a8d4bcaa0e0f0f39977755da20169138 Mon Sep 17 00:00:00 2001 From: Vikas Nale Date: Mon, 7 Jul 2025 11:39:07 +0530 Subject: [PATCH] modify content layout in project overview widget --- src/components/Project/ProjectOverview.jsx | 135 ++++++++++++--------- 1 file changed, 81 insertions(+), 54 deletions(-) diff --git a/src/components/Project/ProjectOverview.jsx b/src/components/Project/ProjectOverview.jsx index 3d05dbd2..512aeedc 100644 --- a/src/components/Project/ProjectOverview.jsx +++ b/src/components/Project/ProjectOverview.jsx @@ -1,5 +1,6 @@ import React from "react"; import { useEffect, useState } from "react"; +import { useSelector } from "react-redux"; import { useEmployeesByProjectAllocated, @@ -10,12 +11,20 @@ import Chart from "react-apexcharts"; const ProjectOverview = ({ project }) => { const { projects } = useProjects(); + const [current_project, setCurrentProject] = useState( + projects.find((pro) => pro.id == project) + ); + + const selectedProject = useSelector( + (store) => store.localVariables.projectId + ); + const getProgressInPercentage = (planned, completed) => { if (completed && planned) return (completed * 100) / planned; else return 0; }; - const project_detail = projects.find((pro) => pro.id == project); + //let project_detail = projects.find((pro) => pro.id == project); // Utility function to check if a number has a decimal part const hasDecimal = (num) => { @@ -135,14 +144,27 @@ const ProjectOverview = ({ project }) => { const radialBarOptions = getRadialBarOptions(radialPercentage); useEffect(() => { - if (project_detail) { + if (current_project) { let val = getProgressInPercentage( - project_detail.plannedWork, - project_detail.completedWork + current_project.plannedWork, + current_project.completedWork ); setRadialPercentage(val); } else setRadialPercentage(0); - }, [project_detail]); + }, [current_project]); + + useEffect(() => { + setCurrentProject(projects.find((pro) => pro.id == selectedProject)); + + console.log(selectedProject); + if (current_project) { + let val = getProgressInPercentage( + current_project.plannedWork, + current_project.completedWork + ); + setRadialPercentage(val); + } else setRadialPercentage(0); + }, [selectedProject]); return (
@@ -154,56 +176,61 @@ const ProjectOverview = ({ project }) => {
-