Fix bugs of substitution plan (#1662)

Tests would have prevented adding the bugs in #1647 :(
SharezoneApp · Jun 10, 2024 · aaed4ac · aaed4ac
1 parent 561e947
commit aaed4ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/lib/dashboard/bloc/build_lesson_views.dart b/app/lib/dashboard/bloc/build_lesson_views.dart
@@ -18,7 +18,8 @@ List<LessonView> _buildSortedViews(
 
   final views = [
     for (final lesson in lessons)
-      if (lesson.getSubstitutionFor(date) is! LessonCanceledSubstitution)
+      if (lesson.getSubstitutionFor(date).getLessonCanceledSubstitution() ==
+          null)
         _buildLessonView(
           lesson,
           groupInfo: groupInfoOf(lesson),

diff --git a/app/lib/timetable/timetable_page/lesson/substitution_section.dart b/app/lib/timetable/timetable_page/lesson/substitution_section.dart
@@ -51,7 +51,7 @@ class _SubstitutionSection extends StatelessWidget {
         if (canceledSubstitution != null)
           _LessonCanceledCard(
             courseId: lesson.groupID,
-            createdBy: locationSubstitution!.createdBy,
+            createdBy: canceledSubstitution.createdBy,
             hasPermissionsToManageLessons: hasPermissionsToManageLessons,
           ),
         if (locationSubstitution != null)

diff --git a/app/lib/timetable/timetable_page/lesson/timetable_lesson_tile.dart b/app/lib/timetable/timetable_page/lesson/timetable_lesson_tile.dart
@@ -34,7 +34,7 @@ class TimetableEntryLesson extends StatelessWidget {
   Widget build(BuildContext context) {
     final canceledDesign = Design.fromColor(Colors.grey[600]!);
     final substitutions = lesson.getSubstitutionFor(date);
-    final isCanceled = substitutions is LessonCanceledSubstitution;
+    final isCanceled = substitutions.getLessonCanceledSubstitution() != null;
     final design = isCanceled ? canceledDesign : groupInfo?.design;
     final newLocation =
         substitutions.getLocationChangedSubstitution()?.newLocation;