From df755acbcafb7aaa95efec0cd80478885d8feb72 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 3 May 2020 14:25:57 +0200
Subject: [PATCH] [Reformat] flake8, black
---
aleksis/apps/untis/forms.py | 4 +-
aleksis/apps/untis/menus.py | 5 +-
aleksis/apps/untis/model_extensions.py | 57 +-
aleksis/apps/untis/models.py | 688 +++++++++++++-----
aleksis/apps/untis/preferences.py | 3 +-
aleksis/apps/untis/tasks.py | 2 +-
.../untis/util/mysql/importers/absences.py | 4 +-
.../untis/util/mysql/importers/common_data.py | 63 +-
.../untis/util/mysql/importers/holidays.py | 6 +-
.../untis/util/mysql/importers/lessons.py | 29 +-
.../util/mysql/importers/substitutions.py | 31 +-
aleksis/apps/untis/util/mysql/main.py | 11 +-
aleksis/apps/untis/util/mysql/util.py | 40 +-
aleksis/apps/untis/util/xml/xml.py | 17 +-
aleksis/apps/untis/views.py | 6 +-
15 files changed, 717 insertions(+), 249 deletions(-)
diff --git a/aleksis/apps/untis/forms.py b/aleksis/apps/untis/forms.py
index 6809da7..f642bbf 100644
--- a/aleksis/apps/untis/forms.py
+++ b/aleksis/apps/untis/forms.py
@@ -29,7 +29,9 @@ 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 39df78c..47e440d 100644
--- a/aleksis/apps/untis/menus.py
+++ b/aleksis/apps/untis/menus.py
@@ -6,7 +6,10 @@ MENUS = {
"name": _("Untis XML import"),
"url": "untis_xml_import",
"validators": [
- ("aleksis.core.util.predicates.permission_validator", "untis.do_xml_import"),
+ (
+ "aleksis.core.util.predicates.permission_validator",
+ "untis.do_xml_import",
+ ),
],
},
{
diff --git a/aleksis/apps/untis/model_extensions.py b/aleksis/apps/untis/model_extensions.py
index 708220b..1db8db9 100644
--- a/aleksis/apps/untis/model_extensions.py
+++ b/aleksis/apps/untis/model_extensions.py
@@ -5,40 +5,51 @@ from jsonstore import CharField, IntegerField
from aleksis.apps.chronos import models as chronos_models
from aleksis.core import models as core_models
-# Core models
from aleksis.core.util.core_helpers import get_site_preferences
core_models.Person.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
core_models.Group.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
if get_site_preferences()["untis_mysql__use_course_groups"]:
core_models.Group.field(
untis_subject=CharField(
verbose_name=_("UNTIS subject"),
help_text=_(
- "The UNTIS import will use this for matching course groups (along with parent groups)."
+ "The UNTIS import will use this for matching course groups"
+ "(along with parent groups)."
),
blank=True,
- null=True,
max_length=255,
)
)
# Chronos models
chronos_models.Subject.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.Room.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.SupervisionArea.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.Lesson.field(
- lesson_id_untis=IntegerField(verbose_name=_("Lesson id in UNTIS"), null=True, blank=True)
+ lesson_id_untis=IntegerField(
+ verbose_name=_("Lesson id in UNTIS"), null=True, blank=True
+ )
)
chronos_models.Lesson.field(
element_id_untis=IntegerField(
@@ -54,23 +65,37 @@ chronos_models.LessonPeriod.field(
)
)
chronos_models.LessonSubstitution.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.SupervisionSubstitution.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.AbsenceReason.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.Absence.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.Event.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.Holiday.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ import_ref_untis=IntegerField(
+ verbose_name=_("UNTIS import reference"), null=True, blank=True
+ )
)
chronos_models.ExtraLesson.field(
- import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True)
+ 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 31a6886..1de4bf1 100644
--- a/aleksis/apps/untis/models.py
+++ b/aleksis/apps/untis/models.py
@@ -13,9 +13,15 @@ class Absence(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- absence_id = models.IntegerField(db_column="ABSENCE_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ absence_id = models.IntegerField(
+ db_column="ABSENCE_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -40,7 +46,9 @@ class Absence(models.Model, PureDjangoModel):
typea = models.SmallIntegerField(
db_column="TypeA", blank=True, null=True
) # Field name made lowercase.
- ida = models.IntegerField(db_column="IDA", blank=True, null=True) # Field name made lowercase.
+ ida = models.IntegerField(
+ db_column="IDA", blank=True, null=True
+ ) # Field name made lowercase.
datefrom = models.IntegerField(
db_column="DateFrom", blank=True, null=True
) # Field name made lowercase.
@@ -85,8 +93,12 @@ class Absencereason(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
absence_reason_id = models.IntegerField(
db_column="ABSENCE_REASON_ID"
) # Field name made lowercase.
@@ -124,15 +136,21 @@ class Absencereason(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "AbsenceReason"
- unique_together = (("school_id", "schoolyear_id", "version_id", "absence_reason_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "absence_reason_id"),
+ )
class Adminlesson(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
ls_id = models.IntegerField(db_column="LS_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -175,10 +193,16 @@ class Alias(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
type = models.SmallIntegerField(db_column="Type") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
alias_id = models.IntegerField(db_column="ALIAS_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -214,9 +238,15 @@ class CvReason(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- cv_reason_id = models.IntegerField(db_column="CV_REASON_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ cv_reason_id = models.IntegerField(
+ db_column="CV_REASON_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -251,15 +281,21 @@ class CvReason(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "CV_Reason"
- unique_together = (("school_id", "schoolyear_id", "version_id", "cv_reason_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "cv_reason_id"),
+ )
class Calendar(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
date = models.IntegerField(db_column="Date") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -308,10 +344,16 @@ class Class(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
class_id = models.IntegerField(db_column="CLASS_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -517,19 +559,27 @@ class Class(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Class"
- unique_together = (("school_id", "schoolyear_id", "version_id", "class_id", "term_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "class_id", "term_id"),
+ )
class Commondata(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
id = models.SmallIntegerField(db_column="ID") # Field name made lowercase.
owner = models.SmallIntegerField(db_column="Owner") # Field name made lowercase.
number = models.SmallIntegerField(db_column="Number") # Field name made lowercase.
- number1 = models.SmallIntegerField(db_column="Number1") # Field name made lowercase.
+ number1 = models.SmallIntegerField(
+ db_column="Number1"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -679,7 +729,15 @@ class Commondata(models.Model, PureDjangoModel):
managed = False
db_table = "CommonData"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "id", "owner", "number", "number1"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "id",
+ "owner",
+ "number",
+ "number1",
+ ),
)
@@ -687,9 +745,15 @@ class Corridor(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- corridor_id = models.IntegerField(db_column="CORRIDOR_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ corridor_id = models.IntegerField(
+ db_column="CORRIDOR_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -782,9 +846,15 @@ class Countvalue(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- count_value_id = models.IntegerField(db_column="COUNT_VALUE_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ count_value_id = models.IntegerField(
+ db_column="COUNT_VALUE_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -849,16 +919,24 @@ class Countvalue(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "CountValue"
- unique_together = (("school_id", "schoolyear_id", "version_id", "count_value_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "count_value_id"),
+ )
class Couplcond(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- coupl_cond_id = models.IntegerField(db_column="COUPL_COND_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ coupl_cond_id = models.IntegerField(
+ db_column="COUPL_COND_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -890,16 +968,24 @@ class Couplcond(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "CouplCond"
- unique_together = (("school_id", "schoolyear_id", "version_id", "coupl_cond_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "coupl_cond_id"),
+ )
class Department(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- department_id = models.IntegerField(db_column="DEPARTMENT_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ department_id = models.IntegerField(
+ db_column="DEPARTMENT_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -925,16 +1011,24 @@ class Department(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Department"
- unique_together = (("school_id", "schoolyear_id", "version_id", "department_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "department_id"),
+ )
class Description(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- description_id = models.IntegerField(db_column="DESCRIPTION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ description_id = models.IntegerField(
+ db_column="DESCRIPTION_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -963,15 +1057,21 @@ class Description(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Description"
- unique_together = (("school_id", "schoolyear_id", "version_id", "description_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "description_id"),
+ )
class Event(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
event_id = models.IntegerField(db_column="EVENT_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1068,8 +1168,12 @@ class Exam(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
exam_id = models.IntegerField(db_column="EXAM_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1160,8 +1264,12 @@ class Externelement(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
exel_id = models.IntegerField(db_column="EXEL_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1210,11 +1318,17 @@ class Externindex(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
number = models.SmallIntegerField(db_column="Number") # Field name made lowercase.
exel_id = models.IntegerField(db_column="EXEL_ID") # Field name made lowercase.
- school_id1 = models.IntegerField(db_column="SCHOOL_ID1") # Field name made lowercase.
+ school_id1 = models.IntegerField(
+ db_column="SCHOOL_ID1"
+ ) # Field name made lowercase.
year = models.SmallIntegerField(db_column="Year") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1230,7 +1344,15 @@ class Externindex(models.Model, PureDjangoModel):
managed = False
db_table = "ExternIndex"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "exel_id", "number", "year", "school_id1"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "exel_id",
+ "number",
+ "year",
+ "school_id1",
+ ),
)
@@ -1238,11 +1360,17 @@ class Externtime(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
number = models.IntegerField(db_column="Number") # Field name made lowercase.
exel_id = models.IntegerField(db_column="EXEL_ID") # Field name made lowercase.
- school_id1 = models.IntegerField(db_column="SCHOOL_ID1") # Field name made lowercase.
+ school_id1 = models.IntegerField(
+ db_column="SCHOOL_ID1"
+ ) # Field name made lowercase.
year = models.SmallIntegerField(db_column="Year") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1279,7 +1407,15 @@ class Externtime(models.Model, PureDjangoModel):
managed = False
db_table = "ExternTime"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "number", "exel_id", "school_id1", "year"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "number",
+ "exel_id",
+ "school_id1",
+ "year",
+ ),
)
@@ -1287,10 +1423,16 @@ class Glaettung(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
number = models.SmallIntegerField(db_column="Number") # Field name made lowercase.
- teacher_id = models.IntegerField(db_column="TEACHER_ID") # Field name made lowercase.
+ teacher_id = models.IntegerField(
+ db_column="TEACHER_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1313,16 +1455,24 @@ class Glaettung(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Glaettung"
- unique_together = (("school_id", "schoolyear_id", "version_id", "teacher_id", "number"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "teacher_id", "number"),
+ )
class Holiday(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- holiday_id = models.IntegerField(db_column="HOLIDAY_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ holiday_id = models.IntegerField(
+ db_column="HOLIDAY_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1364,9 +1514,15 @@ class Inputformat(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- input_format_id = models.IntegerField(db_column="INPUT_FORMAT_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ input_format_id = models.IntegerField(
+ db_column="INPUT_FORMAT_ID"
+ ) # Field name made lowercase.
owner = models.SmallIntegerField(db_column="Owner") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -1492,10 +1648,16 @@ class Lesson(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
lesson_id = models.IntegerField(db_column="LESSON_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1689,16 +1851,24 @@ class Lesson(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Lesson"
- unique_together = (("school_id", "schoolyear_id", "version_id", "lesson_id", "term_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "lesson_id", "term_id"),
+ )
class Lessongroup(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- lesson_group_id = models.IntegerField(db_column="LESSON_GROUP_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ lesson_group_id = models.IntegerField(
+ db_column="LESSON_GROUP_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1778,20 +1948,28 @@ class Lessongroup(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "LessonGroup"
- unique_together = (("school_id", "schoolyear_id", "version_id", "lesson_group_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "lesson_group_id"),
+ )
class Lessonsequence(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
type = models.SmallIntegerField(db_column="Type") # Field name made lowercase.
lesson_sequence_id = models.IntegerField(
db_column="LESSON_SEQUENCE_ID"
) # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1824,7 +2002,14 @@ class Lessonsequence(models.Model, PureDjangoModel):
managed = False
db_table = "LessonSequence"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "type", "lesson_sequence_id", "term_id"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "type",
+ "lesson_sequence_id",
+ "term_id",
+ ),
)
@@ -1832,13 +2017,25 @@ class Lessonstack(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- user_id = models.SmallIntegerField(db_column="USER_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ user_id = models.SmallIntegerField(
+ db_column="USER_ID"
+ ) # Field name made lowercase.
stack_id = models.IntegerField(db_column="STACK_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
- typestack = models.SmallIntegerField(db_column="TypeStack") # Field name made lowercase.
- typeelement = models.SmallIntegerField(db_column="TypeElement") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
+ typestack = models.SmallIntegerField(
+ db_column="TypeStack"
+ ) # Field name made lowercase.
+ typeelement = models.SmallIntegerField(
+ db_column="TypeElement"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1870,8 +2067,12 @@ class Periodstable(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
periods_table_id = models.IntegerField(
db_column="PERIODS_TABLE_ID"
) # Field name made lowercase.
@@ -1930,16 +2131,24 @@ class Periodstable(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "PeriodsTable"
- unique_together = (("school_id", "schoolyear_id", "version_id", "periods_table_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "periods_table_id"),
+ )
class Prebooking(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- prebooking_id = models.IntegerField(db_column="PREBOOKING_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ prebooking_id = models.IntegerField(
+ db_column="PREBOOKING_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -1992,17 +2201,25 @@ class Prebooking(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Prebooking"
- unique_together = (("school_id", "schoolyear_id", "version_id", "prebooking_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "prebooking_id"),
+ )
class Room(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
room_id = models.IntegerField(db_column="ROOM_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2100,16 +2317,24 @@ class Room(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Room"
- unique_together = (("school_id", "schoolyear_id", "version_id", "room_id", "term_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "room_id", "term_id"),
+ )
class Roomgroup(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- roomgroup_id = models.IntegerField(db_column="ROOMGROUP_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ roomgroup_id = models.IntegerField(
+ db_column="ROOMGROUP_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2144,7 +2369,9 @@ class Roomgroup(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "RoomGroup"
- unique_together = (("school_id", "schoolyear_id", "version_id", "roomgroup_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "roomgroup_id"),
+ )
class School(models.Model, PureDjangoModel):
@@ -2203,7 +2430,9 @@ class Schoolyear(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
counterlast = models.IntegerField(
db_column="CounterLast", blank=True, null=True
) # Field name made lowercase.
@@ -2233,9 +2462,15 @@ class Screenset(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- screenset_id = models.IntegerField(db_column="SCREENSET_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ screenset_id = models.IntegerField(
+ db_column="SCREENSET_ID"
+ ) # Field name made lowercase.
owner = models.SmallIntegerField(db_column="Owner") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -2286,16 +2521,24 @@ class Screenset(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "ScreenSet"
- unique_together = (("school_id", "schoolyear_id", "version_id", "screenset_id", "owner"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "screenset_id", "owner"),
+ )
class Student(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- student_id = models.IntegerField(db_column="STUDENT_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ student_id = models.IntegerField(
+ db_column="STUDENT_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2394,10 +2637,18 @@ class Studentchoice(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- student_id = models.IntegerField(db_column="STUDENT_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ student_id = models.IntegerField(
+ db_column="STUDENT_ID"
+ ) # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
number = models.SmallIntegerField(db_column="Number") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -2431,7 +2682,14 @@ class Studentchoice(models.Model, PureDjangoModel):
managed = False
db_table = "StudentChoice"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "student_id", "term_id", "number"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "student_id",
+ "term_id",
+ "number",
+ ),
)
@@ -2439,9 +2697,15 @@ class Studentgroup(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- studentgroup_id = models.IntegerField(db_column="STUDENTGROUP_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ studentgroup_id = models.IntegerField(
+ db_column="STUDENTGROUP_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2473,16 +2737,24 @@ class Studentgroup(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "StudentGroup"
- unique_together = (("school_id", "schoolyear_id", "version_id", "studentgroup_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "studentgroup_id"),
+ )
class Subjectgroup(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- subjectgroup_id = models.IntegerField(db_column="SUBJECTGROUP_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ subjectgroup_id = models.IntegerField(
+ db_column="SUBJECTGROUP_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2520,16 +2792,24 @@ class Subjectgroup(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "SubjectGroup"
- unique_together = (("school_id", "schoolyear_id", "version_id", "subjectgroup_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "subjectgroup_id"),
+ )
class Subjects(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- subject_id = models.IntegerField(db_column="SUBJECT_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ subject_id = models.IntegerField(
+ db_column="SUBJECT_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2655,9 +2935,15 @@ class Substitution(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- substitution_id = models.IntegerField(db_column="SUBSTITUTION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ substitution_id = models.IntegerField(
+ db_column="SUBSTITUTION_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -2758,15 +3044,21 @@ class Substitution(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Substitution"
- unique_together = (("school_id", "schoolyear_id", "version_id", "substitution_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "substitution_id"),
+ )
class Ttelementfilter(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
tt_element_filter_id = models.IntegerField(
db_column="TT_ELEMENT_FILTER_ID"
) # Field name made lowercase.
@@ -2794,7 +3086,13 @@ class Ttelementfilter(models.Model, PureDjangoModel):
managed = False
db_table = "TTElementFilter"
unique_together = (
- ("school_id", "schoolyear_id", "version_id", "tt_element_filter_id", "owner"),
+ (
+ "school_id",
+ "schoolyear_id",
+ "version_id",
+ "tt_element_filter_id",
+ "owner",
+ ),
)
@@ -2802,9 +3100,15 @@ class TtFormat(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- tt_format_id = models.IntegerField(db_column="TT_FORMAT_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ tt_format_id = models.IntegerField(
+ db_column="TT_FORMAT_ID"
+ ) # Field name made lowercase.
owner = models.SmallIntegerField(db_column="Owner") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -3140,15 +3444,21 @@ class TtFormat(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "TT_Format"
- unique_together = (("school_id", "schoolyear_id", "version_id", "tt_format_id", "owner"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "tt_format_id", "owner"),
+ )
class Tableinfo(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
type = models.SmallIntegerField(db_column="Type") # Field name made lowercase.
id = models.IntegerField(db_column="ID") # Field name made lowercase.
counter = models.IntegerField(
@@ -3186,10 +3496,18 @@ class Teacher(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- teacher_id = models.IntegerField(db_column="TEACHER_ID") # Field name made lowercase.
- term_id = models.SmallIntegerField(db_column="TERM_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ teacher_id = models.IntegerField(
+ db_column="TEACHER_ID"
+ ) # Field name made lowercase.
+ term_id = models.SmallIntegerField(
+ db_column="TERM_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -3473,16 +3791,24 @@ class Teacher(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "Teacher"
- unique_together = (("school_id", "schoolyear_id", "version_id", "teacher_id", "term_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "teacher_id", "term_id"),
+ )
class Teachergroup(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- teachergroup_id = models.IntegerField(db_column="TEACHERGROUP_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ teachergroup_id = models.IntegerField(
+ db_column="TEACHERGROUP_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -3520,15 +3846,21 @@ class Teachergroup(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "TeacherGroup"
- unique_together = (("school_id", "schoolyear_id", "version_id", "teachergroup_id"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "teachergroup_id"),
+ )
class Terms(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
term_id = models.IntegerField(db_column="TERM_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -3568,9 +3900,15 @@ class Transfer(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- transfer_id = models.IntegerField(db_column="TRANSFER_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ transfer_id = models.IntegerField(
+ db_column="TRANSFER_ID"
+ ) # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
) # Field name made lowercase.
@@ -3612,8 +3950,12 @@ class Untissettings(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
option_id = models.IntegerField(db_column="OPTION_ID") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -3633,7 +3975,9 @@ class Untissettings(models.Model, PureDjangoModel):
optionkey = models.CharField(
db_column="OptionKey", max_length=1000, blank=True, null=True
) # Field name made lowercase.
- value = models.TextField(db_column="Value", blank=True, null=True) # Field name made lowercase.
+ value = models.TextField(
+ db_column="Value", blank=True, null=True
+ ) # Field name made lowercase.
class Meta:
managed = False
@@ -3863,9 +4207,15 @@ class Valuecorrection(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
- teacher_id = models.IntegerField(db_column="TEACHER_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
+ teacher_id = models.IntegerField(
+ db_column="TEACHER_ID"
+ ) # Field name made lowercase.
number = models.SmallIntegerField(db_column="Number") # Field name made lowercase.
counter = models.IntegerField(
db_column="Counter", blank=True, null=True
@@ -3907,15 +4257,21 @@ class Valuecorrection(models.Model, PureDjangoModel):
class Meta:
managed = False
db_table = "ValueCorrection"
- unique_together = (("school_id", "schoolyear_id", "version_id", "teacher_id", "number"),)
+ unique_together = (
+ ("school_id", "schoolyear_id", "version_id", "teacher_id", "number"),
+ )
class Version(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
counterlast = models.IntegerField(
db_column="CounterLast", blank=True, null=True
) # Field name made lowercase.
@@ -3969,8 +4325,12 @@ class Views(models.Model, PureDjangoModel):
school_id = models.IntegerField(
db_column="SCHOOL_ID", primary_key=True
) # Field name made lowercase.
- schoolyear_id = models.IntegerField(db_column="SCHOOLYEAR_ID") # Field name made lowercase.
- version_id = models.SmallIntegerField(db_column="VERSION_ID") # Field name made lowercase.
+ schoolyear_id = models.IntegerField(
+ db_column="SCHOOLYEAR_ID"
+ ) # Field name made lowercase.
+ version_id = models.SmallIntegerField(
+ db_column="VERSION_ID"
+ ) # Field name made lowercase.
type = models.SmallIntegerField(db_column="Type") # Field name made lowercase.
views_id = models.IntegerField(db_column="VIEWS_ID") # Field name made lowercase.
owner = models.SmallIntegerField(db_column="Owner") # Field name made lowercase.
diff --git a/aleksis/apps/untis/preferences.py b/aleksis/apps/untis/preferences.py
index bae4454..615de13 100644
--- a/aleksis/apps/untis/preferences.py
+++ b/aleksis/apps/untis/preferences.py
@@ -79,5 +79,6 @@ 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/tasks.py b/aleksis/apps/untis/tasks.py
index f66078b..58acc3c 100644
--- a/aleksis/apps/untis/tasks.py
+++ b/aleksis/apps/untis/tasks.py
@@ -5,5 +5,5 @@ from .util.mysql.main import untis_import_mysql as _untis_import_mysql
@celery_optional
def untis_import_mysql():
- """ Celery task for import of UNTIS data from MySQL """
+ """Celery task for import of UNTIS data from MySQL."""
_untis_import_mysql()
diff --git a/aleksis/apps/untis/util/mysql/importers/absences.py b/aleksis/apps/untis/util/mysql/importers/absences.py
index 9527e00..7e54f92 100644
--- a/aleksis/apps/untis/util/mysql/importers/absences.py
+++ b/aleksis/apps/untis/util/mysql/importers/absences.py
@@ -26,7 +26,9 @@ class AbsenceType(Enum):
ROOM = 102
-def import_absences(absence_reasons_ref, time_periods_ref, teachers_ref, classes_ref, rooms_ref):
+def import_absences(
+ absence_reasons_ref, time_periods_ref, teachers_ref, classes_ref, rooms_ref
+):
ref = {}
# Get term
diff --git a/aleksis/apps/untis/util/mysql/importers/common_data.py b/aleksis/apps/untis/util/mysql/importers/common_data.py
index 889be5d..0c053cf 100644
--- a/aleksis/apps/untis/util/mysql/importers/common_data.py
+++ b/aleksis/apps/untis/util/mysql/importers/common_data.py
@@ -1,7 +1,7 @@
import logging
from datetime import time
from enum import Enum
-from typing import Dict, List
+from typing import Dict
from tqdm import tqdm
@@ -26,7 +26,7 @@ class CommonDataId(Enum):
def import_subjects() -> Dict[int, chronos_models.Subject]:
- """ Import subjects """
+ """Import subjects."""
subjects_ref = {}
@@ -94,7 +94,7 @@ def import_subjects() -> Dict[int, chronos_models.Subject]:
def import_teachers() -> Dict[int, core_models.Person]:
- """ Import teachers """
+ """Import teachers."""
teachers_ref = {}
@@ -159,8 +159,10 @@ def import_teachers() -> Dict[int, core_models.Person]:
return teachers_ref
-def import_classes(teachers_ref: Dict[int, core_models.Person]) -> Dict[int, core_models.Group]:
- """ Import classes """
+def import_classes(
+ teachers_ref: Dict[int, core_models.Person]
+) -> Dict[int, core_models.Group]:
+ """Import classes."""
classes_ref = {}
@@ -171,7 +173,9 @@ def import_classes(teachers_ref: Dict[int, core_models.Person]) -> Dict[int, cor
# Check if needed data are provided
if not class_.name:
raise RuntimeException(
- "Class ID {}: Cannot import class without short name.".format(class_.teacher_id)
+ "Class ID {}: Cannot import class without short name.".format(
+ class_.teacher_id
+ )
)
# Build values
@@ -201,7 +205,10 @@ def import_classes(teachers_ref: Dict[int, core_models.Person]) -> Dict[int, cor
changed = True
logger.info(" Short name updated")
- if get_site_preferences()["untis_mysql__update_groups_name"] and new_group.name != name:
+ if (
+ get_site_preferences()["untis_mysql__update_groups_name"]
+ and new_group.name != name
+ ):
new_group.name = name
changed = True
logger.info(" Name updated")
@@ -227,7 +234,7 @@ def import_classes(teachers_ref: Dict[int, core_models.Person]) -> Dict[int, cor
def import_rooms() -> Dict[int, chronos_models.Room]:
- """ Import rooms """
+ """Import rooms."""
ref = {}
@@ -237,7 +244,9 @@ def import_rooms() -> Dict[int, chronos_models.Room]:
for room in tqdm(rooms, desc="Import rooms", **TQDM_DEFAULTS):
if not room.name:
raise RuntimeException(
- "Room ID {}: Cannot import room without short name.".format(room.room_id)
+ "Room ID {}: Cannot import room without short name.".format(
+ room.room_id
+ )
)
# Build values
@@ -248,7 +257,8 @@ def import_rooms() -> Dict[int, chronos_models.Room]:
logger.info("Import room {} …".format(short_name))
new_room, created = chronos_models.Room.objects.get_or_create(
- short_name=short_name, defaults={"name": name, "import_ref_untis": import_ref},
+ short_name=short_name,
+ defaults={"name": name, "import_ref_untis": import_ref},
)
if created:
@@ -256,7 +266,10 @@ def import_rooms() -> Dict[int, chronos_models.Room]:
changed = False
- if get_site_preferences()["untis_mysql__update_rooms_name"] and new_room.name != name:
+ if (
+ get_site_preferences()["untis_mysql__update_rooms_name"]
+ and new_room.name != name
+ ):
new_room.name = name
changed = True
logger.info(" Name updated")
@@ -274,8 +287,10 @@ def import_rooms() -> Dict[int, chronos_models.Room]:
return ref
-def import_supervision_areas(breaks_ref, teachers_ref) -> Dict[int, chronos_models.SupervisionArea]:
- """ Import supervision areas """
+def import_supervision_areas(
+ breaks_ref, teachers_ref
+) -> Dict[int, chronos_models.SupervisionArea]:
+ """Import supervision areas."""
ref = {}
@@ -351,7 +366,7 @@ def import_supervision_areas(breaks_ref, teachers_ref) -> Dict[int, chronos_mode
teacher = teachers_ref[teacher_id]
logger.info(
- " Import supervision on weekday {} before the {}. period (teacher {})".format(
+ "Import supervision on weekday {} before the {}. period (teacher {})".format(
weekday, period_after_break, teacher
)
)
@@ -396,7 +411,7 @@ def import_supervision_areas(breaks_ref, teachers_ref) -> Dict[int, chronos_mode
def import_time_periods() -> Dict[int, Dict[int, chronos_models.TimePeriod]]:
- """ Import time periods an breaks """
+ """Import time periods an breaks."""
times = (
run_default_filter(mysql_models.Commondata.objects, filter_term=False)
@@ -427,7 +442,9 @@ def import_time_periods() -> Dict[int, Dict[int, chronos_models.TimePeriod]]:
start_time = times_ref[period][0]
end_time = times_ref[period][1]
- logger.info("Import time period on weekday {} in the {}. period".format(weekday, period))
+ logger.info(
+ "Import time period on weekday {} in the {}. period".format(weekday, period)
+ )
new_time_period, created = chronos_models.TimePeriod.objects.get_or_create(
weekday=weekday,
@@ -438,7 +455,10 @@ def import_time_periods() -> Dict[int, Dict[int, chronos_models.TimePeriod]]:
if created:
logger.info(" New time period created")
- if new_time_period.time_start != start_time or new_time_period.time_end != end_time:
+ if (
+ new_time_period.time_start != start_time
+ or new_time_period.time_end != end_time
+ ):
new_time_period.time_start = start_time
new_time_period.time_end = end_time
new_time_period.save()
@@ -465,7 +485,9 @@ def import_breaks(
# Add None two times in order to create breaks before first lesson and after last lesson
time_periods_for_breaks = [None] + list(time_periods.values()) + [None]
for i, time_period in tqdm(
- enumerate(time_periods_for_breaks), desc="Import breaks (period)", **TQDM_DEFAULTS
+ enumerate(time_periods_for_breaks),
+ desc="Import breaks (period)",
+ **TQDM_DEFAULTS
):
# If last item (None) is reached, no further break must be created
if i + 1 == len(time_periods_for_breaks):
@@ -499,7 +521,7 @@ def import_breaks(
def import_absence_reasons() -> Dict[int, chronos_models.AbsenceReason]:
- """ Import absence reasons """
+ """Import absence reasons."""
ref = {}
@@ -522,7 +544,8 @@ def import_absence_reasons() -> Dict[int, chronos_models.AbsenceReason]:
logger.info("Import absence reason {} …".format(short_name))
new_reason, created = chronos_models.AbsenceReason.objects.get_or_create(
- import_ref_untis=import_ref, defaults={"short_name": short_name, "name": name}
+ import_ref_untis=import_ref,
+ defaults={"short_name": short_name, "name": name},
)
if created:
diff --git a/aleksis/apps/untis/util/mysql/importers/holidays.py b/aleksis/apps/untis/util/mysql/importers/holidays.py
index d3f9d61..52da90d 100644
--- a/aleksis/apps/untis/util/mysql/importers/holidays.py
+++ b/aleksis/apps/untis/util/mysql/importers/holidays.py
@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
def import_holidays() -> Dict[int, chronos_models.Holiday]:
- """ Import holidays """
+ """Import holidays."""
ref = {}
# Get holidays
@@ -24,7 +24,9 @@ def import_holidays() -> Dict[int, chronos_models.Holiday]:
# Check if needed data are provided
if not holiday.name:
raise RuntimeException(
- "Holiday ID {}: Cannot import holiday without short name.".format(import_ref)
+ "Holiday ID {}: Cannot import holiday without short name.".format(
+ import_ref
+ )
)
title = holiday.name[:50]
diff --git a/aleksis/apps/untis/util/mysql/importers/lessons.py b/aleksis/apps/untis/util/mysql/importers/lessons.py
index b6d6b02..8efb576 100644
--- a/aleksis/apps/untis/util/mysql/importers/lessons.py
+++ b/aleksis/apps/untis/util/mysql/importers/lessons.py
@@ -23,8 +23,10 @@ from ..util import (
logger = logging.getLogger(__name__)
-def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, classes_ref):
- """ Import lessons """
+def import_lessons(
+ time_periods_ref, rooms_ref, subjects_ref, teachers_ref, classes_ref
+):
+ """Import lessons."""
# Get current term
term = get_term()
@@ -32,11 +34,11 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
date_end = untis_date_to_date(term.dateto)
# Get all existing lessons for this term
- lessons_in_term = chronos_models.Lesson.objects.filter(term_untis=term.term_id).values_list(
- "id", flat=True
- )
+ lessons_in_term = chronos_models.Lesson.objects.filter(
+ term_untis=term.term_id
+ ).values_list("id", flat=True)
- # Set the end date of all lessons from other terms ending in this term to the day before this term starts
+ # Set end date of lessons from other terms ending in this term to the day before term starts
chronos_models.Lesson.objects.filter(date_end__gte=date_start).exclude(
id__in=lessons_in_term
).update(date_end=date_start - timedelta(days=1))
@@ -142,10 +144,12 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
# Build names and refs for course groups
group_short_name = "{}-{}".format(
- "".join([c.short_name for c in course_classes]), subject.short_name
+ "".join([c.short_name for c in course_classes]),
+ subject.short_name,
)
group_name = "{}: {}".format(
- ", ".join([c.short_name for c in course_classes]), subject.short_name
+ ", ".join([c.short_name for c in course_classes]),
+ subject.short_name,
)
# Get or create course group
@@ -229,7 +233,9 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
lesson.teachers.set(teachers)
# All times for this course
- old_lesson_periods_qs = chronos_models.LessonPeriod.objects.filter(lesson=lesson)
+ old_lesson_periods_qs = chronos_models.LessonPeriod.objects.filter(
+ lesson=lesson
+ )
# If length has changed, delete all lesson periods
if old_lesson_periods_qs.count() != len(time_periods):
@@ -253,7 +259,10 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
# Update old lesson period
old_lesson_period = old_lesson_period_qs[0]
- if old_lesson_period.period != time_period or old_lesson_period.room != room:
+ if (
+ old_lesson_period.period != time_period
+ or old_lesson_period.room != room
+ ):
old_lesson_period.period = time_period
old_lesson_period.room = room
old_lesson_period.save()
diff --git a/aleksis/apps/untis/util/mysql/importers/substitutions.py b/aleksis/apps/untis/util/mysql/importers/substitutions.py
index e2d5fa7..a1ca443 100644
--- a/aleksis/apps/untis/util/mysql/importers/substitutions.py
+++ b/aleksis/apps/untis/util/mysql/importers/substitutions.py
@@ -26,9 +26,14 @@ 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 """
+ """Import substitutions."""
term = get_term()
date_start = untis_date_to_date(term.datefrom)
@@ -133,7 +138,10 @@ def import_substitutions(
classes.append(classes_ref[id])
if lesson_period:
- (substitution, created,) = chronos_models.LessonSubstitution.objects.get_or_create(
+ (
+ substitution,
+ created,
+ ) = chronos_models.LessonSubstitution.objects.get_or_create(
lesson_period=lesson_period, week=week.week
)
@@ -166,13 +174,18 @@ 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,
@@ -206,7 +219,9 @@ def import_substitutions(
substitution,
created,
) = chronos_models.SupervisionSubstitution.objects.get_or_create(
- supervision=supervision, date=date, defaults={"teacher": teacher_new},
+ supervision=supervision,
+ date=date,
+ defaults={"teacher": teacher_new},
)
if created:
@@ -222,7 +237,9 @@ def import_substitutions(
logger.info(" Supervision substitution updated")
# Delete all no longer existing substitutions
- for s in chronos_models.LessonSubstitution.objects.within_dates(date_start, date_end):
+ for s in chronos_models.LessonSubstitution.objects.within_dates(
+ date_start, date_end
+ ):
if s.import_ref_untis and s.import_ref_untis not in existing_subs:
logger.info("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 dc60421..8819a04 100644
--- a/aleksis/apps/untis/util/mysql/main.py
+++ b/aleksis/apps/untis/util/mysql/main.py
@@ -42,9 +42,16 @@ def untis_import_mysql():
import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, classes_ref)
# Substitutions
- import_absences(absence_reasons_ref, time_periods_ref, teachers_ref, classes_ref, rooms_ref)
+ 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
+ teachers_ref,
+ subjects_ref,
+ rooms_ref,
+ classes_ref,
+ supervision_areas_ref,
+ time_periods_ref,
)
# Events
diff --git a/aleksis/apps/untis/util/mysql/util.py b/aleksis/apps/untis/util/mysql/util.py
index 57c53c8..259967b 100644
--- a/aleksis/apps/untis/util/mysql/util.py
+++ b/aleksis/apps/untis/util/mysql/util.py
@@ -20,18 +20,19 @@ logger = logging.getLogger(__name__)
def run_using(obj: QuerySet) -> QuerySet:
- """ Seed QuerySet with using() database from global DB_NAME """
+ """Seed QuerySet with using() database from global DB_NAME."""
return obj.using(DB_NAME)
def get_term(for_date: Optional[date] = None) -> mysql_models.Terms:
- """ Get term valid for the provided date """
+ """Get term valid for the provided date."""
if not for_date:
for_date = timezone.now().date()
term = run_using(mysql_models.Terms.objects).get(
- datefrom__lte=date_to_untis_date(for_date), dateto__gte=date_to_untis_date(for_date)
+ datefrom__lte=date_to_untis_date(for_date),
+ dateto__gte=date_to_untis_date(for_date),
)
return term
@@ -43,7 +44,7 @@ def run_default_filter(
filter_term: bool = True,
filter_deleted: bool = True,
) -> QuerySet:
- """ Add a default filter in order to select the correct term """
+ """Add a default filter in order to select the correct term."""
term = get_term(for_date)
term_id, schoolyear_id, school_id, version_id = (
@@ -67,7 +68,8 @@ def run_default_filter(
def clean_array(seq: Sequence, conv: Callable[[Any], Any] = lambda el: el) -> Sequence:
- """ Convert a sequence using a converter function, stripping all
+ """
+ Convert a sequence using a converter function, stripping all
elements that are boolean False after conversion.
>>> clean_array(["a", "", "b"])
@@ -77,7 +79,9 @@ def clean_array(seq: Sequence, conv: Callable[[Any], Any] = lambda el: el) -> Se
[8, 12]
"""
- filtered = filter(lambda el: bool(el), map(lambda el: conv(el) if el else None, seq))
+ filtered = filter(
+ lambda el: bool(el), map(lambda el: conv(el) if el else None, seq)
+ )
return type(seq)(filtered)
@@ -94,17 +98,17 @@ def untis_split_third(s: str, conv: Callable[[Any], Any] = lambda el: el) -> Seq
def untis_date_to_date(untis: int) -> date:
- """ Converts a UNTIS date to a python date """
+ """Converts a UNTIS date to a python date."""
return datetime.strptime(str(untis), UNTIS_DATE_FORMAT).date()
def date_to_untis_date(from_date: date) -> int:
- """ Converts a python date to a UNTIS date """
+ """Converts a python date to a UNTIS date."""
return int(from_date.strftime(UNTIS_DATE_FORMAT))
def untis_colour_to_hex(colour: int) -> str:
- """ Convert a numerical colour in BGR order to a standard hex RGB string """
+ """Convert a numerical colour in BGR order to a standard hex RGB string."""
# Convert UNTIS number to HEX
hex_bgr = str(hex(colour))[2:].zfill(6)
@@ -116,14 +120,16 @@ def untis_colour_to_hex(colour: int) -> str:
return "#" + hex_rgb
-def compare_m2m(a: Union[Sequence[Model], QuerySet], b: Union[Sequence[Model], QuerySet]) -> bool:
- """ Compare if content of two m2m fields is equal """
+def compare_m2m(
+ a: Union[Sequence[Model], QuerySet], b: Union[Sequence[Model], QuerySet]
+) -> bool:
+ """Compare if content of two m2m fields is equal."""
return set(a) == set(b)
def connect_untis_fields(obj: Model, attr: str, limit: int) -> Sequence[str]:
- """ Connects data from multiple DB fields
+ """Connects data from multiple DB fields.
Untis splits structured data, like lists, as comma-separated string into
multiple, numbered database fields, like:
@@ -147,27 +153,27 @@ def connect_untis_fields(obj: Model, attr: str, limit: int) -> Sequence[str]:
def get_first_weekday(time_periods_ref: dict) -> int:
- """ Get first weekday from time periods reference """
+ """Get first weekday from time periods reference."""
return sorted(time_periods_ref.keys())[0]
def get_last_weekday(time_periods_ref: dict) -> int:
- """ Get last weekday from time periods reference """
+ """Get last weekday from time periods reference."""
return sorted(time_periods_ref.keys())[-1]
def get_first_period(time_periods_ref: dict, weekday: int) -> int:
- """ Get first period on a weekday from time periods reference """
+ """Get first period on a weekday from time periods reference."""
return sorted(time_periods_ref[weekday].keys())[0]
def get_last_period(time_periods_ref: dict, weekday: int) -> int:
- """ Get last period an a weekday from time periods reference """
+ """Get last period an a weekday from time periods reference."""
return sorted(time_periods_ref[weekday].keys())[-1]
def move_weekday_to_range(time_periods_ref: dict, weekday: int) -> int:
- """ Move weekday values into school week (e. g. saturday to friday) """
+ """Move weekday values into school week (e. g. saturday to friday)."""
first_weekday = get_first_weekday(time_periods_ref)
last_weekday = get_last_weekday(time_periods_ref)
diff --git a/aleksis/apps/untis/util/xml/xml.py b/aleksis/apps/untis/util/xml/xml.py
index 7a03921..d9e6202 100644
--- a/aleksis/apps/untis/util/xml/xml.py
+++ b/aleksis/apps/untis/util/xml/xml.py
@@ -132,7 +132,11 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
else None
)
date_end = (
- date(int(effectiveenddate[:4]), int(effectiveenddate[4:6]), int(effectiveenddate[6:]),)
+ date(
+ int(effectiveenddate[:4]),
+ int(effectiveenddate[4:6]),
+ int(effectiveenddate[6:]),
+ )
if effectiveenddate
else None
)
@@ -144,7 +148,9 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
try:
groups = [Group.objects.get(short_name=v) for v in group_short_names]
except Group.DoesNotExist:
- messages.error(request, _("Invalid list of classes: %s") % ", ".join(group_short_names))
+ messages.error(
+ request, _("Invalid list of classes: %s") % ", ".join(group_short_names)
+ )
continue
try:
@@ -152,11 +158,14 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
except Person.DoesNotExist:
messages.error(
request,
- _("Failed to import lesson: Teacher %s does not exist.") % teacher_short_name,
+ _("Failed to import lesson: Teacher %s does not exist.")
+ % teacher_short_name,
)
continue
- lesson = Lesson.objects.create(subject=subject, date_start=date_start, date_end=date_end)
+ lesson = Lesson.objects.create(
+ subject=subject, date_start=date_start, date_end=date_end
+ )
lesson.groups.set(groups)
lesson.teachers.set(teachers)
diff --git a/aleksis/apps/untis/views.py b/aleksis/apps/untis/views.py
index d692841..d78cbb7 100644
--- a/aleksis/apps/untis/views.py
+++ b/aleksis/apps/untis/views.py
@@ -31,7 +31,7 @@ def xml_import(request: HttpRequest) -> HttpResponse:
@permission_required("untis.assign_subjects_to_groups")
def groups_subjects(request: HttpRequest) -> HttpResponse:
- """ Assign subjects to groups (for matching by MySQL importer) """
+ """Assign subjects to groups (for matching by MySQL importer)."""
context = {}
groups_qs = Group.objects.all()
@@ -43,7 +43,9 @@ 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":
--
GitLab