Vernetzung Stundenplan ↔ Unterrichtsplanung: Terminvorschlag, Lesson-Viewer-Sprung, Verzweigung (4.5.1–4.5.3)

4.5.1: Terminvorschlag für neue Stunden schlägt jetzt auch die Stundennummer vor (bei Doppelstunden die erste Periode), nicht nur den Wochentag — zieht über den bestehenden LessonNumber-Changed-Hook automatisch auch den Stundenbeginn nach. 4.5.2 (teilweise): Klick auf eine Stunde im Stundenplan ("Heute"-Liste und read-only Wochenraster) springt bei bereits vorhandener Lesson direkt in den Verlaufsplan-Viewer statt nur grob zum Planung-Tab. Das Anlegen einer neuen Lesson direkt aus dem Stundenplan bleibt bewusst offen (ungeklärte Unit-Zuordnung, siehe TODO.md). 4.5.3: Der Lesson-Viewer hat jetzt Buttons "Zur Mitarbeit"/"Zu den Noten" zum Weiterverzweigen in die Lerngruppe. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-19 23:39:27 +02:00
parent 52a1d45539
commit 391628ae36
10 changed files with 280 additions and 31 deletions
@@ -470,6 +470,7 @@ public sealed class LessonDialogViewModelTests

        // Nächster Dienstag nach dem 06.01.2099 (einem Dienstag) ist der 13.01.2099.
        Assert.Equal("13.01.2099", vm.DateText);
+        Assert.Equal(3, vm.LessonNumber);
    }

    [Fact]
@@ -489,5 +490,42 @@ public sealed class LessonDialogViewModelTests
        var suggested = DateOnly.ParseExact(vm.DateText, "dd.MM.yyyy");
        Assert.True(suggested >= DateOnly.FromDateTime(DateTime.Today));
        Assert.Equal(weekday, suggested.DayOfWeek);
+        Assert.Equal(3, vm.LessonNumber);
+    }
+
+    [Fact]
+    public void NeueStunde_Doppelstunde_SchlaegtDieErstePeriodeAlsStundennummerVor()
+    {
+        var unitId = Guid.NewGuid();
+        var groupId = Guid.NewGuid();
+        var futureLessonDate = new DateOnly(2099, 1, 6); // Dienstag
+        var lessons = new FakeLessons();
+        lessons.Add(new Lesson { UnitId = unitId, GroupId = groupId, Date = futureLessonDate, LessonNumber = 3 });
+        var slots = new FakeTimetableSlots();
+        slots.Add(new TimetableSlot { GroupId = groupId, Weekday = DayOfWeek.Tuesday, PeriodNumber = 4 });
+        slots.Add(new TimetableSlot { GroupId = groupId, Weekday = DayOfWeek.Tuesday, PeriodNumber = 3 });
+
+        var vm = new LessonDialogViewModel(lessons, new FakeShorthandCodes([]), new FakeAlternativeLessonPaths([]),
+            slots, NewPeriodSchedule(), unitId, groupId, "10c", "Chemie", [], [], null);
+
+        Assert.Equal(3, vm.LessonNumber); // frühere Periode, nicht 4
+    }
+
+    [Fact]
+    public void NeueStunde_MitStundenvorschlag_UebernimmtBeginnAusStundenraster()
+    {
+        var unitId = Guid.NewGuid();
+        var groupId = Guid.NewGuid();
+        var weekday = DateTime.Today.DayOfWeek;
+        var slots = new FakeTimetableSlots();
+        slots.Add(new TimetableSlot { GroupId = groupId, Weekday = weekday, PeriodNumber = 2 });
+        var periodSchedule = NewPeriodSchedule();
+        periodSchedule.SetPeriods([new PeriodTimeEntry { PeriodNumber = 2, Start = new TimeOnly(8, 50), End = new TimeOnly(9, 35) }]);
+
+        var vm = new LessonDialogViewModel(new FakeLessons(), new FakeShorthandCodes([]), new FakeAlternativeLessonPaths([]),
+            slots, periodSchedule, unitId, groupId, "10c", "Chemie", [], [], null);
+
+        Assert.Equal(2, vm.LessonNumber);
+        Assert.Equal("08:50", vm.StartTimeText);
    }
 }
@@ -97,4 +97,34 @@ public sealed class LessonViewerViewModelTests
        Assert.Equal("ab 12:00", vm.PhaseGroups[0].Phases[0].TimeDisplay);
        Assert.Equal("ab 12:00", vm.PhaseGroups[1].Phases[0].TimeDisplay);
    }
