Skip to content
Snippets Groups Projects
Commit c51ad4a5 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Fix linting issues

parent 2d6f359e
No related branches found
No related tags found
No related merge requests found
Pipeline #84741 passed
......@@ -23,7 +23,7 @@ MENUS = {
"aleksis.core.util.predicates.permission_validator",
"alsijil.view_coursebook_rule",
),
]
],
},
{
"name": _("Current lesson"),
......
......@@ -37,7 +37,11 @@ from aleksis.apps.chronos.models import (
TimePeriod,
)
from aleksis.apps.chronos.util.build import build_weekdays
from aleksis.apps.chronos.util.date import get_current_year, get_weeks_for_year, week_weekday_to_date
from aleksis.apps.chronos.util.date import (
get_current_year,
get_weeks_for_year,
week_weekday_to_date,
)
from aleksis.core.mixins import (
AdvancedCreateView,
AdvancedDeleteView,
......@@ -1473,29 +1477,25 @@ class SelectCoursebookView(PermissionRequiredMixin, TemplateView):
# Show all future and the ones of last week
last_week, last_week_year = (
current_week - 1,
current_year
) if current_week >= 2 else (
CalendarWeek.get_last_week_of_year(current_year - 1),
current_year - 1
(current_week - 1, current_year)
if current_week >= 2
else (CalendarWeek.get_last_week_of_year(current_year - 1), current_year - 1)
)
last_week_query = Q(
lesson_periods__substitutions__week=last_week,
lesson_periods__substitutions__year=last_week_year
lesson_periods__substitutions__year=last_week_year,
)
this_week_query = Q(
lesson_periods__substitutions__week__gte=current_week,
lesson_periods__substitutions__year=current_year
)
next_year_query = Q(
lesson_periods__substitutions__year__gt=current_year
lesson_periods__substitutions__year=current_year,
)
next_year_query = Q(lesson_periods__substitutions__year__gt=current_year)
context["lessons"] = Lesson.objects.filter(
Q(teachers=person) | (
Q(lesson_periods__substitutions__teachers=person) & (
last_week_query | this_week_query | next_year_query
)
Q(teachers=person)
| (
Q(lesson_periods__substitutions__teachers=person)
& (last_week_query | this_week_query | next_year_query)
)
).for_current_or_all()
return context
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