From 837ccbf3280460cff6a7d2d39783e1538d75140b Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 2 Sep 2019 21:44:35 +0200
Subject: [PATCH] Add lesosns in child groups to lesson tables.
---
biscuit/apps/alsijil/views.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 5cf9cfb38..d5db8e064 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -81,10 +81,11 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
periods_by_day_unsorted = {}
if group:
- for lesson in group.lessons.filter(date_start__lte=week_start, date_end__gte=week_end):
- for lesson_period in lesson.lesson_periods.all():
- periods_by_day_unsorted.setdefault(
- lesson_period.period.weekday, []).append(lesson_period)
+ for act_group in [group] + group.child_groups.all():
+ for lesson in act_group.lessons.filter(date_start__lte=week_start, date_end__gte=week_end):
+ for lesson_period in lesson.lesson_periods.all():
+ periods_by_day_unsorted.setdefault(
+ lesson_period.period.weekday, []).append(lesson_period)
periods_by_day = OrderedDict()
for weekday, periods in sorted(periods_by_day_unsorted.items()):
--
GitLab