Unterrichtsplanung: Serienerzeugung, Stundenraster, Aufsichten & Vertretung (Kapitel 4.2/4.3 Nachtrag)

Stunden serienweise aus dem Stundenplan erzeugen (4.2.5); Stundenraster (Uhrzeiten je Stunde) in den Einstellungen mit Zeitbedarf-Rückmeldung im Verlaufsplan-Editor; wiederkehrende Pausenaufsicht; neuer "Vertretung eintragen"-Dialog für einmalige Vertretungsaufsicht, Vertretungsstunde, Sondereinsätze (Ausflüge, Berufsmessen) und schlichten Stundenausfall. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-15 21:59:07 +02:00
parent 99b2de6519
commit d6dee72acc
30 changed files with 2743 additions and 48 deletions
@@ -0,0 +1,36 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Groups"
+        x:Class="LehrerApp.Desktop.Views.Groups.GenerateLessonSeriesDialog"
+        x:DataType="vm:GenerateLessonSeriesDialogViewModel"
+        Title="Stunden aus Stundenplan erzeugen"
+        Width="420" Height="300" MinWidth="380" MinHeight="280"
+        CanResize="False" WindowStartupLocation="CenterOwner">
+
+  <Grid RowDefinitions="*,Auto" Margin="24">
+    <StackPanel Grid.Row="0" Spacing="14">
+      <TextBlock Text="Stunden aus Stundenplan erzeugen" Classes="dialogtitle"/>
+      <TextBlock FontSize="12" Opacity="0.6" TextWrapping="Wrap"
+                 Text="Legt für jeden Wochentag/Stunde aus dem Stundenplan dieser Gruppe eine neue Stunde im gewählten Zeitraum an. Schulferien und Feiertage werden übersprungen, bereits vorhandene Termine nicht doppelt angelegt."/>
+
+      <Grid ColumnDefinitions="*,8,*">
+        <StackPanel Grid.Column="0" Spacing="4">
+          <TextBlock Text="Von *" FontSize="12" Opacity="0.7"/>
+          <TextBox Text="{Binding FromDateText}" PlaceholderText="TT.MM.JJJJ"/>
+        </StackPanel>
+        <StackPanel Grid.Column="2" Spacing="4">
+          <TextBlock Text="Bis *" FontSize="12" Opacity="0.7"/>
+          <TextBox Text="{Binding ToDateText}" PlaceholderText="TT.MM.JJJJ"/>
+        </StackPanel>
+      </Grid>
+      <TextBlock Text="{Binding DateError}" Foreground="Red" FontSize="11"
+                 TextWrapping="Wrap"
+                 IsVisible="{Binding DateError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+    </StackPanel>
+
+    <Grid Grid.Row="1" ColumnDefinitions="*,8,*" Margin="0,20,0,0">
+      <Button Grid.Column="0" Content="Abbrechen" HorizontalAlignment="Stretch" Click="OnCancel"/>
+      <Button Grid.Column="2" Content="Erzeugen" HorizontalAlignment="Stretch" Click="OnSave"/>
+    </Grid>
+  </Grid>
+</Window>
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using LehrerApp.Desktop.ViewModels.Groups;
+
+namespace LehrerApp.Desktop.Views.Groups;
+
+public partial class GenerateLessonSeriesDialog : Window
+{
+    public GenerateLessonSeriesDialog() => InitializeComponent();
+
+    private void OnSave(object? s, RoutedEventArgs e)
+    {
+        if (DataContext is GenerateLessonSeriesDialogViewModel vm && vm.SaveCommand.CanExecute(null))
+        {
+            vm.SaveCommand.Execute(null);
+            if (vm.Result is not null) Close(true);
+        }
+    }
+
+    private void OnCancel(object? s, RoutedEventArgs e) => Close(false);
+}
@@ -50,7 +50,13 @@
        <Grid ColumnDefinitions="*,Auto">
          <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="10" VerticalAlignment="Center">
            <TextBlock Text="Verlaufsplan" FontSize="14" FontWeight="SemiBold"/>
