Skip to content
Snippets Groups Projects
Verified Commit e6b86387 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Use SchoolTerm instead of SchoolYear and catch non-existing school term

parent 40d877cc
No related branches found
No related tags found
1 merge request!43Resolve "Make Alsijil work with current core"
Pipeline #2681 passed
...@@ -14,7 +14,7 @@ from calendarweek import CalendarWeek ...@@ -14,7 +14,7 @@ from calendarweek import CalendarWeek
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.core.models import Group, Person, SchoolYear from aleksis.core.models import Group, Person, SchoolTerm
from aleksis.core.util import messages from aleksis.core.util import messages
from .forms import ( from .forms import (
...@@ -238,9 +238,14 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -238,9 +238,14 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
.prefetch_related("documentations", "personal_notes") .prefetch_related("documentations", "personal_notes")
) )
current_school_term = SchoolTerm.current
if not current_school_term:
return HttpResponseNotFound(_("There is no current school term."))
weeks = CalendarWeek.weeks_within( weeks = CalendarWeek.weeks_within(
SchoolYear.current.date_start, current_school_term.date_start,
SchoolYear.current.date_end, current_school_term.date_end,
) )
periods_by_day = {} periods_by_day = {}
......
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