diff --git a/backend/users/views.py b/backend/users/views.py index 7446d7b..9470dc9 100644 --- a/backend/users/views.py +++ b/backend/users/views.py @@ -63,7 +63,7 @@ class CustomUserProfileUpdate(APIView): return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - + class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin): queryset = CustomUser.objects.all() permission_classes = (IsAuthenticated,) @@ -72,4 +72,4 @@ class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin) def retrieve(self, request, *args, **kwargs): serializer = self.get_serializer(request.user) return Response(serializer.data) - \ No newline at end of file + diff --git a/frontend/src/components/dashboard/dashboard.jsx b/frontend/src/components/dashboard/dashboard.jsx index 005f98a..74b4ac8 100644 --- a/frontend/src/components/dashboard/dashboard.jsx +++ b/frontend/src/components/dashboard/dashboard.jsx @@ -28,6 +28,7 @@ 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); @@ -36,19 +37,16 @@ export function Dashboard() { const response = await axiosInstance.get("/dashboard/todostats/"); const totalTaskValue = response.data.total_tasks || 0; const totalCompletedTasksValue = response.data.total_completed_tasks || 0; + const totalTaskTodayValue = response.data.total_task_today || 0; 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; + response.data.tasks_completed_today || 0; const overdueTasks = response.data.overdue_tasks || 0; - - const progress = - (totalCompletedTasksToday / totalCompletedTasksToday) * 100; + const progress = (totalCompletedTasksToday / totalTaskToday) * 100; setTotalTask(totalTaskValue); settotalCompletedTasks(totalCompletedTasksValue); setTotalCompletedTasksToday(totalCompletedTasksTodayValue); - setTotalTaskToday(totalTaskToday); + setTotalTaskToday(totalTaskTodayValue); setProgressData(progress); setOverdueTask(overdueTasks); }; @@ -147,7 +145,11 @@ export function Dashboard() { setFullName(e.target.value)} + onChange={(e) => setFirstName(e.target.value)} />