-            <TextBlock Text="{Binding TotalDurationDisplay}" FontSize="12" Opacity="0.6"/>
+            <TextBlock Text="{Binding TotalDurationDisplay}" FontSize="12" Opacity="0.6"
+                       IsVisible="{Binding !HasTimeBudgetInfo}"/>
+            <Border Background="{Binding TimeBudgetColorHex}" CornerRadius="10" Padding="9,3"
+                    IsVisible="{Binding HasTimeBudgetInfo}"
+                    ToolTip.Tip="Geplante Zeit im Vergleich zur laut Stundenraster (Einstellungen) verfügbaren Zeit — bei Doppelstunden werden beide Perioden zusammengezählt.">
+              <TextBlock Text="{Binding TimeBudgetLabel}" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
+            </Border>
          </StackPanel>
          <Button Grid.Column="1" Content="＋ Phase" Command="{Binding AddPhaseCommand}"/>
        </Grid>
@@ -63,6 +63,8 @@
      </StackPanel>
      <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
        <Button Content="＋ Stunde"              Command="{Binding AddLessonCommand}"/>
+        <Button Content="Serie erzeugen"         Command="{Binding GenerateLessonSeriesCommand}"
+                ToolTip.Tip="Stunden für alle Termine aus dem Stundenplan im gewählten Zeitraum anlegen."/>
        <Button Content="Anzeigen"               Command="{Binding ShowLessonCommand}"
                ToolTip.Tip="Verlaufsplan schreibgeschützt und größer anzeigen — zum Mitnehmen in den Unterricht."/>
        <Button Content="Bearbeiten"             Command="{Binding EditLessonCommand}"/>
@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using LehrerApp.Core.Interfaces;
 using LehrerApp.Core.Models;
+using LehrerApp.Core.Services;
+using LehrerApp.Desktop.Services;
 using LehrerApp.Desktop.ViewModels.Groups;
 using LehrerApp.Desktop.Views.Shared;
 using Microsoft.Extensions.DependencyInjection;
@@ -27,6 +29,7 @@ public partial class PlanningTabView : UserControl
            vm.OnConfirmDeleteLesson = ShowDeleteLessonDialog;
            vm.OnPickMoveTarget      = ShowMoveLessonDialog;
            vm.OnShowLesson          = ShowLessonViewerDialog;
+            vm.OnGenerateLessonSeries = ShowGenerateLessonSeriesDialog;
        }
    }

@@ -80,6 +83,8 @@ public partial class PlanningTabView : UserControl
            App.Services.GetRequiredService<ILessonRepository>(),
            App.Services.GetRequiredService<IShorthandCodeRepository>(),
            App.Services.GetRequiredService<IAlternativeLessonPathRepository>(),
+            App.Services.GetRequiredService<ITimetableSlotRepository>(),
+            App.Services.GetRequiredService<PeriodScheduleService>(),
            unitId, groupId, materialSuggestions, shorthandHistorySuggestions, editingLesson);

        var dialog = new LessonDialog { DataContext = dialogVm };
@@ -122,4 +127,24 @@ public partial class PlanningTabView : UserControl
        var owner = TopLevel.GetTopLevel(this) as Window;
        if (owner is not null) await dialog.ShowDialog(owner);
    }
+
+    private async Task<LessonSeriesResult?> ShowGenerateLessonSeriesDialog(Unit unit)
+    {
+        var dialogVm = new GenerateLessonSeriesDialogViewModel(
+            App.Services.GetRequiredService<ITimetableSlotRepository>(),
+            App.Services.GetRequiredService<ILessonRepository>(),
+            App.Services.GetRequiredService<ISchoolHolidayRepository>(),
+            App.Services.GetRequiredService<PublicHolidayService>(),
+            App.Services.GetRequiredService<SchoolCalendarSettingsService>(),
+            unit.Id, unit.GroupId, unit.StartDate, unit.EndDate);
+
+        var dialog = new GenerateLessonSeriesDialog { DataContext = dialogVm };
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null) return null;
+
+        var ok = await dialog.ShowDialog<bool>(owner);
+        if (ok && dialogVm.Result is { } result)
+            App.Services.GetRequiredService<NotificationService>().ShowSuccess(result.Summary);
+        return ok ? dialogVm.Result : null;
+    }
 }
