From c51ad4a54520b3037e5b90997503555aa0a253b7 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Thu, 18 Aug 2022 22:09:38 +0200
Subject: [PATCH] Fix linting issues
---
aleksis/apps/alsijil/menus.py | 2 +-
aleksis/apps/alsijil/views.py | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/aleksis/apps/alsijil/menus.py b/aleksis/apps/alsijil/menus.py
index 87c97ace9..896f1378a 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 d6e5afc06..b37e0e1af 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,
@@ -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
--
GitLab