Skip to content
Snippets Groups Projects
Commit 40a2a7b8 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'use-change-tracker-from-chronos' into 'master'

Use new change tracker from Chronos

See merge request AlekSIS/official/AlekSIS-App-Untis!127
parents 54d7c425 e8ff9dae
Branches
Tags
Loading
...@@ -20,6 +20,7 @@ Changed ...@@ -20,6 +20,7 @@ Changed
* Let untis_import_mysql management command default to ``current`` instead of all * Let untis_import_mysql management command default to ``current`` instead of all
to prevent accidental imports of old plans to prevent accidental imports of old plans
* Use new change tracker from Chronos to trigger notifications
Fixed Fixed
~~~~~ ~~~~~
......
...@@ -5,6 +5,7 @@ from django.db.models import QuerySet ...@@ -5,6 +5,7 @@ from django.db.models import QuerySet
import reversion import reversion
from tqdm import tqdm from tqdm import tqdm
from aleksis.apps.chronos.util.change_tracker import TimetableDataChangeTracker
from aleksis.apps.untis.util.mysql.importers.terms import import_terms from aleksis.apps.untis.util.mysql.importers.terms import import_terms
from aleksis.apps.untis.util.mysql.util import TQDM_DEFAULTS from aleksis.apps.untis.util.mysql.util import TQDM_DEFAULTS
...@@ -35,6 +36,8 @@ def untis_import_mysql(terms: Optional[QuerySet] = None, version: Optional[int] ...@@ -35,6 +36,8 @@ def untis_import_mysql(terms: Optional[QuerySet] = None, version: Optional[int]
with reversion.create_revision(atomic=True): with reversion.create_revision(atomic=True):
reversion.set_comment(f"Untis import for validity range {validity_range}") reversion.set_comment(f"Untis import for validity range {validity_range}")
tracker = TimetableDataChangeTracker()
# Common data for Chronos # Common data for Chronos
subjects_ref = import_subjects(validity_range) subjects_ref = import_subjects(validity_range)
rooms_ref = import_rooms(validity_range) rooms_ref = import_rooms(validity_range)
......
...@@ -41,8 +41,8 @@ python = "^3.9" ...@@ -41,8 +41,8 @@ python = "^3.9"
mysqlclient = "^2.0.0" mysqlclient = "^2.0.0"
tqdm = "^4.44.1" tqdm = "^4.44.1"
defusedxml = "^0.7.0" defusedxml = "^0.7.0"
aleksis-core = "^2.0" aleksis-core = "^2.8"
aleksis-app-chronos = "^2.0" aleksis-app-chronos = "^2.3"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment