From ab67e67e16f24cc2e5e9f53ee6f991045c540c95 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Wed, 4 Sep 2019 20:29:31 +0200
Subject: [PATCH] Qualify field names for aggregation.
---
biscuit/apps/alsijil/views.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 600f38455..309338f36 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
--
GitLab