@@ -0,0 +1,144 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Planning"
+        xmlns:models="clr-namespace:LehrerApp.Core.Models;assembly=LehrerApp.Core"
+        x:Class="LehrerApp.Desktop.Views.Planning.SubstitutionEntryDialog"
+        x:DataType="vm:SubstitutionEntryDialogViewModel"
+        Title="Vertretung eintragen"
+        Width="440" Height="560" MinWidth="400" MinHeight="480"
+        CanResize="True" WindowStartupLocation="CenterOwner">
+
+  <Grid RowDefinitions="*,Auto" Margin="24">
+    <ScrollViewer Grid.Row="0">
+      <StackPanel Spacing="14" Margin="0,0,12,0">
+        <TextBlock Text="Vertretung eintragen" Classes="dialogtitle"/>
+        <TextBlock FontSize="12" Opacity="0.6" TextWrapping="Wrap"
+                   Text="Für einmalige Ausnahmen — Vertretungsaufsicht, Vertretungsstunde, Sondereinsatz (Ausflug, Berufsmesse, ...) oder schlichter Ausfall an einem konkreten Tag. Wiederkehrende Aufsicht wird in den Einstellungen gepflegt."/>
+
+        <Grid ColumnDefinitions="*,8,*">
+          <StackPanel Grid.Column="0" Spacing="4">
+            <TextBlock Text="Datum *" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding DateText}" PlaceholderText="TT.MM.JJJJ"/>
+            <TextBlock Text="{Binding DateError}" Foreground="Red" FontSize="11"
+                       IsVisible="{Binding DateError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+          </StackPanel>
+          <StackPanel Grid.Column="2" Spacing="4">
+            <TextBlock Text="Art *" FontSize="12" Opacity="0.7"/>
+            <ComboBox ItemsSource="{Binding KindOptions}" SelectedItem="{Binding KindName}"
+                      HorizontalAlignment="Stretch"/>
+          </StackPanel>
+        </Grid>
+
+        <!-- Aufsicht -->
+        <StackPanel Spacing="14" IsVisible="{Binding IsSupervisionKind}">
+          <StackPanel Spacing="4">
+            <TextBlock Text="Nach Stunde (0 = davor) *" FontSize="12" Opacity="0.7"/>
+            <NumericUpDown Value="{Binding AfterPeriod}" Minimum="0" Maximum="10" FormatString="0"
+                           Width="140" HorizontalAlignment="Left"/>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Grund / Ort *" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding Description}" PlaceholderText="z.B. Vertretung für Hr. Müller, Pausenhof"/>
+          </StackPanel>
+        </StackPanel>
+
+        <!-- Stunde -->
+        <StackPanel Spacing="14" IsVisible="{Binding IsLessonKind}">
+          <StackPanel Spacing="4">
+            <TextBlock Text="Stunde Nr. *" FontSize="12" Opacity="0.7"/>
+            <NumericUpDown Value="{Binding PeriodNumber}" Minimum="1" Maximum="10" FormatString="0"
+                           Width="140" HorizontalAlignment="Left"/>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Eigene Gruppe (optional)" FontSize="12" Opacity="0.7"/>
+            <ComboBox ItemsSource="{Binding OwnGroups}" SelectedItem="{Binding SelectedOwnGroup}"
+                      HorizontalAlignment="Stretch" PlaceholderText="Fremde/unbekannte Gruppe">
+              <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="models:LearningGroup">
+                  <TextBlock Text="{Binding Name}"/>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Bezeichnung *" FontSize="12" Opacity="0.7"
+                       ToolTip.Tip="Wird im Stundenplan angezeigt, z.B. Klasse/Kurs-Kürzel."/>
+            <TextBox Text="{Binding GroupLabel}" PlaceholderText="z.B. 8a"/>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Thema *" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding Description}" PlaceholderText="z.B. Stillarbeit, Erdkunde-Vertretung"/>
+          </StackPanel>
+
+          <StackPanel Spacing="6" IsVisible="{Binding CanPromoteToLesson}">
+            <Separator/>
+            <CheckBox Content="Direkt als Stunde in der Einheit übernehmen" IsChecked="{Binding PromoteToLesson}"
+                      ToolTip.Tip="Nur sinnvoll, wenn tatsächlich echter Stoff aus der Einheit behandelt wurde — sonst bleibt es beim einfachen Plan-Eintrag."/>
+            <ComboBox ItemsSource="{Binding UnitsOfSelectedGroup}" SelectedItem="{Binding SelectedUnit}"
+                      IsVisible="{Binding PromoteToLesson}" HorizontalAlignment="Stretch">
+              <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="models:Unit">
+                  <TextBlock Text="{Binding Title}"/>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+          </StackPanel>
+        </StackPanel>
+
+        <!-- Sondereinsatz -->
+        <StackPanel Spacing="14" IsVisible="{Binding IsSpecialAssignmentKind}">
+          <CheckBox Content="Ganztägig" IsChecked="{Binding IsAllDay}"/>
+          <Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsAllDay}">
+            <StackPanel Grid.Column="0" Spacing="4">
+              <TextBlock Text="Von Stunde *" FontSize="12" Opacity="0.7"/>
+              <NumericUpDown Value="{Binding FromPeriod}" Minimum="1" Maximum="10" FormatString="0"/>
+            </StackPanel>
+            <StackPanel Grid.Column="2" Spacing="4">
+              <TextBlock Text="Bis Stunde *" FontSize="12" Opacity="0.7"/>
+              <NumericUpDown Value="{Binding ToPeriod}" Minimum="1" Maximum="10" FormatString="0"/>
+            </StackPanel>
+          </Grid>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Eigene Gruppe (optional)" FontSize="12" Opacity="0.7"
+                       ToolTip.Tip="Nur ausfüllen, wenn der Sondereinsatz eine konkrete Lerngruppe betrifft (z.B. Ausflug) — bei Einsätzen ohne Gruppenbezug (z.B. Berufsmesse) leer lassen."/>
+            <ComboBox ItemsSource="{Binding OwnGroups}" SelectedItem="{Binding SelectedOwnGroup}"
+                      HorizontalAlignment="Stretch" PlaceholderText="Kein Gruppenbezug">
+              <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="models:LearningGroup">
+                  <TextBlock Text="{Binding Name}"/>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Bezeichnung *" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding Description}" PlaceholderText="z.B. Ausflug ins Museum, Berufsmesse"/>
+          </StackPanel>
+        </StackPanel>
+
+        <!-- Ausfall -->
+        <StackPanel Spacing="14" IsVisible="{Binding IsCancelledKind}">
+          <TextBlock FontSize="12" Opacity="0.6" TextWrapping="Wrap"
+                     Text="Für Stunden, die schlicht ausfallen, ohne dass jemand vertritt — z.B. weil die andere Gruppe selbst nicht da ist (Klassenfahrt, Exkursion o.ä.). Fach/Klasse werden automatisch aus dem Stundenplan übernommen."/>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Stunde Nr. *" FontSize="12" Opacity="0.7"/>
+            <NumericUpDown Value="{Binding PeriodNumber}" Minimum="1" Maximum="10" FormatString="0"
+                           Width="140" HorizontalAlignment="Left"/>
+          </StackPanel>
+          <StackPanel Spacing="4">
+            <TextBlock Text="Grund (optional)" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding Description}" PlaceholderText="z.B. 6a auf Klassenfahrt"/>
+          </StackPanel>
+        </StackPanel>
+
+        <TextBlock Text="{Binding ValidationError}" Foreground="Red" FontSize="12" TextWrapping="Wrap"
+                   IsVisible="{Binding ValidationError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+      </StackPanel>
+    </ScrollViewer>
+
+    <Grid Grid.Row="1" ColumnDefinitions="*,8,*" Margin="0,20,0,0">
+      <Button Grid.Column="0" Content="Abbrechen" HorizontalAlignment="Stretch" Click="OnCancel"/>
+      <Button Grid.Column="2" Content="Eintragen" HorizontalAlignment="Stretch" Click="OnSave"/>
+    </Grid>
+  </Grid>
+</Window>
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using LehrerApp.Desktop.ViewModels.Planning;
+
+namespace LehrerApp.Desktop.Views.Planning;
+
+public partial class SubstitutionEntryDialog : Window
+{
+    public SubstitutionEntryDialog() => InitializeComponent();
+
+    private void OnSave(object? s, RoutedEventArgs e)
+    {
+        if (DataContext is SubstitutionEntryDialogViewModel vm && vm.SaveCommand.CanExecute(null))
+        {
+            vm.SaveCommand.Execute(null);
+            if (vm.Result is not null) Close(true);
+        }
+    }
+
+    private void OnCancel(object? s, RoutedEventArgs e) => Close(false);
+}
@@ -15,6 +15,12 @@
    <Style Selector="Border.weekheader.today">
      <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
    </Style>