+
+    // ── Verzweigung aus dem Viewer (4.5.3) ────────────────────────────────────────
+
+    [Fact]
+    public void NavigateToParticipation_RuftDelegatMitTabIndexDreiAuf()
+    {
+        var groupId = Guid.NewGuid();
+        var lesson = new Lesson { GroupId = groupId, Topic = "Brechung", Date = new DateOnly(2025, 9, 1) };
+        var vm = new LessonViewerViewModel(lesson, new FakeAlternativeLessonPaths([]));
+        int? navigatedTab = null;
+        vm.OnNavigateToTab = idx => navigatedTab = idx;
+
+        vm.NavigateToParticipationCommand.Execute(null);
+
+        Assert.Equal(groupId, vm.GroupId);
+        Assert.Equal(3, navigatedTab);
+    }
+
+    [Fact]
+    public void NavigateToGrades_RuftDelegatMitTabIndexFuenfAuf()
+    {
+        var lesson = new Lesson { GroupId = Guid.NewGuid(), Topic = "Brechung", Date = new DateOnly(2025, 9, 1) };
+        var vm = new LessonViewerViewModel(lesson, new FakeAlternativeLessonPaths([]));
+        int? navigatedTab = null;
+        vm.OnNavigateToTab = idx => navigatedTab = idx;
+
+        vm.NavigateToGradesCommand.Execute(null);
+
+        Assert.Equal(5, navigatedTab);
+    }
 }
@@ -230,6 +230,71 @@ public sealed class TimetableViewModelTests
        Assert.Equal(group.Id, navigatedTo);
    }

+    // ── Direktsprung in den Verlaufsplan-Viewer (4.5.2) ──────────────────────────
+
+    [Fact]
+    public async Task OpenTodayLesson_MitVorhandenerLesson_OeffnetDenViewerStattZurGruppeZuNavigieren()
+    {
+        var today = DateOnly.FromDateTime(DateTime.Today);
+        var group = new LearningGroup { Name = "Q1 Chemie" };
+        var slots = new FakeTimetableSlots();
+        slots.Add(new TimetableSlot { GroupId = group.Id, Weekday = today.DayOfWeek, PeriodNumber = 1 });
+        var lesson = new Lesson { GroupId = group.Id, Date = today, LessonNumber = 1, Topic = "Redox" };
+        var lessons = new FakeLessons();
+        lessons.Add(lesson);
+        var vm = BuildViewModel(slots, new FakeGroups([group]), lessons: lessons);
+        Lesson? openedLesson = null;
+        Guid? navigatedTo = null;
+        vm.OnOpenLessonViewer = l => { openedLesson = l; return Task.CompletedTask; };
+        vm.OnNavigateToGroup = id => navigatedTo = id;
+
+        await vm.OpenTodayLessonCommand.ExecuteAsync(vm.TodayItems[0]);
+
+        Assert.Equal(lesson.Id, openedLesson?.Id);
+        Assert.Null(navigatedTo);
+        Assert.Equal("Verlaufsplan ansehen", vm.TodayItems[0].OpenButtonLabel);
+    }
+
+    [Fact]
+    public async Task OpenTodayLesson_OhneVorhandeneLesson_NavigiertWieBisherZurGruppe()
+    {
+        var today = DateOnly.FromDateTime(DateTime.Today);
+        var group = new LearningGroup { Name = "Q1 Chemie" };
+        var slots = new FakeTimetableSlots();
+        slots.Add(new TimetableSlot { GroupId = group.Id, Weekday = today.DayOfWeek, PeriodNumber = 1 });
+        var vm = BuildViewModel(slots, new FakeGroups([group]));
+        Guid? navigatedTo = null;
+        var viewerOpened = false;
+        vm.OnOpenLessonViewer = _ => { viewerOpened = true; return Task.CompletedTask; };
+        vm.OnNavigateToGroup = id => navigatedTo = id;
+
+        await vm.OpenTodayLessonCommand.ExecuteAsync(vm.TodayItems[0]);
+
+        Assert.Equal(group.Id, navigatedTo);
+        Assert.False(viewerOpened);
+        Assert.Equal("Zur Lerngruppe", vm.TodayItems[0].OpenButtonLabel);
+    }
+
+    [Fact]
+    public async Task OpenWeekCell_MitVorhandenerLesson_OeffnetDenViewer()
+    {
+        var group = new LearningGroup { Name = "Q1 Chemie" };
+        var date = DateInCurrentWeek(DayOfWeek.Monday);
+        var slots = new FakeTimetableSlots();
+        slots.Add(new TimetableSlot { GroupId = group.Id, Weekday = DayOfWeek.Monday, PeriodNumber = 1 });
+        var lesson = new Lesson { GroupId = group.Id, Date = date, LessonNumber = 1, Topic = "Redox" };
+        var lessons = new FakeLessons();
+        lessons.Add(lesson);
+        var vm = BuildViewModel(slots, new FakeGroups([group]), lessons: lessons);
+        Lesson? openedLesson = null;
+        vm.OnOpenLessonViewer = l => { openedLesson = l; return Task.CompletedTask; };
+
+        var cell = vm.WeekItems.Single(c => c.IsSlotCell && c.Weekday == DayOfWeek.Monday && c.PeriodNumber == 1);
+        await vm.OpenWeekCellCommand.ExecuteAsync(cell);
+
+        Assert.Equal(lesson.Id, openedLesson?.Id);
+    }
+
    [Fact]
    public void OpenSettings_RuftOnNavigateToSettingsAuf()
    {