Add util function to connect data which are split by UNTIS in different fields

- Use it for lessons and supervisions

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

@@ -8,7 +8,7 @@ from aleksis.apps.chronos import models as chronos_models
 from aleksis.core import models as core_models
 
 from .... import models as mysql_models
-from ..util import run_default_filter, untis_colour_to_hex, untis_split_first, sync_m2m
+from ..util import run_default_filter, untis_colour_to_hex, untis_split_first, sync_m2m, connect_untis_fields
 
 logger = logging.getLogger(__name__)
 
@@ -338,8 +338,7 @@ def import_supervision_areas(
         logger.info("  Import supervisions for this area")
 
         # Parse raw data
-        raw_untis_data = area.breaksupervision1
-        raw_supervisions = untis_split_first(raw_untis_data)
+        raw_supervisions = connect_untis_fields(area, "breaksupervision", 16)
 
         supervisions_ref = {}
         for raw_supervision in raw_supervisions:

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

@@ -8,7 +8,15 @@ from aleksis.core import models as core_models
 from aleksis.core.util import messages
 
 from .... import models as mysql_models
-from ..util import run_default_filter, untis_split_third, untis_date_to_date, get_term, sync_m2m, compare_m2m
+from ..util import (
+    run_default_filter,
+    untis_split_third,
+    untis_date_to_date,
+    get_term,
+    sync_m2m,
+    compare_m2m,
+    connect_untis_fields,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +43,7 @@ def import_lessons(
             continue
 
         # Split data (,)
-        raw_lesson_data = lesson.lessonelement1.split(",")
+        raw_lesson_data = connect_untis_fields(lesson, "lessonelement", 10)
         raw_time_data = lesson.lesson_tt.split(",")
 
         raw_time_data_2 = []