+    <Style Selector="Border.supervisioncell">
+      <Setter Property="Background" Value="#616161"/>
+    </Style>
+    <Style Selector="Border.supervisioncell.substitution">
+      <Setter Property="Background" Value="#8E24AA"/>
+    </Style>
  </UserControl.Styles>

  <Grid RowDefinitions="Auto,*">
@@ -33,6 +39,36 @@
                  CornerRadius="8" Padding="16" MaxHeight="240">
            <DockPanel>
              <TextBlock DockPanel.Dock="Top" Text="{Binding TodayLabel}" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8"/>
+              <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding TodaySupervisions}" Margin="0,0,0,6"
+                            IsVisible="{Binding TodaySupervisions.Count}">
+                <ItemsControl.ItemTemplate>
+                  <DataTemplate x:DataType="vm:TodaySupervisionItem">
+                    <Grid ColumnDefinitions="Auto,*" Margin="0,2">
+                      <Border Grid.Column="0" Classes="supervisioncell" Classes.substitution="{Binding IsSubstitution}"
+                              CornerRadius="4" Padding="6,2" Margin="0,0,8,0">
+                        <TextBlock Text="👁" FontSize="11" Foreground="White"/>
+                      </Border>
+                      <TextBlock Grid.Column="1" FontSize="12" VerticalAlignment="Center">
+                        <Run Text="{Binding PeriodLabel}"/><Run Text=" — "/><Run Text="{Binding Description}"/>
+                      </TextBlock>
+                    </Grid>
+                  </DataTemplate>
+                </ItemsControl.ItemTemplate>
+              </ItemsControl>
+              <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding TodaySpecialAssignments}" Margin="0,0,0,6"
+                            IsVisible="{Binding TodaySpecialAssignments.Count}">
+                <ItemsControl.ItemTemplate>
+                  <DataTemplate x:DataType="vm:TodaySpecialAssignmentItem">
+                    <Grid ColumnDefinitions="Auto,*" Margin="0,2">
+                      <Border Grid.Column="0" Background="#00838F" CornerRadius="4" Padding="6,2" Margin="0,0,8,0">
+                        <TextBlock Text="📌" FontSize="11" Foreground="White"/>
+                      </Border>
+                      <TextBlock Grid.Column="1" FontSize="12" VerticalAlignment="Center" TextWrapping="Wrap"
+                                 Text="{Binding DisplayText}"/>
+                    </Grid>
+                  </DataTemplate>
+                </ItemsControl.ItemTemplate>
+              </ItemsControl>
              <ScrollViewer>
                <ItemsControl ItemsSource="{Binding TodayItems}">
                  <ItemsControl.ItemTemplate>
