From 1228765ff2c0775809c35f9a62b2795441a2062d Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 3 May 2020 14:00:37 +0200
Subject: [PATCH] [Reformat] black
---
aleksis/apps/untis/forms.py | 4 +---
aleksis/apps/untis/menus.py | 5 ++++-
aleksis/apps/untis/model_extensions.py | 1 -
aleksis/apps/untis/models.py | 1 +
aleksis/apps/untis/preferences.py | 4 ++--
aleksis/apps/untis/rules.py | 6 ++++--
.../untis/util/mysql/importers/lessons.py | 4 +++-
.../util/mysql/importers/substitutions.py | 21 ++++++-------------
aleksis/apps/untis/util/mysql/main.py | 4 +++-
aleksis/apps/untis/util/xml/xml.py | 3 ++-
aleksis/apps/untis/views.py | 8 ++-----
11 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/aleksis/apps/untis/forms.py b/aleksis/apps/untis/forms.py
index f642bbf..6809da7 100644
--- a/aleksis/apps/untis/forms.py
+++ b/aleksis/apps/untis/forms.py
@@ -29,9 +29,7 @@ class GroupSubjectForm(forms.ModelForm):
self.fields["short_name"].widget = forms.HiddenInput()
-GroupSubjectFormset = forms.modelformset_factory(
- Group, form=GroupSubjectForm, max_num=0, extra=0
-)
+GroupSubjectFormset = forms.modelformset_factory(Group, form=GroupSubjectForm, max_num=0, extra=0)
if get_site_preferences()["untis_mysql__use_course_groups"]:
EditGroupForm.add_node_to_layout(Fieldset(_("UNTIS import"), "untis_subject"))
diff --git a/aleksis/apps/untis/menus.py b/aleksis/apps/untis/menus.py
index ada88be..39df78c 100644
--- a/aleksis/apps/untis/menus.py
+++ b/aleksis/apps/untis/menus.py
@@ -13,7 +13,10 @@ MENUS = {
"name": _("Link subjects to groups (for UNTIS MySQL import)"),
"url": "untis_groups_subjects",
"validators": [
- ("aleksis.core.util.predicates.permission_validator", "untis.assign_subjects_to_groups"),
+ (
+ "aleksis.core.util.predicates.permission_validator",
+ "untis.assign_subjects_to_groups",
+ ),
],
},
]
diff --git a/aleksis/apps/untis/model_extensions.py b/aleksis/apps/untis/model_extensions.py
index 36d947a..708220b 100644
--- a/aleksis/apps/untis/model_extensions.py
+++ b/aleksis/apps/untis/model_extensions.py
@@ -74,4 +74,3 @@ chronos_models.Holiday.field(
chronos_models.ExtraLesson.field(
import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
)
-
diff --git a/aleksis/apps/untis/models.py b/aleksis/apps/untis/models.py
index cd4dcff..31a6886 100644
--- a/aleksis/apps/untis/models.py
+++ b/aleksis/apps/untis/models.py
@@ -5,6 +5,7 @@
from django.db import models
from django.utils.translation import gettext as _
+
from aleksis.core.mixins import PureDjangoModel
diff --git a/aleksis/apps/untis/preferences.py b/aleksis/apps/untis/preferences.py
index d219325..bae4454 100644
--- a/aleksis/apps/untis/preferences.py
+++ b/aleksis/apps/untis/preferences.py
@@ -1,4 +1,5 @@
from django.utils.translation import gettext as _
+
from dynamic_preferences.preferences import Section
from dynamic_preferences.types import BooleanPreference
@@ -78,6 +79,5 @@ class UseCourseGroups(BooleanPreference):
default = True
verbose_name = _("Use course groups")
help_text = _(
- "Build or search course groups for every course"
- " instead of setting classes as groups."
+ "Build or search course groups for every course" " instead of setting classes as groups."
)
diff --git a/aleksis/apps/untis/rules.py b/aleksis/apps/untis/rules.py
index 8737424..55740b1 100644
--- a/aleksis/apps/untis/rules.py
+++ b/aleksis/apps/untis/rules.py
@@ -1,6 +1,6 @@
from rules import add_perm
-from aleksis.core.util.predicates import has_person, has_global_perm
+from aleksis.core.util.predicates import has_global_perm, has_person
# Do XML import
do_xml_import_predicate = has_person & has_global_perm("untis.do_xml_import")
@@ -8,5 +8,7 @@ add_perm("untis.do_xml_import", do_xml_import_predicate)
# Do XML import
-assign_subjects_to_groups_predicate = has_person & has_global_perm("untis.assign_subjects_to_groups")
+assign_subjects_to_groups_predicate = has_person & has_global_perm(
+ "untis.assign_subjects_to_groups"
+)
add_perm("untis.assign_subjects_to_groups", assign_subjects_to_groups_predicate)
diff --git a/aleksis/apps/untis/util/mysql/importers/lessons.py b/aleksis/apps/untis/util/mysql/importers/lessons.py
index eea3bbc..b6d6b02 100644
--- a/aleksis/apps/untis/util/mysql/importers/lessons.py
+++ b/aleksis/apps/untis/util/mysql/importers/lessons.py
@@ -261,5 +261,7 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
else:
# Create new lesson period
- chronos_models.LessonPeriod.objects.create(lesson=lesson, period=time_period, room=room, element_id_untis=j)
+ chronos_models.LessonPeriod.objects.create(
+ lesson=lesson, period=time_period, room=room, element_id_untis=j
+ )
logger.info(" New time period added")
diff --git a/aleksis/apps/untis/util/mysql/importers/substitutions.py b/aleksis/apps/untis/util/mysql/importers/substitutions.py
index 40242a4..e2d5fa7 100644
--- a/aleksis/apps/untis/util/mysql/importers/substitutions.py
+++ b/aleksis/apps/untis/util/mysql/importers/substitutions.py
@@ -26,12 +26,7 @@ class SubstitutionFlag(Enum):
def import_substitutions(
- teachers_ref,
- subjects_ref,
- rooms_ref,
- classes_ref,
- supervision_areas_ref,
- time_periods_ref,
+ teachers_ref, subjects_ref, rooms_ref, classes_ref, supervision_areas_ref, time_periods_ref,
):
""" Import substitutions """
@@ -171,18 +166,13 @@ def import_substitutions(
logger.info(" Extra lesson detected")
time_period = time_periods_ref[date.weekday()][period]
- groups = [
- classes_ref[pk] for pk in untis_split_first(sub.classids, int)
- ]
+ groups = [classes_ref[pk] for pk in untis_split_first(sub.classids, int)]
room = room_old if not room_new and room_old else room_new
subject = subject_old if not subject_new else subject_new
teachers = [teacher_old] if not teacher_new else [teacher_new]
- (
- extra_lesson,
- created,
- ) = chronos_models.ExtraLesson.objects.update_or_create(
+ (extra_lesson, created,) = chronos_models.ExtraLesson.objects.update_or_create(
import_ref_untis=sub_id,
defaults={
"week": week.week,
@@ -244,8 +234,9 @@ def import_substitutions(
s.delete()
# Delete all no longer existing supervision substitutions
- for s in chronos_models.SupervisionSubstitution.objects.filter(date__gte=date_start, date__lte=date_end):
+ for s in chronos_models.SupervisionSubstitution.objects.filter(
+ date__gte=date_start, date__lte=date_end
+ ):
if s.import_ref_untis and s.import_ref_untis not in existing_subs:
logger.info("Supervision substitution {} deleted".format(s.id))
s.delete()
-
diff --git a/aleksis/apps/untis/util/mysql/main.py b/aleksis/apps/untis/util/mysql/main.py
index 7fd537e..dc60421 100644
--- a/aleksis/apps/untis/util/mysql/main.py
+++ b/aleksis/apps/untis/util/mysql/main.py
@@ -43,7 +43,9 @@ def untis_import_mysql():
# Substitutions
import_absences(absence_reasons_ref, time_periods_ref, teachers_ref, classes_ref, rooms_ref)
- import_substitutions(teachers_ref, subjects_ref, rooms_ref, classes_ref, supervision_areas_ref, time_periods_ref)
+ import_substitutions(
+ teachers_ref, subjects_ref, rooms_ref, classes_ref, supervision_areas_ref, time_periods_ref
+ )
# Events
import_events(time_periods_ref, teachers_ref, classes_ref, rooms_ref)
diff --git a/aleksis/apps/untis/util/xml/xml.py b/aleksis/apps/untis/util/xml/xml.py
index 696f467..7a03921 100644
--- a/aleksis/apps/untis/util/xml/xml.py
+++ b/aleksis/apps/untis/util/xml/xml.py
@@ -39,7 +39,8 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
colour_bg = get_child_node_text(subject_node, "backcolor")
Subject.objects.update_or_create(
- short_name=short_name, defaults={"name": name, "colour_fg": colour_fg, "colour_bg": colour_bg},
+ short_name=short_name,
+ defaults={"name": name, "colour_fg": colour_fg, "colour_bg": colour_bg},
)
periods = dom.getElementsByTagName("timeperiod")
diff --git a/aleksis/apps/untis/views.py b/aleksis/apps/untis/views.py
index 232d77f..d692841 100644
--- a/aleksis/apps/untis/views.py
+++ b/aleksis/apps/untis/views.py
@@ -8,7 +8,7 @@ from rules.contrib.views import permission_required
from aleksis.core.models import Group
-from .forms import UntisUploadForm, GroupSubjectFormset
+from .forms import GroupSubjectFormset, UntisUploadForm
from .util.xml.xml import untis_import_xml
@@ -43,9 +43,7 @@ def groups_subjects(request: HttpRequest) -> HttpResponse:
groups_paged = groups_qs.filter(id__in=[g.id for g in page])
# Create filtered queryset
- group_subject_formset = GroupSubjectFormset(
- request.POST or None, queryset=groups_paged
- )
+ group_subject_formset = GroupSubjectFormset(request.POST or None, queryset=groups_paged)
# Check if form is submitted and valid, then save
if request.method == "POST":
@@ -58,5 +56,3 @@ def groups_subjects(request: HttpRequest) -> HttpResponse:
context["paginator"] = paginator
return render(request, "untis/groups_subjects.html", context)
-
-
--
GitLab