From b55e6d6e86301961b8422129e06c3f3500ebb60b Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Sun, 16 May 2021 13:23:11 +0200
Subject: [PATCH] Run reformat
---
aleksis/apps/alsijil/actions.py | 3 +--
aleksis/apps/alsijil/filters.py | 6 +++---
aleksis/apps/alsijil/forms.py | 2 --
aleksis/apps/alsijil/managers.py | 12 +++---------
aleksis/apps/alsijil/tables.py | 15 +++++++++------
aleksis/apps/alsijil/views.py | 8 ++++++--
6 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/aleksis/apps/alsijil/actions.py b/aleksis/apps/alsijil/actions.py
index 698c61670..6aedbc2ae 100644
--- a/aleksis/apps/alsijil/actions.py
+++ b/aleksis/apps/alsijil/actions.py
@@ -9,8 +9,6 @@ from django.utils.translation import gettext_lazy as _
from aleksis.core.models import Notification
-from django.utils.translation import gettext_lazy as _
-
def mark_as_excused(modeladmin, request, queryset):
queryset.update(excused=True, excuse_type=None)
@@ -41,6 +39,7 @@ def delete_personal_note(modeladmin, request, queryset):
delete_personal_note.short_description = _("Delete")
+
def send_request_to_check_entry(modeladmin, request: HttpRequest, selected_items: Sequence[dict]):
"""Send notifications to the teachers of the selected register objects.
diff --git a/aleksis/apps/alsijil/filters.py b/aleksis/apps/alsijil/filters.py
index ca793aa5a..178481942 100644
--- a/aleksis/apps/alsijil/filters.py
+++ b/aleksis/apps/alsijil/filters.py
@@ -1,6 +1,6 @@
from django.utils.translation import gettext as _
-from django_filters import FilterSet, CharFilter, ModelMultipleChoiceFilter, DateFilter
+from django_filters import CharFilter, DateFilter, FilterSet, ModelMultipleChoiceFilter
from material import Layout, Row
from .models import ExcuseType, PersonalNote
@@ -19,7 +19,7 @@ class PersonalNoteFilter(FilterSet):
Row("subject"),
Row("day_start", "day_end"),
Row("absent", "excused", "excuse_type"),
- Row("late__gt", "late__lt", "extra_marks")
+ Row("late__gt", "late__lt", "extra_marks"),
)
class Meta:
@@ -27,7 +27,7 @@ class PersonalNoteFilter(FilterSet):
fields = {
"excused": ["exact"],
"late": ["lt", "gt"],
- "absent": ['exact'],
+ "absent": ["exact"],
"excuse_type": ["exact"],
"extra_marks": ["exact"],
}
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 67e906e27..241775433 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -16,7 +16,6 @@ from aleksis.apps.chronos.managers import TimetableType
from aleksis.apps.chronos.models import Subject, TimePeriod
from aleksis.core.forms import ActionForm, ListActionForm
from aleksis.core.models import Group, Person, SchoolTerm
-from aleksis.apps.chronos.models import TimePeriod
from aleksis.core.util.core_helpers import get_site_preferences
from aleksis.core.util.predicates import check_global_permission
@@ -27,7 +26,6 @@ from .actions import (
mark_as_unexcused,
send_request_to_check_entry,
)
-
from .models import (
ExcuseType,
ExtraMark,
diff --git a/aleksis/apps/alsijil/managers.py b/aleksis/apps/alsijil/managers.py
index 555042a12..696874bdf 100644
--- a/aleksis/apps/alsijil/managers.py
+++ b/aleksis/apps/alsijil/managers.py
@@ -78,15 +78,9 @@ class RegisterObjectRelatedQuerySet(QuerySet):
"""
return self.annotate(
subject=Case(
- When(
- lesson_period__isnull=False,
- then="lesson_period__lesson__subject__name",
- ),
- When(
- extra_lesson__isnull=False,
- then="extra_lesson__subject__name",
- ),
- default=Value(_("Event"))
+ When(lesson_period__isnull=False, then="lesson_period__lesson__subject__name",),
+ When(extra_lesson__isnull=False, then="extra_lesson__subject__name",),
+ default=Value(_("Event")),
)
)
diff --git a/aleksis/apps/alsijil/tables.py b/aleksis/apps/alsijil/tables.py
index 1a71b901c..e7fb6df6d 100644
--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -87,9 +87,7 @@ class GroupRoleTable(tables.Table):
class PersonalNoteTable(tables.Table):
- selected = SelectColumn(
- attrs={"input": {"name": "selected_objects"}}, accessor=A("pk")
- )
+ selected = SelectColumn(attrs={"input": {"name": "selected_objects"}}, accessor=A("pk"))
date = tables.Column(
verbose_name=_("Date"), accessor=A("date_formatted"), order_by=A("day_start")
)
@@ -121,9 +119,14 @@ class PersonalNoteTable(tables.Table):
return value
def render_absent(self, value):
- return render_to_string(
- "components/materialize-chips.html", dict(content="Absent", classes="red white-text")
- ) if value else "–"
+ return (
+ render_to_string(
+ "components/materialize-chips.html",
+ dict(content="Absent", classes="red white-text"),
+ )
+ if value
+ else "–"
+ )
def render_excused(self, value, record):
if record.absent:
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index ac76e5451..18a3547d1 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -825,13 +825,17 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
)
.order_by(
"-school_term_start", "-order_year", "-order_week", "-order_weekday", "order_period",
- ).annotate_date_range().annotate_subject()
+ )
+ .annotate_date_range()
+ .annotate_subject()
)
personal_note_filter_object = PersonalNoteFilter(request.GET, queryset=personal_notes)
filtered_personal_notes = personal_note_filter_object.qs
context["personal_note_filter_form"] = personal_note_filter_object.form
used_filters = list(personal_note_filter_object.data.values())
- context["num_filters"] = len(used_filters) - used_filters.count("") - used_filters.count("unknown")
+ context["num_filters"] = (
+ len(used_filters) - used_filters.count("") - used_filters.count("unknown")
+ )
personal_notes_list = []
for note in personal_notes:
--
GitLab