@@ -44,7 +80,15 @@
                          <TextBlock Grid.Column="1" Text="{Binding PeriodNumber}" FontSize="17" FontWeight="Bold"
                                     Width="30" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,0"/>
                          <StackPanel Grid.Column="2" Spacing="2">
-                            <TextBlock Text="{Binding GroupName}" FontSize="14" FontWeight="SemiBold"/>
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                              <TextBlock Text="{Binding GroupName}" FontSize="14" FontWeight="SemiBold"/>
+                              <Border Background="#8E24AA" CornerRadius="7" Padding="5,0" IsVisible="{Binding IsSubstitution}">
+                                <TextBlock Text="Vertretung" FontSize="10" Foreground="White"/>
+                              </Border>
+                              <Border Background="#757575" CornerRadius="7" Padding="5,0" IsVisible="{Binding IsCancelled}">
+                                <TextBlock Text="Ausfall" FontSize="10" Foreground="White"/>
+                              </Border>
+                            </StackPanel>
                            <TextBlock FontSize="11" Opacity="0.6" IsVisible="{Binding HasRoom}">
                              <Run Text="Raum "/><Run Text="{Binding Room}"/>
                            </TextBlock>
@@ -54,7 +98,7 @@
                                       IsVisible="{Binding HasExam}"/>
                          </StackPanel>
                          <Button Grid.Column="3" Content="Zur Lerngruppe" FontSize="11" Padding="9,4"
