From b839e6aa0eebe16b9522eaa32e60b6cffe6910fb Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 17 Sep 2020 20:46:32 +0200
Subject: [PATCH] Reformat
---
.../commands/untis_import_mysql_all.py | 2 +-
.../untis/migrations/0002_auto_20200820_1542.py | 17 +++++++++++++++++
aleksis/apps/untis/tasks.py | 4 ++--
.../apps/untis/util/mysql/importers/terms.py | 7 ++++---
aleksis/apps/untis/util/mysql/main.py | 5 +----
5 files changed, 25 insertions(+), 10 deletions(-)
create mode 100644 aleksis/apps/untis/migrations/0002_auto_20200820_1542.py
diff --git a/aleksis/apps/untis/management/commands/untis_import_mysql_all.py b/aleksis/apps/untis/management/commands/untis_import_mysql_all.py
index 8d18407..0783196 100644
--- a/aleksis/apps/untis/management/commands/untis_import_mysql_all.py
+++ b/aleksis/apps/untis/management/commands/untis_import_mysql_all.py
@@ -1,6 +1,6 @@
from django.core.management.base import BaseCommand
-from ...tasks import untis_import_mysql_current_term, untis_import_mysql_all_terms
+from ...tasks import untis_import_mysql_all_terms, untis_import_mysql_current_term
class Command(BaseCommand):
diff --git a/aleksis/apps/untis/migrations/0002_auto_20200820_1542.py b/aleksis/apps/untis/migrations/0002_auto_20200820_1542.py
new file mode 100644
index 0000000..a3d7948
--- /dev/null
+++ b/aleksis/apps/untis/migrations/0002_auto_20200820_1542.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.9 on 2020-08-20 13:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('untis', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='globalpermissions',
+ options={'managed': False, 'permissions': (('do_xml_import', 'Kann XML-Import durchführen'), ('assign_subjects_to_groups', 'Kann Fächer zu Gruppen zuzuordnen'))},
+ ),
+ ]
diff --git a/aleksis/apps/untis/tasks.py b/aleksis/apps/untis/tasks.py
index b48e456..256dcba 100644
--- a/aleksis/apps/untis/tasks.py
+++ b/aleksis/apps/untis/tasks.py
@@ -1,8 +1,7 @@
from aleksis.apps.untis.util.mysql.importers.terms import (
- get_terms_for_date,
get_future_terms_for_date,
+ get_terms_for_date,
)
-
from aleksis.core.util.core_helpers import celery_optional
from .util.mysql.main import untis_import_mysql as _untis_import_mysql
@@ -37,6 +36,7 @@ def untis_import_mysql_current_next_term():
terms = terms.union(future_terms[0:1])
_untis_import_mysql(terms)
+
@celery_optional
def untis_import_mysql_current_future_terms():
"""Celery task for import of UNTIS data from MySQL (current and future terms)."""
diff --git a/aleksis/apps/untis/util/mysql/importers/terms.py b/aleksis/apps/untis/util/mysql/importers/terms.py
index e9c0fe8..fec353f 100644
--- a/aleksis/apps/untis/util/mysql/importers/terms.py
+++ b/aleksis/apps/untis/util/mysql/importers/terms.py
@@ -31,6 +31,7 @@ def get_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
return qs
+
def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
"""Get all furture terms (after the current term)."""
@@ -44,8 +45,6 @@ def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
return qs
-
-
logger = logging.getLogger(__name__)
@@ -88,7 +87,9 @@ 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} ...")
diff --git a/aleksis/apps/untis/util/mysql/main.py b/aleksis/apps/untis/util/mysql/main.py
index 6813f08..d0902af 100644
--- a/aleksis/apps/untis/util/mysql/main.py
+++ b/aleksis/apps/untis/util/mysql/main.py
@@ -5,10 +5,7 @@ from django.db.models import QuerySet
from tqdm import tqdm
-from aleksis.apps.untis.util.mysql.importers.terms import (
- get_terms_for_date,
- import_terms,
-)
+from aleksis.apps.untis.util.mysql.importers.terms import import_terms
from aleksis.apps.untis.util.mysql.util import TQDM_DEFAULTS
from .importers.absences import import_absences
--
GitLab