From 24fcf2c2e72b566de34531ba01be5d7c5f526bed Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Fri, 12 Jun 2020 10:25:29 +0200
Subject: [PATCH] Clear fixme, use SchoolYear model
---
aleksis/apps/alsijil/views.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 62cc5b6cd..cf9ff9f6a 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -14,7 +14,7 @@ from calendarweek import CalendarWeek
from django_tables2 import RequestConfig
from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.core.models import Group, Person
+from aleksis.core.models import Group, Person, SchoolYear
from aleksis.core.util import messages
from .forms import (
@@ -238,11 +238,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
.prefetch_related("documentations", "personal_notes")
)
-#FIXME SchoolTerm missing in core
-# weeks = CalendarWeek.weeks_within(
-# SchoolTerm.objects.first().current_term.date_start,
-# SchoolTerm.objects.first().current_term.date_end,
-# )
+ weeks = CalendarWeek.weeks_within(
+ SchoolYear.current.date_start,
+ SchoolYear.current.date_end,
+ )
periods_by_day = {}
for lesson_period in lesson_periods:
--
GitLab