-                                  VerticalAlignment="Center"
+                                  VerticalAlignment="Center" IsVisible="{Binding HasGroupId}"
                                  Command="{Binding $parent[ItemsControl].((vm:TimetableViewModel)DataContext).OpenGroupCommand}"
                                  CommandParameter="{Binding GroupId}"/>
                        </Grid>
@@ -72,7 +116,7 @@
          <ScrollViewer>
            <StackPanel Spacing="14">

-              <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto">
+              <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
                <Button Grid.Column="0" Content="‹" FontWeight="Bold" Padding="10,4"
                        Command="{Binding PreviousWeekCommand}" ToolTip.Tip="Vorherige Woche"/>
                <Button Grid.Column="1" Content="›" FontWeight="Bold" Padding="10,4" Margin="4,0,0,0"
@@ -83,7 +127,9 @@
                </TextBlock>
                <Button Grid.Column="3" Content="Diese Woche" Margin="0,0,8,0"
                        Command="{Binding CurrentWeekCommand}" IsVisible="{Binding !IsCurrentWeek}"/>
-                <Button Grid.Column="4" Content="Stundenplan bearbeiten" Command="{Binding ShowEditorCommand}"/>
+                <Button Grid.Column="4" Content="Vertretung eintragen" Margin="0,0,8,0"
+                        Command="{Binding AddSubstitutionCommand}"/>
+                <Button Grid.Column="5" Content="Stundenplan bearbeiten" Command="{Binding ShowEditorCommand}"/>
              </Grid>

              <ItemsControl ItemsSource="{Binding WeekItems}">
@@ -101,6 +147,16 @@
                      <TextBlock Text="{Binding Text}" IsVisible="{Binding IsPeriodLabel}"
                                 FontWeight="SemiBold" FontSize="13"
                                 HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                      <TextBlock Text="{Binding Text}" IsVisible="{Binding IsSupervisionRow}"
+                                 FontSize="10" FontWeight="SemiBold" Opacity="0.55" TextWrapping="Wrap"
+                                 HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                      <Border Classes="supervisioncell" Classes.substitution="{Binding IsSubstitutionSupervision}"
+                              CornerRadius="4" Padding="4" IsVisible="{Binding IsSupervisionCell}"
+                              HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <TextBlock Text="{Binding SupervisionLocation}" FontSize="10" Foreground="White"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap"
+                                   IsVisible="{Binding HasSupervision}"/>
+                      </Border>
                      <Border Classes="timetablecell" Classes.assigned="{Binding IsAssigned}"
                              CornerRadius="6" IsVisible="{Binding IsSlotCell}">
                        <Button Background="{Binding ColorHex}" IsVisible="{Binding IsAssigned}"
@@ -118,6 +174,8 @@
                                       TextWrapping="Wrap" IsVisible="{Binding HasTopic}"/>
                            <TextBlock Text="Ferien" FontSize="10" Foreground="White" FontWeight="SemiBold"
                                       Opacity="0.9" IsVisible="{Binding IsHoliday}" Margin="0,2,0,0"/>
+                            <TextBlock Text="Ausfall" FontSize="10" Foreground="White" FontWeight="SemiBold"
+                                       Opacity="0.9" IsVisible="{Binding IsCancelled}" Margin="0,2,0,0"/>
                            <StackPanel Orientation="Horizontal" Spacing="3" Margin="0,2,0,0"
                                        IsVisible="{Binding !IsHoliday}">
                              <Border Background="#B71C1C" CornerRadius="7" Padding="4,0" IsVisible="{Binding HasHolidayBadge}">
