Merge branch 'fix-subs-import' into 'master'

Fix substitutions import

See merge request !193

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

@@ -156,7 +156,11 @@ def import_absences(
                     amends=ref_object,
                     datetime_start=affected_event["DTSTART"].dt,
                     datetime_end=affected_event["DTEND"].dt,
-                    defaults=dict(cancelled=True),
+                    defaults=dict(
+                        cancelled=True,
+                        slot_number_start=ref_object.slot_number_start,
+                        slot_number_end=ref_object.slot_number_end,
+                    ),
                 )
                 amending_event.extended_data["cancelled_by_absence_untis"] = import_ref
                 amending_event.save()

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

@@ -252,8 +252,8 @@ def import_substitutions(
                         created,
                     ) = SupervisionEvent.objects.update_or_create(
                         amends=supervision.supervision_event,
-                        extended_data__supervision_substitution_ref_untis=sub_id,
-                        defaults={"datetime_start": datetime_start, "datetime_end": datetime_end},
+                        datetime_start=datetime_start,
+                        datetime_end=datetime_end,
                     )
 
                     substitution.teachers.set(teachers)

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

@@ -224,8 +224,11 @@ def update_or_create_lesson_event(amends: CalendarEvent, datetime_start, datetim
         existing_event = CalendarEvent.objects.get(
             amends=amends, datetime_start=datetime_start, datetime_end=datetime_end
         )
-        existing_event.amends = None
-        existing_event.save()
+        if not isinstance(existing_event, LessonEvent):
+            existing_event.amends = None
+            existing_event.save()
+        else:
+            existing_event = None
     except CalendarEvent.DoesNotExist:
         existing_event = None