From 7d4272899eeeab0fa77d43c2093710b485fc1b28 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 20 Apr 2020 17:50:46 +0200
Subject: [PATCH] Fix MySQL importer
---
aleksis/apps/untis/util/mysql/importers/common_data.py | 2 +-
aleksis/apps/untis/util/mysql/importers/substitutions.py | 4 ++--
aleksis/apps/untis/util/mysql/util.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aleksis/apps/untis/util/mysql/importers/common_data.py b/aleksis/apps/untis/util/mysql/importers/common_data.py
index e539af7..12d7a88 100644
--- a/aleksis/apps/untis/util/mysql/importers/common_data.py
+++ b/aleksis/apps/untis/util/mysql/importers/common_data.py
@@ -416,7 +416,7 @@ def import_time_periods() -> Dict[int, Dict[int, chronos_models.TimePeriod]]:
periods = (
run_default_filter(mysql_models.Commondata.objects, filter_term=False)
- .filter(id=CommonDataId.PERIOD)
+ .filter(id=CommonDataId.PERIOD.value)
.order_by("number", "number1")
)
diff --git a/aleksis/apps/untis/util/mysql/importers/substitutions.py b/aleksis/apps/untis/util/mysql/importers/substitutions.py
index 2f62bf2..33f6214 100644
--- a/aleksis/apps/untis/util/mysql/importers/substitutions.py
+++ b/aleksis/apps/untis/util/mysql/importers/substitutions.py
@@ -65,9 +65,9 @@ def import_substitutions(teachers_ref, subjects_ref, rooms_ref, classes_ref, sup
# Cancellation?
cancelled, cancelled_for_teachers = False, False
- if SubstitutionFlag.CANCELLED in sub.flags:
+ if SubstitutionFlag.CANCELLED.value in sub.flags:
cancelled = True
- elif SubstitutionFlag.CANCELLED_FOR_TEACHERS in sub.flags:
+ elif SubstitutionFlag.CANCELLED_FOR_TEACHERS.value in sub.flags:
cancelled_for_teachers = True
# Comment
diff --git a/aleksis/apps/untis/util/mysql/util.py b/aleksis/apps/untis/util/mysql/util.py
index db76b41..57c53c8 100644
--- a/aleksis/apps/untis/util/mysql/util.py
+++ b/aleksis/apps/untis/util/mysql/util.py
@@ -1,5 +1,5 @@
import logging
-from datetime import date
+from datetime import date, datetime
from typing import Any, Callable, Optional, Sequence, Union
from django.db.models import Model, QuerySet
@@ -78,7 +78,7 @@ def clean_array(seq: Sequence, conv: Callable[[Any], Any] = lambda el: el) -> Se
"""
filtered = filter(lambda el: bool(el), map(lambda el: conv(el) if el else None, seq))
- return type(a)(filtered)
+ return type(seq)(filtered)
def untis_split_first(s: str, conv: Callable[[Any], Any] = lambda el: el) -> Sequence:
--
GitLab