@@ -172,6 +230,16 @@
                    <TextBlock Text="{Binding Text}" IsVisible="{Binding IsPeriodLabel}"
                               FontWeight="SemiBold" FontSize="13"
                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <TextBlock Text="{Binding Text}" IsVisible="{Binding IsSupervisionRow}"
+                               FontSize="10" FontWeight="SemiBold" Opacity="0.55" TextWrapping="Wrap"
+                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <Border Classes="supervisioncell" CornerRadius="4" Padding="4"
+                            IsVisible="{Binding IsSupervisionCell}"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                      <TextBlock Text="{Binding SupervisionLocation}" FontSize="10" Foreground="White"
+                                 HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap"
+                                 IsVisible="{Binding HasSupervision}"/>
+                    </Border>
                    <Border Classes="timetablecell" Classes.assigned="{Binding IsAssigned}"
                            CornerRadius="6" IsVisible="{Binding IsSlotCell}">
                    <Panel>
@@ -13,7 +13,11 @@ public partial class TimetableView : UserControl
    protected override void OnDataContextChanged(EventArgs e)
    {
        base.OnDataContextChanged(e);
-        if (DataContext is TimetableViewModel vm) vm.OnEditSlot = ShowSlotDialog;
+        if (DataContext is TimetableViewModel vm)
+        {
+            vm.OnEditSlot = ShowSlotDialog;
+            vm.OnAddSubstitution = ShowSubstitutionDialog;
+        }
    }

    private async Task ShowSlotDialog(TimetableCellItem cell)
@@ -30,4 +34,19 @@ public partial class TimetableView : UserControl
        var dialog = new TimetableSlotDialog { DataContext = vm };
        await dialog.ShowDialog(owner);
    }
+
+    private async Task ShowSubstitutionDialog()
+    {
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null) return;
+
+        var vm = new SubstitutionEntryDialogViewModel(
+            App.Services.GetRequiredService<ISubstitutionEntryRepository>(),
+            App.Services.GetRequiredService<IGroupRepository>(),
+            App.Services.GetRequiredService<IUnitRepository>(),
+            App.Services.GetRequiredService<ILessonRepository>());
+
+        var dialog = new SubstitutionEntryDialog { DataContext = vm };
+        await dialog.ShowDialog(owner);
+    }
 }
@@ -536,6 +536,100 @@
        </ScrollViewer>
      </ContentPage>

