Merge branch 'master' into 41-create-match-failures-as-data-checks

CHANGELOG.rst

@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Changed
+~~~~~~~
+
+* Do not import incomplete substitutions.
+
 `2.1.1`_ - 2022-01-29
 ---------------------
 

aleksis/apps/untis/preferences.py

@@ -108,3 +108,10 @@ class CreateObjectsForWhichUntisIsNotPrimarySource(BooleanPreference):
     name = "create_objects_untis_not_primary_source"
     default = True
     verbose_name = _("Create objects for which Untis is not primary source")
+
+
+class IgnoreIncompleteSubstitutions(BooleanPreference):
+    section = untis_mysql
+    name = "ignore_incomplete_substitutions"
+    default = True
+    verbose_name = _("Ignore incomplete substitutions")

aleksis/apps/untis/util/mysql/importers/substitutions.py

@@ -8,6 +8,7 @@ from tqdm import tqdm
 
 from aleksis.apps.chronos import models as chronos_models
 from aleksis.apps.chronos.models import ValidityRange
+from aleksis.core.util.core_helpers import get_site_preferences
 
 from .... import models as mysql_models
 from ..util import (
@@ -138,6 +139,17 @@ def import_substitutions(
             for id_ in class_ids:
                 classes.append(classes_ref[id_])
 
+            if get_site_preferences()["untis_mysql__ignore_incomplete_substitutions"]:
+                # Skip incomplete substitutions
+                if (
+                    not room_new
+                    and not subject_new
+                    and not teachers
+                    and not cancelled
+                    and not cancelled_for_teachers
+                ):
+                    continue
+
             if lesson_period:
                 (substitution, created,) = chronos_models.LessonSubstitution.objects.get_or_create(
                     lesson_period=lesson_period, week=week.week, year=week.year