diff --git a/frontend/src/components/dashboard/dashboard.jsx b/frontend/src/components/dashboard/dashboard.jsx index 9e77163..1901ebb 100644 --- a/frontend/src/components/dashboard/dashboard.jsx +++ b/frontend/src/components/dashboard/dashboard.jsx @@ -10,6 +10,8 @@ import { Title, Legend, Metric, + ProgressCircle, + Flex, } from "@tremor/react"; import { KpiCard } from "./KpiCard"; import { BarChartGraph } from "./Barchart"; @@ -26,7 +28,8 @@ export function Dashboard() { const [totalTask, setTotalTask] = useState(0); const [totalCompletedTasks, settotalCompletedTasks] = useState(0); const [totalCompletedTasksToday, setTotalCompletedTasksToday] = useState(0); - const [totalTaskToday, setTotalTaskToday] = useState(0); + const [progressData, setProgressData] = useState(0); + const [overdueTask, setOverdueTask] = useState(0); useEffect(() => { const fetchData = async () => { @@ -36,11 +39,18 @@ export function Dashboard() { const totalCompletedTasksTodayValue = response.data.total_completed_tasks_today || 0; const totalTaskToday = response.data.total_task_today || 0; + const totalCompletedTasksToday = response.data.tasks_completed_today || 0; + const overdueTasks = response.data.overdue_tasks || 0; + + const progress = + (totalCompletedTasksToday / totalCompletedTasksToday) * 100; setTotalTask(totalTaskValue); settotalCompletedTasks(totalCompletedTasksValue); setTotalCompletedTasksToday(totalCompletedTasksTodayValue); setTotalTaskToday(totalTaskToday); + setProgressData(progress); + setOverdueTask(overdueTasks); }; fetchData(); @@ -73,7 +83,7 @@ export function Dashboard() { @@ -89,6 +99,7 @@ export function Dashboard() { + Overview - Task completed today - {totalCompletedTasksToday} + Overdue tasks + {overdueTask} +

{/*Pie chart graph*/} -
- - Tasks - -
+ + Overall completion rate + +
+ +
+ {/*Progress circle graph*/} + + + Today's progress +
+ + + + {progressData.toFixed(0)} % + + +

-
-
+ categories={["Completed Tasks"]} + colors={["rose"]} + > + +