From 74c849a359daf20234ccadd9a303388ae4bf73eb Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 10 Aug 2020 20:11:43 +0200
Subject: [PATCH] Add some small bug fixes for queries
---
aleksis/apps/chronos/managers.py | 2 +-
aleksis/apps/chronos/models.py | 2 +-
aleksis/apps/chronos/views.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aleksis/apps/chronos/managers.py b/aleksis/apps/chronos/managers.py
index 187a5fe9..4ca0ec80 100644
--- a/aleksis/apps/chronos/managers.py
+++ b/aleksis/apps/chronos/managers.py
@@ -36,7 +36,7 @@ class ValidityRangeRelatedQuerySet(QuerySet):
def for_validity_range(
self, validity_range: "ValidityRange"
) -> "ValidityRangeRelatedQuerySet":
- return self.filter(validity_range=validity_range)
+ return self.filter(validity=validity_range)
def for_current_or_all(self) -> "ValidityRangeRelatedQuerySet":
"""Get all objects related to current validity range.
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index fc3b5854..336b184b 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -379,7 +379,7 @@ class LessonSubstitution(ExtensibleModel):
@property
def date(self):
- week = CalendarWeek(week=self.week, year=self.lesson_period.lesson.get_year())
+ week = CalendarWeek(week=self.week, year=self.lesson_period.lesson.get_year(self.week))
return week[self.lesson_period.period.weekday]
def __str__(self):
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index d91e6e05..5c74057f 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -33,7 +33,7 @@ def all_timetables(request: HttpRequest) -> HttpResponse:
teachers = Person.objects.annotate(
lessons_count=Count("lessons_as_teacher")
).filter(lessons_count__gt=0)
- groups = Group.objects.annotate(
+ groups = Group.objects.for_current_school_term_or_all().annotate(
lessons_count=Count("lessons"),
child_lessons_count=Count("child_groups__lessons"),
)
--
GitLab