Skip to content
Snippets Groups Projects
Verified Commit 196f4623 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Eliminate duplicate lessons from parent groups in group week.

Closes #22.
parent 55b4cfdb
No related branches found
No related tags found
No related merge requests found
...@@ -116,14 +116,14 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse ...@@ -116,14 +116,14 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
select={'_week': wanted_week} select={'_week': wanted_week}
).filter( ).filter(
Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group) Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group)
) ).distinct()
# Aggregate all personal notes for this group and week # Aggregate all personal notes for this group and week
persons = Person.objects.filter( persons = Person.objects.filter(
is_active=True is_active=True
).filter( ).filter(
Q(member_of=group) | Q(member_of__parent_groups=group) Q(member_of=group) | Q(member_of__parent_groups=group)
).prefetch_related( ).distinct().prefetch_related(
'personal_notes' 'personal_notes'
).annotate( ).annotate(
absences=Count('personal_notes__absent', filter=Q( absences=Count('personal_notes__absent', filter=Q(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment