diff --git a/aleksis/apps/untis/menus.py b/aleksis/apps/untis/menus.py
index 47e440dcdf70bbbd1566baadf6fc054f926b0924..901edd81d2b13ccd4e6a1e55e74ce0ef4cef8dcc 100644
--- a/aleksis/apps/untis/menus.py
+++ b/aleksis/apps/untis/menus.py
@@ -6,10 +6,7 @@ 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 503e274ce3fd1c00323171d49055fe9c2c78ce15..d71333f6f52122b8121cf163333dbaecd4a8972e 100644
--- a/aleksis/apps/untis/model_extensions.py
+++ b/aleksis/apps/untis/model_extensions.py
@@ -6,61 +6,39 @@ from aleksis.apps.chronos import models as chronos_models
from aleksis.core import models as core_models
core_models.SchoolTerm.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.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)
)
# Chronos models
chronos_models.ValidityRange.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.ValidityRange.field(
- school_year_untis=IntegerField(
- verbose_name=_("UNTIS school year ID"), null=True, blank=True
- )
+ school_year_untis=IntegerField(verbose_name=_("UNTIS school year ID"), null=True, blank=True)
)
chronos_models.ValidityRange.field(
- school_id_untis=IntegerField(
- verbose_name=_("UNTIS school id"), null=True, blank=True
- )
+ school_id_untis=IntegerField(verbose_name=_("UNTIS school id"), null=True, blank=True)
)
chronos_models.ValidityRange.field(
- version_id_untis=IntegerField(
- verbose_name=_("UNTIS version id"), null=True, blank=True
- )
+ version_id_untis=IntegerField(verbose_name=_("UNTIS version id"), null=True, blank=True)
)
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(
@@ -73,37 +51,23 @@ 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 1de4bf108201e612dc9847b6825bf48b2f317180..58f7d58e90f23c2fd11985da7646fa4d02db2c3e 100644
--- a/aleksis/apps/untis/models.py
+++ b/aleksis/apps/untis/models.py
@@ -13,15 +13,9 @@ 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.
@@ -46,9 +40,7 @@ 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.
@@ -93,12 +85,8 @@ 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.
@@ -136,21 +124,15 @@ 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
@@ -193,16 +175,10 @@ 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
@@ -238,15 +214,9 @@ 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.
@@ -281,21 +251,15 @@ 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
@@ -344,16 +308,10 @@ 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.
@@ -559,27 +517,19 @@ 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.
@@ -729,15 +679,7 @@ 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",),
)
@@ -745,15 +687,9 @@ 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.
@@ -846,15 +782,9 @@ 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.
@@ -919,24 +849,16 @@ 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.
@@ -968,24 +890,16 @@ 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.
@@ -1011,24 +925,16 @@ 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.
@@ -1057,21 +963,15 @@ 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
@@ -1168,12 +1068,8 @@ 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
@@ -1264,12 +1160,8 @@ 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
@@ -1318,17 +1210,11 @@ 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
@@ -1360,17 +1246,11 @@ 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
@@ -1423,16 +1303,10 @@ 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.
@@ -1455,24 +1329,16 @@ 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.
@@ -1514,15 +1380,9 @@ 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
@@ -1648,16 +1508,10 @@ 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.
@@ -1851,24 +1705,16 @@ 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.
@@ -1948,28 +1794,20 @@ 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.
@@ -2002,14 +1840,7 @@ 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",),
)
@@ -2017,25 +1848,13 @@ 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.
@@ -2067,12 +1886,8 @@ 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.
@@ -2131,24 +1946,16 @@ 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.
@@ -2201,25 +2008,17 @@ 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.
@@ -2317,24 +2116,16 @@ 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.
@@ -2369,9 +2160,7 @@ 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):
@@ -2430,9 +2219,7 @@ 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.
@@ -2462,15 +2249,9 @@ 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
@@ -2521,24 +2302,16 @@ 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.
@@ -2637,18 +2410,10 @@ 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
@@ -2682,14 +2447,7 @@ 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",),
)
@@ -2697,15 +2455,9 @@ 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.
@@ -2737,24 +2489,16 @@ 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.
@@ -2792,24 +2536,16 @@ 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.
@@ -2935,15 +2671,9 @@ 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.
@@ -3044,21 +2774,15 @@ 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.
@@ -3086,13 +2810,7 @@ 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",),
)
@@ -3100,15 +2818,9 @@ 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
@@ -3444,21 +3156,15 @@ 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(
@@ -3496,18 +3202,10 @@ 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.
@@ -3791,24 +3489,16 @@ 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.
@@ -3846,21 +3536,15 @@ 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
@@ -3900,15 +3584,9 @@ 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.
@@ -3950,12 +3628,8 @@ 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
@@ -3975,9 +3649,7 @@ 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
@@ -4207,15 +3879,9 @@ 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
@@ -4257,21 +3923,15 @@ 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.
@@ -4325,12 +3985,8 @@ 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 615de133755aaef464029a41937673b5bd5ff8fe..bae4454f9d1d7766eeeb2feb8ec071236cf0e950 100644
--- a/aleksis/apps/untis/preferences.py
+++ b/aleksis/apps/untis/preferences.py
@@ -79,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/util/mysql/importers/absences.py b/aleksis/apps/untis/util/mysql/importers/absences.py
index eeb5f96d7cbf967b4a2c321f1925c1bf59ee13f4..cf3e3386abd31cdcd612e5437585fb29f1eb1f3f 100644
--- a/aleksis/apps/untis/util/mysql/importers/absences.py
+++ b/aleksis/apps/untis/util/mysql/importers/absences.py
@@ -42,9 +42,7 @@ def import_absences(
# Get absences
absences = (
- run_default_filter(
- validity_range, mysql_models.Absence.objects, filter_term=False
- )
+ run_default_filter(validity_range, mysql_models.Absence.objects, filter_term=False)
.filter(datefrom__lte=untis_term_end, dateto__gte=untis_term_start)
.order_by("absence_id")
)
diff --git a/aleksis/apps/untis/util/mysql/importers/common_data.py b/aleksis/apps/untis/util/mysql/importers/common_data.py
index 94173de6668f1a16caae46b04185f333d12eabb6..791d02a18365092370f6a3c926c16c6083a070a4 100644
--- a/aleksis/apps/untis/util/mysql/importers/common_data.py
+++ b/aleksis/apps/untis/util/mysql/importers/common_data.py
@@ -31,9 +31,7 @@ def import_subjects(validity_range: ValidityRange) -> Dict[int, chronos_models.S
subjects_ref = {}
# Get subjects
- subjects = run_default_filter(
- validity_range, mysql_models.Subjects.objects, filter_term=False
- )
+ subjects = run_default_filter(validity_range, mysql_models.Subjects.objects, filter_term=False)
for subject in tqdm(subjects, desc="Import subjects", **TQDM_DEFAULTS):
# Check if needed data are provided
@@ -175,9 +173,7 @@ def import_classes(
# Check if needed data are provided
if not class_.name:
raise RuntimeError(
- "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
@@ -191,8 +187,7 @@ def import_classes(
try:
new_group = core_models.Group.objects.get(
- short_name__iexact=short_name,
- school_term__in=[None, validity_range.school_term],
+ short_name__iexact=short_name, school_term__in=[None, validity_range.school_term],
)
except core_models.Group.DoesNotExist:
new_group = core_models.Group.objects.create(
@@ -213,10 +208,7 @@ def import_classes(
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")
@@ -256,9 +248,7 @@ def import_rooms(validity_range: ValidityRange) -> Dict[int, chronos_models.Room
for room in tqdm(rooms, desc="Import rooms", **TQDM_DEFAULTS):
if not room.name:
raise RuntimeError(
- "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
@@ -269,8 +259,7 @@ def import_rooms(validity_range: ValidityRange) -> 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:
@@ -278,10 +267,7 @@ def import_rooms(validity_range: ValidityRange) -> 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")
@@ -306,9 +292,7 @@ def import_supervision_areas(
ref = {}
# Get supervision areas
- areas = run_default_filter(
- validity_range, mysql_models.Corridor.objects, filter_term=False
- )
+ areas = run_default_filter(validity_range, mysql_models.Corridor.objects, filter_term=False)
for area in tqdm(areas, desc="Import supervision areas", **TQDM_DEFAULTS):
if not area.name:
@@ -428,9 +412,7 @@ def import_time_periods(
) -> Dict[int, Dict[int, chronos_models.TimePeriod]]:
"""Import time periods an breaks."""
times = (
- run_default_filter(
- validity_range, mysql_models.Commondata.objects, filter_term=False
- )
+ run_default_filter(validity_range, mysql_models.Commondata.objects, filter_term=False)
.filter(id=30)
.order_by("number")
)
@@ -446,9 +428,7 @@ def import_time_periods(
times_ref[period] = (start_time, end_time)
periods = (
- run_default_filter(
- validity_range, mysql_models.Commondata.objects, filter_term=False
- )
+ run_default_filter(validity_range, mysql_models.Commondata.objects, filter_term=False)
.filter(id=CommonDataId.PERIOD.value)
.order_by("number", "number1")
)
@@ -460,9 +440,7 @@ def import_time_periods(
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,
@@ -474,10 +452,7 @@ def import_time_periods(
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()
@@ -505,9 +480,7 @@ 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):
@@ -568,8 +541,7 @@ def import_absence_reasons(
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/events.py b/aleksis/apps/untis/util/mysql/importers/events.py
index d54a7e62b256d2bd2624fd6f97ba2f69fcbc6fda..2492124984d850f29efaaaa32b96706a8b1193fb 100644
--- a/aleksis/apps/untis/util/mysql/importers/events.py
+++ b/aleksis/apps/untis/util/mysql/importers/events.py
@@ -21,19 +21,13 @@ logger = logging.getLogger(__name__)
def import_events(
- validity_range: ValidityRange,
- time_periods_ref,
- teachers_ref,
- classes_ref,
- rooms_ref,
+ validity_range: ValidityRange, time_periods_ref, teachers_ref, classes_ref, rooms_ref,
):
ref = {}
# Get absences
events = (
- run_default_filter(
- validity_range, mysql_models.Event.objects, filter_term=False
- )
+ run_default_filter(validity_range, mysql_models.Event.objects, filter_term=False)
.filter(
datefrom__lte=date_to_untis_date(validity_range.date_end),
dateto__gte=date_to_untis_date(validity_range.date_start),
@@ -140,8 +134,7 @@ def import_events(
# Delete all no longer existing events
for e in chronos_models.Event.objects.filter(
- date_start__lte=validity_range.date_start,
- date_end__gte=validity_range.date_end,
+ date_start__lte=validity_range.date_start, date_end__gte=validity_range.date_end,
):
if e.import_ref_untis and e.import_ref_untis not in existing_events:
logger.info("Event {} deleted".format(e.id))
diff --git a/aleksis/apps/untis/util/mysql/importers/holidays.py b/aleksis/apps/untis/util/mysql/importers/holidays.py
index 462d612913371ab0072d7b677913c23de6426b8b..cd34a05dbaa943599809bfaf0f6a8bd9f6e1a85b 100644
--- a/aleksis/apps/untis/util/mysql/importers/holidays.py
+++ b/aleksis/apps/untis/util/mysql/importers/holidays.py
@@ -17,9 +17,7 @@ def import_holidays(validity_range: ValidityRange) -> Dict[int, chronos_models.H
ref = {}
# Get holidays
- holidays = run_default_filter(
- validity_range, mysql_models.Holiday.objects, filter_term=False
- )
+ holidays = run_default_filter(validity_range, mysql_models.Holiday.objects, filter_term=False)
for holiday in tqdm(holidays, desc="Import holidays", **TQDM_DEFAULTS):
import_ref = holiday.holiday_id
@@ -27,9 +25,7 @@ def import_holidays(validity_range: ValidityRange) -> Dict[int, chronos_models.H
# Check if needed data are provided
if not holiday.name:
raise RuntimeError(
- "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 2eb8e9de80b81d5fd620e818fc1efd29070d038d..b5d69fe1a51f49df73bfb8f6f08823e5ab66a20a 100644
--- a/aleksis/apps/untis/util/mysql/importers/lessons.py
+++ b/aleksis/apps/untis/util/mysql/importers/lessons.py
@@ -116,12 +116,8 @@ def import_lessons(
# Search by parent groups and subject
qs = core_models.Group.objects.filter(
- parent_groups__in=[c.id for c in course_classes],
- subject_id=subject.id,
- ).filter(
- Q(school_term__isnull=True)
- | Q(school_term=validity_range.school_term)
- )
+ parent_groups__in=[c.id for c in course_classes], subject_id=subject.id,
+ ).filter(Q(school_term__isnull=True) | Q(school_term=validity_range.school_term))
# Check if found groups match
match = False
@@ -139,12 +135,10 @@ def import_lessons(
# 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
@@ -227,9 +221,7 @@ def import_lessons(
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,10 +245,7 @@ def import_lessons(
# 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 ca70456987401347495b874f32bde593f6c8a406..75b8d5c251f83b80872dbbff43debe06e84403a0 100644
--- a/aleksis/apps/untis/util/mysql/importers/substitutions.py
+++ b/aleksis/apps/untis/util/mysql/importers/substitutions.py
@@ -37,9 +37,7 @@ def import_substitutions(
):
"""Import substitutions."""
subs = (
- run_default_filter(
- validity_range, mysql_models.Substitution.objects, filter_term=False
- )
+ run_default_filter(validity_range, mysql_models.Substitution.objects, filter_term=False)
.filter(
date__gte=date_to_untis_date(validity_range.date_start),
date__lte=date_to_untis_date(validity_range.date_end),
@@ -141,10 +139,7 @@ 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, year=week.year
)
@@ -177,18 +172,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,
@@ -223,9 +213,7 @@ 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:
diff --git a/aleksis/apps/untis/util/mysql/importers/terms.py b/aleksis/apps/untis/util/mysql/importers/terms.py
index 2440a9b04c11ff379cbfbd102645cee54df612fb..3b981b665775d68f419ef5fceb251a44bf9c9c08 100644
--- a/aleksis/apps/untis/util/mysql/importers/terms.py
+++ b/aleksis/apps/untis/util/mysql/importers/terms.py
@@ -25,8 +25,7 @@ def get_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
for_date = timezone.now().date()
qs = run_using(mysql_models.Terms.objects).filter(
- 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 qs
@@ -37,9 +36,7 @@ def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
if not for_date:
for_date = timezone.now().date()
- qs = run_using(mysql_models.Terms.objects).filter(
- datefrom__gt=date_to_untis_date(for_date),
- )
+ qs = run_using(mysql_models.Terms.objects).filter(datefrom__gt=date_to_untis_date(for_date),)
return qs
@@ -47,9 +44,7 @@ def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
logger = logging.getLogger(__name__)
-def import_terms(
- qs: Optional[QuerySet] = None,
-) -> Dict[int, chronos_models.ValidityRange]:
+def import_terms(qs: Optional[QuerySet] = None,) -> Dict[int, chronos_models.ValidityRange]:
"""Import terms and school years as validity ranges and school terms."""
ranges_ref = {}
@@ -60,9 +55,7 @@ def import_terms(
for term in tqdm(qs, desc="Import terms (as validity ranges)", **TQDM_DEFAULTS):
if not term.name:
raise RuntimeError(
- "Term ID {}: Cannot import term without short name.".format(
- term.term_id
- )
+ "Term ID {}: Cannot import term without short name.".format(term.term_id)
)
term_id = term.term_id
name = term.longname if term.longname else term.name
@@ -73,9 +66,7 @@ def import_terms(
school_year_id = term.schoolyear_id
try:
- school_term = core_models.SchoolTerm.objects.within_dates(
- date_start, date_end
- ).get()
+ school_term = core_models.SchoolTerm.objects.within_dates(date_start, date_end).get()
logger.info(" School term found by time.")
except core_models.SchoolTerm.DoesNotExist:
if school_year_id in school_terms:
@@ -86,9 +77,7 @@ def import_terms(
schoolyear_id=school_year_id
)
school_term_name = (
- school_year.text
- if school_year.text
- else school_year.schoolyearzoned
+ school_year.text if school_year.text else school_year.schoolyearzoned
)
logger.info(f" Import school year {school_year_id} ...")
@@ -115,9 +104,7 @@ def import_terms(
school_term.save()
try:
- validity_range = chronos_models.ValidityRange.objects.get(
- import_ref_untis=term_id
- )
+ validity_range = chronos_models.ValidityRange.objects.get(import_ref_untis=term_id)
logger.info(" Validity range found by import reference.")
except chronos_models.ValidityRange.DoesNotExist:
try:
diff --git a/aleksis/apps/untis/util/mysql/main.py b/aleksis/apps/untis/util/mysql/main.py
index d0902af6df1be2dd24b455ee2570b7fb5d5a757a..f77c8723fb9b977996d4727e31bbdba5c02038b2 100644
--- a/aleksis/apps/untis/util/mysql/main.py
+++ b/aleksis/apps/untis/util/mysql/main.py
@@ -50,18 +50,11 @@ def untis_import_mysql(terms: Optional[QuerySet] = None):
holidays_ref = import_holidays(validity_range)
# Supervisions
- supervision_areas_ref = import_supervision_areas(
- validity_range, breaks_ref, teachers_ref
- )
+ supervision_areas_ref = import_supervision_areas(validity_range, breaks_ref, teachers_ref)
# Lessons
import_lessons(
- validity_range,
- time_periods_ref,
- rooms_ref,
- subjects_ref,
- teachers_ref,
- classes_ref,
+ validity_range, time_periods_ref, rooms_ref, subjects_ref, teachers_ref, classes_ref,
)
# Substitutions
@@ -84,6 +77,4 @@ def untis_import_mysql(terms: Optional[QuerySet] = None):
)
# Events
- import_events(
- validity_range, time_periods_ref, teachers_ref, classes_ref, rooms_ref
- )
+ import_events(validity_range, time_periods_ref, teachers_ref, classes_ref, rooms_ref)
diff --git a/aleksis/apps/untis/util/mysql/util.py b/aleksis/apps/untis/util/mysql/util.py
index dce08bf93d5be7edc3c144cd745373411452b490..3cbc4ca7c14419e78283a47baac627bca042f5dd 100644
--- a/aleksis/apps/untis/util/mysql/util.py
+++ b/aleksis/apps/untis/util/mysql/util.py
@@ -63,9 +63,7 @@ def clean_array(seq: Sequence, conv: Callable[[Any], Any] = lambda el: el) -> Se
>>> clean_array(["8", "", "12", "0"], int)
[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)
@@ -103,9 +101,7 @@ 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:
+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)
diff --git a/aleksis/apps/untis/util/xml/xml.py b/aleksis/apps/untis/util/xml/xml.py
index a4d15eec2b7f47153df58e04c43ff632b86808cd..dbfe04f297710407571ea867d00a59e64b42ae90 100644
--- a/aleksis/apps/untis/util/xml/xml.py
+++ b/aleksis/apps/untis/util/xml/xml.py
@@ -134,11 +134,7 @@ 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
)
@@ -150,9 +146,7 @@ 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:
@@ -160,14 +154,11 @@ 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)