From b7fa224ebee245bf922541817148381ee76410e3 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 27 Jun 2020 12:14:49 +0200
Subject: [PATCH] Annotate week in get_lesson_by_period_pk
---
aleksis/apps/alsijil/util/alsijil_helpers.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py
index ccdc13900..98b143d43 100644
--- a/aleksis/apps/alsijil/util/alsijil_helpers.py
+++ b/aleksis/apps/alsijil/util/alsijil_helpers.py
@@ -1,5 +1,6 @@
from typing import Optional
+from calendarweek import CalendarWeek
from django.http import HttpRequest
from aleksis.apps.chronos.models import LessonPeriod
@@ -13,8 +14,9 @@ def get_lesson_period_by_pk(
period_id: Optional[int] = None,
):
"""Get LessonPeriod object either by given object_id or by time and current person."""
+ wanted_week = CalendarWeek(year=year, week=week)
if period_id:
- lesson_period = LessonPeriod.objects.get(pk=period_id)
+ lesson_period = LessonPeriod.objects.annotate_week(wanted_week).get(pk=period_id)
elif hasattr(request, "user") and hasattr(request.user, "person"):
if request.user.person.lessons_as_teacher.exists():
lesson_period = (
--
GitLab