diff --git a/src/components/Dashboard/ProjectProgressChart.jsx b/src/components/Dashboard/ProjectProgressChart.jsx index e96b8a48..41a3453d 100644 --- a/src/components/Dashboard/ProjectProgressChart.jsx +++ b/src/components/Dashboard/ProjectProgressChart.jsx @@ -2,10 +2,13 @@ import React, { useState } from "react"; import LineChart from "../Charts/LineChart"; import { useProjects } from "../../hooks/useProjects"; import { useDashboard_Data } from "../../hooks/useDashboard_Data"; +import {useSelector} from "react-redux"; -const ProjectProgressChart = () => { +const ProjectProgressChart = () => +{ + const selectedProject = useSelector((store) => store.localVariables.projectId); const { projects } = useProjects(); - const [selectedProjectId, setSelectedProjectId] = useState("all"); + // const [selectedProjectId, setSelectedProjectId] = useState("all"); const [range, setRange] = useState("1W"); const getDaysFromRange = (range) => { @@ -28,7 +31,7 @@ const ProjectProgressChart = () => { const { dashboard_data, loading: isLineChartLoading } = useDashboard_Data({ days, FromDate, - projectId: selectedProjectId === "all" ? null : selectedProjectId, + projectId: selectedProject === " " ? "all" : selectedProject// selectedProjectId === "all" ? null : selectedProjectId, }); const sortedDashboardData = [...dashboard_data].sort( @@ -63,7 +66,7 @@ const ProjectProgressChart = () => {

Progress Overview by Project

-
+ {/*
+
*/} {/* Row 2: Time Range Buttons */}