+      <!-- Tab: Stundenraster (4.2.2 Nachtrag) -->
+      <ContentPage Header="Stundenraster">
+        <ScrollViewer>
+          <StackPanel Margin="32,20,32,28" Spacing="14" MaxWidth="420">
+
+            <TextBlock Text="Uhrzeiten der Einzelstunden" FontSize="16" FontWeight="SemiBold"/>
+            <TextBlock FontSize="12" Opacity="0.6" TextWrapping="Wrap"
+                       Text="Grundlage für die Zeitbedarf-Rückmeldung im Verlaufsplan-Editor. Nicht alle Stunden müssen eingetragen sein — für unkonfigurierte Stunden bleibt die Rückmeldung dort einfach aus."/>
+
+            <Grid ColumnDefinitions="70,*,8,*" Margin="0,4,0,0">
+              <TextBlock Grid.Column="1" Text="Beginn" FontSize="11" FontWeight="Bold" Opacity="0.5"/>
+              <TextBlock Grid.Column="3" Text="Ende" FontSize="11" FontWeight="Bold" Opacity="0.5"/>
+            </Grid>
+            <ItemsControl ItemsSource="{Binding PeriodTimes}">
+              <ItemsControl.ItemTemplate>
+                <DataTemplate DataType="vm:PeriodTimeEditItem">
+                  <Grid ColumnDefinitions="70,*,8,*" Margin="0,3">
+                    <TextBlock Grid.Column="0" Text="{Binding PeriodLabel}" FontSize="13" VerticalAlignment="Center"/>
+                    <TextBox Grid.Column="1" Text="{Binding StartText}" PlaceholderText="HH:MM"/>
+                    <TextBox Grid.Column="3" Text="{Binding EndText}" PlaceholderText="HH:MM"/>
+                  </Grid>
+                </DataTemplate>
+              </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+            <TextBlock Text="{Binding PeriodTimesError}" Foreground="Red" FontSize="12"
+                       IsVisible="{Binding PeriodTimesError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+            <Button Content="Speichern" Command="{Binding SavePeriodTimesCommand}" HorizontalAlignment="Left"/>
+            <TextBlock Text="{Binding PeriodTimesStatus}" Foreground="Green" FontSize="12"
+                       IsVisible="{Binding PeriodTimesStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+
+          </StackPanel>
+        </ScrollViewer>
+      </ContentPage>
+
+      <!-- Tab: Aufsichten (4.3 Nachtrag) -->
+      <ContentPage Header="Aufsichten">
+        <ScrollViewer>
+          <StackPanel Margin="32,20,32,28" Spacing="14" MaxWidth="480">
+
+            <TextBlock Text="Wiederkehrende Pausenaufsicht" FontSize="16" FontWeight="SemiBold"/>
+            <TextBlock FontSize="12" Opacity="0.6" TextWrapping="Wrap"
+                       Text="Wird im Stundenplan zwischen den betroffenen Stunden angezeigt. Einmalige Vertretungsaufsichten trägst du direkt im Stundenplan (Heute-Ansicht) ein, nicht hier."/>
+
+            <ItemsControl ItemsSource="{Binding SupervisionDuties}">
+              <ItemsControl.ItemTemplate>
+                <DataTemplate DataType="vm:SupervisionDutyItem">
+                  <Border BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+                          BorderThickness="0,0,0,1" Padding="0,7">
+                    <Grid ColumnDefinitions="*,Auto">
+                      <StackPanel Grid.Column="0">
+                        <TextBlock FontSize="13" FontWeight="SemiBold">
+                          <Run Text="{Binding WeekdayLabel}"/><Run Text=" — "/><Run Text="{Binding PeriodLabel}"/>
+                        </TextBlock>
+                        <TextBlock Text="{Binding Location}" FontSize="12" Opacity="0.6"/>
+                      </StackPanel>
+                      <Button Grid.Column="1" Content="×" FontSize="14" Padding="9,3"
+                              Command="{Binding $parent[ItemsControl].((vm:SettingsViewModel)DataContext).RemoveSupervisionDutyCommand}"
+                              CommandParameter="{Binding}"/>
+                    </Grid>
+                  </Border>
+                </DataTemplate>
+              </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <TextBlock Text="Noch keine Aufsicht hinterlegt." Classes="emptyhint"
+                       IsVisible="{Binding !SupervisionDuties.Count}"/>
+
+            <Separator Margin="0,4"/>
+
+            <Grid ColumnDefinitions="*,8,Auto">
+              <StackPanel Grid.Column="0" Spacing="4">
+                <TextBlock Text="Wochentag" FontSize="12" Opacity="0.7"/>
+                <ComboBox ItemsSource="{Binding WeekdayOptions}" SelectedItem="{Binding NewDutyWeekdayName}"
+                          HorizontalAlignment="Stretch"/>
+              </StackPanel>
+              <StackPanel Grid.Column="2" Spacing="4">
+                <TextBlock Text="Nach Stunde (0 = davor)" FontSize="12" Opacity="0.7"/>
+                <NumericUpDown Value="{Binding NewDutyAfterPeriod}" Minimum="0" Maximum="10" FormatString="0"
+                               Width="140" ShowButtonSpinner="True"/>
+              </StackPanel>
+            </Grid>
+            <StackPanel Spacing="4">
+              <TextBlock Text="Ort / Bezeichnung" FontSize="12" Opacity="0.7"/>
+              <TextBox Text="{Binding NewDutyLocation}" PlaceholderText="z.B. Pausenhof"/>
+            </StackPanel>
+            <TextBlock Text="{Binding NewDutyError}" Foreground="Red" FontSize="12"
+                       IsVisible="{Binding NewDutyError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+            <Button Content="＋ Aufsicht hinzufügen" Command="{Binding AddSupervisionDutyCommand}"
+                    HorizontalAlignment="Left"/>
+
+          </StackPanel>
+        </ScrollViewer>
+      </ContentPage>
+
    </TabbedPage>
  </Grid>
 </UserControl>