From 196f4623d901039eb7c0ec69f0a765a88fd98258 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 7 Sep 2019 12:14:43 +0200
Subject: [PATCH] Eliminate duplicate lessons from parent groups in group week.
Closes #22.
---
biscuit/apps/alsijil/views.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 9d989b282..bc729e209 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -116,14 +116,14 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
select={'_week': wanted_week}
).filter(
Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group)
- )
+ ).distinct()
# Aggregate all personal notes for this group and week
persons = Person.objects.filter(
is_active=True
).filter(
Q(member_of=group) | Q(member_of__parent_groups=group)
- ).prefetch_related(
+ ).distinct().prefetch_related(
'personal_notes'
).annotate(
absences=Count('personal_notes__absent', filter=Q(
--
GitLab