From 778594ab9a83db1dea3816c5d73412a54f49ea6b Mon Sep 17 00:00:00 2001 From: Chaiyawut Thengket Date: Sat, 25 Nov 2023 15:17:09 +0700 Subject: [PATCH] add total_tasks_today --- backend/dashboard/views.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/dashboard/views.py b/backend/dashboard/views.py index 0f191ab..b6fd552 100644 --- a/backend/dashboard/views.py +++ b/backend/dashboard/views.py @@ -74,10 +74,20 @@ class DashboardStatsTodoViewSet(viewsets.GenericViewSet, mixins.ListModelMixin): total_tasks = Todo.objects.filter(user=user).count() + today_start = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0) + today_end = timezone.now().replace(hour=23, minute=59, second=59, microsecond=999999) + tasks_completed_today = Todo.objects.filter( user=user, completed=True, - completion_date__gte=timezone.now().replace(hour=0, minute=0, second=0, microsecond=0) + completion_date__gte=today_start, + completion_date__lte=today_end + ).count() + + total_tasks_today = Todo.objects.filter( + user=user, + completion_date__gte=today_start, + completion_date__lte=today_end ).count() @@ -91,6 +101,7 @@ class DashboardStatsTodoViewSet(viewsets.GenericViewSet, mixins.ListModelMixin): "overall_completion_rate": overall_completion_rate, "total_completed_tasks": total_completed_tasks, "total_tasks" : total_tasks, + "total_tasks_today": total_tasks_today, "tasks_completed_today": tasks_completed_today, }