Port minitimetables to bundles

aleksis/apps/lesrooster/frontend/components/timetable_management/timetables/MiniTimeTable.vue

@@ -73,10 +73,10 @@ export default defineComponent({
       );
 
       this.lessons?.forEach((lesson) => {
-        const weekdayStart = lesson.slotStart.weekday;
-        const weekdayEnd = lesson.slotEnd.weekday;
-        const periodStart = lesson.slotStart.period;
-        const periodEnd = lesson.slotEnd.period;
+        const weekdayStart = lesson.bundle[0].slotStart.weekday;
+        const weekdayEnd = lesson.bundle[0].slotEnd.weekday;
+        const periodStart = lesson.bundle[0].slotStart.period;
+        const periodEnd = lesson.bundle[0].slotEnd.period;
 
         // If lesson start and end is on the same day, just add it in between the periods
         if (weekdayStart === weekdayEnd) {

aleksis/apps/lesrooster/frontend/components/timetable_management/timetables/timetables.graphql

@@ -4,15 +4,18 @@ query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
     timeGrid: $timeGrid
   ) {
     id
-    slotStart {
-      id
-      period
-      weekday
-    }
-    slotEnd {
-      id
-      period
-      weekday
+    bundle {
+      slotStart {
+        id
+        period
+        weekday
+      }
+      slotEnd {
+        id
+        period
+        weekday
+      }
+      recurrence
     }
     subject {
       id
@@ -50,7 +53,6 @@ query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
         shortName
       }
     }
-    recurrence
     canEdit
     canDelete
   }
@@ -59,15 +61,18 @@ query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
 query lessonsRoom($room: ID!, $timeGrid: ID!) {
   lessonsRoom: lessonsForRoom(room: $room, timeGrid: $timeGrid) {
     id
-    slotStart {
-      id
-      period
-      weekday
-    }
-    slotEnd {
-      id
-      period
-      weekday
+    bundle {
+      slotStart {
+        id
+        period
+        weekday
+      }
+      slotEnd {
+        id
+        period
+        weekday
+      }
+      recurrence
     }
     subject {
       id
@@ -105,7 +110,6 @@ query lessonsRoom($room: ID!, $timeGrid: ID!) {
         shortName
       }
     }
-    recurrence
     canEdit
     canDelete
   }

aleksis/apps/lesrooster/schema/lesson.py

@@ -24,7 +24,7 @@ class LessonType(
 ):
     class Meta:
         model = Lesson
-        fields = ("id", "course", "rooms", "teachers", "subject")
+        fields = ("id", "bundle", "course", "rooms", "teachers", "subject")
         filter_fields = {
             "id": ["exact"],
         }