diff --git a/aleksis/apps/alsijil/menus.py b/aleksis/apps/alsijil/menus.py index f4d6a8956a81d2413a21d010b0792610da3feaf5..eebd0fc89ae4f5bf4142459d1605166cf8b07a90 100644 --- a/aleksis/apps/alsijil/menus.py +++ b/aleksis/apps/alsijil/menus.py @@ -23,7 +23,7 @@ MENUS = { "aleksis.core.util.predicates.permission_validator", "alsijil.view_coursebook_rule", ), - ] + ], }, { "name": _("Current lesson"), diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 57ea6b8352b546d4d677beb73ec4efb85eb8a33a..ec3b481920e9b01d6e2909d43ec0e70e04892186 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -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, @@ -1381,29 +1385,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