diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index 29e3e755..8a702cd5 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -8,7 +8,7 @@ import { useDashboardTeamsCardData, useDashboardTasksCardData, } from "../../hooks/useDashboard_Data"; -import ProjectCompletionChart from "./ProjectCompletionChart"; +import TasksCard from "./Tasks"; const Dashboard = () => { const { projects, loading } = useProjects(); @@ -56,6 +56,15 @@ const Dashboard = () => { (a, b) => new Date(a.date) - new Date(b.date) ); + // Bar chart logic + const projectNames = projects?.map((p) => p.name) || []; + const projectProgress = + projects?.map((p) => { + const completed = p.completedWork || 0; + const planned = p.plannedWork || 1; + const percent = (completed / planned) * 100; + return Math.min(Math.round(percent), 100); + }) || []; // Line chart data const lineChartSeries = [ @@ -137,33 +146,27 @@ const Dashboard = () => { {/* Tasks Card */} -
-
-
-
- Tasks -
-
-
-
-

- {tasksCardData.totalTasks?.toLocaleString()} -

- Total -
-
-

- {tasksCardData.completedTasks?.toLocaleString()} -

- Completed -
-
-
+
+ {/* Use the TasksCard component */}
{/* Bar Chart */} -
- +
+
+
+
+
Projects
+

Projects Completion Status

+
+
+
+ +
+
{/* Line Chart */} diff --git a/src/components/Dashboard/Tasks.jsx b/src/components/Dashboard/Tasks.jsx new file mode 100644 index 00000000..fa924036 --- /dev/null +++ b/src/components/Dashboard/Tasks.jsx @@ -0,0 +1,32 @@ +import React from "react"; +import { useDashboardTasksCardData } from "../../hooks/useDashboard_Data"; + +const TasksCard = () => { + const { tasksCardData } = useDashboardTasksCardData(); + + return ( +
+
+
+ Tasks +
+
+
+
+

+ {tasksCardData.totalTasks?.toLocaleString()} +

+ Total +
+
+

+ {tasksCardData.completedTasks?.toLocaleString()} +

+ Completed +
+
+
+ ); +}; + +export default TasksCard; \ No newline at end of file