Fix null phase data in timetable overview

2026-08-18 20:31:12 +02:00
parent a0f44f1b25
commit 462080ab92
2 changed files with 25 additions and 4 deletions
@@ -387,10 +387,10 @@ public partial class TimetableViewModel : ObservableObject
    }

    private static bool MentionsExperiment(Lesson? lesson) =>
-        lesson is not null && lesson.Phases.Any(p =>
-            p.Name.Contains("Experiment", StringComparison.OrdinalIgnoreCase) ||
-            p.Activity.Contains("Experiment", StringComparison.OrdinalIgnoreCase) ||
-            p.Material.Contains("Experiment", StringComparison.OrdinalIgnoreCase));
+        lesson?.Phases?.Any(p => p is not null &&
+            (p.Name?.Contains("Experiment", StringComparison.OrdinalIgnoreCase) == true ||
+             p.Activity?.Contains("Experiment", StringComparison.OrdinalIgnoreCase) == true ||
+             p.Material?.Contains("Experiment", StringComparison.OrdinalIgnoreCase) == true)) == true;

    /// <summary>Fällt <paramref name="date"/> auf einen gesetzlichen Feiertag oder in Schulferien?</summary>
    private static bool IsFreeDay(DateOnly date, List<SchoolHoliday> schoolHolidays, HashSet<DateOnly> publicHolidayDates) =>