diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index 600f38455b97177ac1880b8b9d7f4722566f0133..309338f366372af429175e7a6176e11962f1d8ac 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -126,9 +126,18 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse ).prefetch_related( 'personal_notes' ).annotate( - absences=Count('personal_notes__absent', filter=Q(week=wanted_week, absent=True)), - unexcused=Count('personal_notes__absent', filter=Q(week=wanted_week, absent=True, excused=False)), - tardiness=Sum('personal_notes__tardiness', filter=Q(week=wanted_week)) + absences=Count('personal_notes__absent', filter=Q( + personal_notes__week=wanted_week, + personal_notes__absent=True + )), + unexcused=Count('personal_notes__absent', filter=Q( + personal_notes__week=wanted_week, + personal_notes__absent=True, + personal_notes__excused=False + )), + tardiness=Sum('personal_notes__tardiness', filter=Q( + personal_notes__week=wanted_week + )) ) else: lesson_periods = None