Klassenbuch-Tab zum Dokumentations-Hub ausgebaut

Umschalter zwischen WebUntis-Klassenbuch und eigener Dokumentation statt Merge beider strukturell unterschiedlicher Datensätze, mit Zahlen-Badges je Quelle (kritisch/Nacharbeit hervorgehoben) im Tab und an der "Klassenbuch öffnen"-Aktion der Übersicht. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-01 17:05:13 +02:00
parent de6d4236a2
commit d297f9f109
7 changed files with 453 additions and 12 deletions
@@ -464,6 +464,22 @@
                  <StackPanel Spacing="8">
                    <TextBlock Text="Nächste Schritte" FontSize="14" FontWeight="SemiBold"/>
                    <Button Content="Klassenbuch öffnen" Command="{Binding OpenClassRegisterCommand}" HorizontalAlignment="Stretch"/>
+                    <!-- Nutzer-Feedback: Zahlen-Badges für offene eigene Dokumentation direkt am
+                         Button, der zum Klassenbuch-Tab (jetzt Dokumentations-Hub) führt, statt in
+                         einer eigenen Kennzahlkarte in der bereits vollen 4-Spalten-Reihe oben. -->
+                    <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,-4,0,0"
+                                IsVisible="{Binding HasOwnDocumentationAlerts}">
+                      <Border Background="#FB8C00" CornerRadius="9" Padding="7,2"
+                              IsVisible="{Binding !!OwnDocumentationFollowUpCount}">
+                        <TextBlock Text="{Binding OwnDocumentationFollowUpCount, StringFormat='Nacharbeit: {0}'}"
+                                   Foreground="White" FontSize="10" FontWeight="SemiBold"/>
+                      </Border>
+                      <Border Background="#E53935" CornerRadius="9" Padding="7,2"
+                              IsVisible="{Binding !!OwnDocumentationCriticalCount}">
+                        <TextBlock Text="{Binding OwnDocumentationCriticalCount, StringFormat='kritisch: {0}'}"
+                                   Foreground="White" FontSize="10" FontWeight="SemiBold"/>
+                      </Border>
+                    </StackPanel>
                    <Button Content="Fehlzeiten öffnen" Command="{Binding OpenAbsencesCommand}" HorizontalAlignment="Stretch"/>
                    <Button Content="Aufgaben &amp; Wiedervorlagen" Command="{Binding GoToWorkloadCommand}"
                            HorizontalAlignment="Stretch" Background="Transparent"/>
@@ -1,6 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.ClassTeacher"
+             xmlns:svm="clr-namespace:LehrerApp.Desktop.ViewModels.Students"
             x:Class="LehrerApp.Desktop.Views.ClassTeacher.ClassTeacherRegisterView"
             x:DataType="vm:ClassTeacherDetailsViewModel">

@@ -26,19 +27,77 @@
    <Style Selector="TextBlock.status.danger">
      <Setter Property="Foreground" Value="{DynamicResource AppStatusDangerBrush}"/>
    </Style>
+    <Style Selector="Button.regSource">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource AppFilterBorderBrush}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="CornerRadius" Value="6"/>
+      <Setter Property="Padding" Value="14,6"/>
+      <Setter Property="FontSize" Value="12"/>
+    </Style>
+    <Style Selector="Button.regSource.active">
+      <Setter Property="Background" Value="{DynamicResource AppFilterActiveBackgroundBrush}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource AppFilterActiveBorderBrush}"/>
+      <Setter Property="Foreground" Value="{DynamicResource AppFilterActiveForegroundBrush}"/>
+    </Style>
+    <Style Selector="Border.countBadge">
+      <Setter Property="Background" Value="{DynamicResource AppChipBackgroundBrush}"/>
+      <Setter Property="CornerRadius" Value="11"/>
+      <Setter Property="Padding" Value="9,3"/>
+    </Style>
+    <Style Selector="Border.countBadge.attention">
+      <Setter Property="Background" Value="#E53935"/>
+    </Style>
+    <Style Selector="Border.countBadge TextBlock">
+      <Setter Property="FontSize" Value="11"/>
+      <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+    <Style Selector="Border.countBadge.attention TextBlock">
+      <Setter Property="Foreground" Value="White"/>
+    </Style>
  </UserControl.Styles>

-  <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="16" RowSpacing="10">
+  <Grid RowDefinitions="Auto,Auto,Auto,Auto,*,Auto" Margin="16" RowSpacing="10">
    <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
      <StackPanel>
-        <TextBlock Text="Klassenbucheinträge" FontSize="22" FontWeight="SemiBold"/>
-        <TextBlock Text="Einträge anderer Lehrkräfte – nur zur Ansicht" FontSize="12" Opacity="0.55"/>
+        <TextBlock Text="Klassenbuch" FontSize="22" FontWeight="SemiBold"/>
+        <TextBlock Text="Einträge anderer Lehrkräfte – nur zur Ansicht" FontSize="12" Opacity="0.55"
+                   IsVisible="{Binding !ShowOwnDocumentation}"/>
+        <TextBlock Text="Eigene Dokumentation zu Schüler*innen dieser Klasse" FontSize="12" Opacity="0.55"
+                   IsVisible="{Binding ShowOwnDocumentation}"/>
      </StackPanel>
      <Button Grid.Column="1" Content="↻  Aus WebUntis aktualisieren" Command="{Binding RefreshCommand}"
              IsEnabled="{Binding !Busy}" Background="Transparent" Foreground="{DynamicResource AppAccentTextBrush}" VerticalAlignment="Center"/>
    </Grid>

-    <Border Grid.Row="1" Classes="filterCard">
+    <!-- Nutzer-Feedback: Klassenbuch-Tab als Dokumentations-Hub — Umschalter zwischen dem
+         WebUntis-Bericht anderer Lehrkräfte und der eigenen Dokumentation zu Schüler*innen dieser
+         Klasse, statt beide (strukturell unterschiedliche) Datensätze in eine Liste zu zwingen.
+         Zahlen-Badges links/rechts zeigen die Anzahl je Quelle, in Rot hervorgehoben, wenn kritische
+         bzw. nacharbeitsbedürftige Einträge dabei sind. -->
+    <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center">
+      <Border Classes="countBadge" Classes.attention="{Binding !!UntisCriticalCount}">
+        <TextBlock Text="{Binding Entries.Count, StringFormat='Klassenbuch: {0}'}"/>
+      </Border>
+      <Border Classes="countBadge" Classes.attention="{Binding !!UntisCriticalCount}" IsVisible="{Binding !!UntisCriticalCount}">
+        <TextBlock Text="{Binding UntisCriticalCount, StringFormat='davon kritisch: {0}'}"/>
+      </Border>
+      <Button Classes="regSource" Classes.active="{Binding !ShowOwnDocumentation}"
+              Content="Klassenbuch (Untis)" Command="{Binding ShowUntisRegisterCommand}"/>
+      <Button Classes="regSource" Classes.active="{Binding ShowOwnDocumentation}"
+              Content="Eigene Dokumentation" Command="{Binding ShowOwnDocsCommand}"/>
+      <Border Classes="countBadge">
+        <TextBlock Text="{Binding OwnDocumentationCount, StringFormat='Dokumentation: {0}'}"/>
+      </Border>
+      <Border Classes="countBadge attention" IsVisible="{Binding !!OwnDocumentationFollowUpCount}">
+        <TextBlock Text="{Binding OwnDocumentationFollowUpCount, StringFormat='Nacharbeit: {0}'}"/>
+      </Border>
+      <Border Classes="countBadge attention" IsVisible="{Binding !!OwnDocumentationCriticalCount}">
+        <TextBlock Text="{Binding OwnDocumentationCriticalCount, StringFormat='kritisch: {0}'}"/>
+      </Border>
+    </StackPanel>
+
+    <Border Grid.Row="2" Classes="filterCard">
      <Grid RowDefinitions="Auto,Auto" RowSpacing="8">
        <Grid Grid.Row="0" ColumnDefinitions="155,Auto,*,Auto,*" ColumnSpacing="8">
          <ComboBox Grid.Column="0" SelectedIndex="{Binding QuickRangeIndex, Mode=TwoWay}">
@@ -62,7 +121,7 @@
         Kategorie ("Hausaufgaben fehlen: 12× — 5× Ben Schmidt, 3× Ada Müller") ist die eigentlich
         interessante Information. Als Chip-Reihe statt eigener Spalte in der Tabelle, damit die
         bestehenden Spalten unangetastet bleiben. -->
-    <Border Grid.Row="2" Classes="filterCard" IsVisible="{Binding HasCategoryAggregates}">
+    <Border Grid.Row="3" Classes="filterCard" IsVisible="{Binding ShowCategoryAggregates}">
      <StackPanel Spacing="6">
        <TextBlock Text="Kategorien im Zeitraum" FontSize="12" FontWeight="SemiBold" Opacity="0.7"/>
        <ItemsControl ItemsSource="{Binding CategoryAggregates}">
@@ -86,7 +145,7 @@
      </StackPanel>
    </Border>

-    <Grid Grid.Row="3">
+    <Grid Grid.Row="4" IsVisible="{Binding !ShowOwnDocumentation}">
      <DataGrid ItemsSource="{Binding Entries}" AutoGenerateColumns="False" IsReadOnly="True"
                GridLinesVisibility="Horizontal" BorderBrush="{DynamicResource AppCardBorderBrush}" BorderThickness="1"
                CanUserResizeColumns="True" CanUserSortColumns="True" RowHeight="46">
@@ -105,6 +164,77 @@
        <TextBlock Text="Passe Zeitraum oder Schülerfilter an." FontSize="12" Opacity="0.55"/>
      </StackPanel>
    </Grid>
-    <TextBlock Grid.Row="4" Text="{Binding Status}" FontSize="11" Opacity="0.6"/>
+
+    <Grid Grid.Row="4" IsVisible="{Binding ShowOwnDocumentation}" RowDefinitions="Auto,*">
+      <Button Grid.Row="0" Content="＋ Eintrag" Command="{Binding AddOwnDocumentationCommand}"
+              HorizontalAlignment="Right" Margin="0,0,0,8"/>
+      <ScrollViewer Grid.Row="1">
+        <StackPanel>
+          <ItemsControl ItemsSource="{Binding OwnDocumentationEntries}">
+            <ItemsControl.ItemTemplate>
+              <DataTemplate DataType="svm:DocumentationItem">
+                <Border Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
+                        CornerRadius="6" Padding="12,10" Margin="0,0,0,8">
+                  <StackPanel Spacing="4">
+                    <Grid ColumnDefinitions="80,*,Auto,Auto,Auto,Auto">
+                      <TextBlock Grid.Column="0" Text="{Binding DateDisplay}" Opacity="0.5" FontSize="12"/>
+                      <StackPanel Grid.Column="1" Margin="8,0">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                          <Border Background="#FB8C00" CornerRadius="8" Padding="6,1"
+                                  IsVisible="{Binding IsDraft}">
+                            <TextBlock Text="ENTWURF" Foreground="White" FontSize="9" FontWeight="Bold"/>
+                          </Border>
+                          <TextBlock Text="{Binding StudentName}" FontWeight="SemiBold" FontSize="13"/>
+                          <TextBlock Text="{Binding Model.Title}" FontSize="13" Opacity="0.8"
+                                     IsVisible="{Binding IsRevealed}"/>
+                          <TextBlock Text="Vertraulich" FontSize="13" Opacity="0.6"
+                                     IsVisible="{Binding !IsRevealed}"/>
+                        </StackPanel>
+                        <TextBlock Text="{Binding TypeLabel}" FontSize="11" Opacity="0.5"/>
+                      </StackPanel>
+                      <TextBlock Grid.Column="2" Text="🔒" FontSize="14" VerticalAlignment="Center"
+                                 IsVisible="{Binding IsConfidential}" ToolTip.Tip="Vertraulich"/>
+                      <Button Grid.Column="3" Content="Anzeigen" FontSize="11" Padding="8,3" Margin="6,0,0,0"
+                              Command="{Binding RevealCommand}" IsVisible="{Binding !IsRevealed}"/>
+                      <StackPanel Grid.Column="4" Orientation="Horizontal" Spacing="4" Margin="6,0,0,0"
+                                  IsVisible="{Binding IsRevealed}">
+                        <Button Content="Bearbeiten" FontSize="11" Padding="8,3"
+                                Command="{Binding $parent[ItemsControl].((vm:ClassTeacherDetailsViewModel)DataContext).EditOwnDocumentationCommand}"
+                                CommandParameter="{Binding}"/>
+                        <Button Content="Löschen" FontSize="11" Padding="8,3"
+                                Command="{Binding $parent[ItemsControl].((vm:ClassTeacherDetailsViewModel)DataContext).DeleteOwnDocumentationCommand}"
+                                CommandParameter="{Binding}"/>
+                      </StackPanel>
+                    </Grid>
+                    <TextBlock Text="{Binding Model.Content}" FontSize="12" TextWrapping="Wrap" Opacity="0.8"
+                               IsVisible="{Binding IsRevealed}"/>
+                    <StackPanel Orientation="Horizontal" Spacing="8" IsVisible="{Binding IsRevealed}">
+                      <TextBlock Text="{Binding StatusLabel}" FontSize="11" Opacity="0.55"
+                                 IsVisible="{Binding StatusLabel, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+                      <TextBlock Text="📎 Anhang" FontSize="11" Opacity="0.55" IsVisible="{Binding HasAttachments}"/>
+                    </StackPanel>
+                    <ItemsControl ItemsSource="{Binding TagChips}" IsVisible="{Binding IsRevealed}">
+                      <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate><WrapPanel ItemSpacing="6" LineSpacing="4"/></ItemsPanelTemplate>
+                      </ItemsControl.ItemsPanel>
+                      <ItemsControl.ItemTemplate>
+                        <DataTemplate DataType="svm:TagChip">
+                          <Border Background="{Binding ColorHex}" CornerRadius="10" Padding="8,2">
+                            <TextBlock Text="{Binding Text}" FontSize="10" Foreground="White"/>
+                          </Border>
+                        </DataTemplate>
+                      </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                  </StackPanel>
+                </Border>
+              </DataTemplate>
+            </ItemsControl.ItemTemplate>
+          </ItemsControl>
+          <TextBlock Text="Keine eigene Dokumentation im gewählten Zeitraum." Classes="emptyhint"
+                     IsVisible="{Binding !HasOwnDocumentationEntries}"/>
+        </StackPanel>
+      </ScrollViewer>
+    </Grid>
+    <TextBlock Grid.Row="5" Text="{Binding Status}" FontSize="11" Opacity="0.6"/>
  </Grid>
 </UserControl>
@@ -1,8 +1,50 @@
 using Avalonia.Controls;
+using LehrerApp.Core.Interfaces;
+using LehrerApp.Core.Models;
+using LehrerApp.Desktop.ViewModels.ClassTeacher;
+using LehrerApp.Desktop.ViewModels.Students;
+using LehrerApp.Desktop.Views.Shared;
+using LehrerApp.Desktop.Views.Students;
+using Microsoft.Extensions.DependencyInjection;

 namespace LehrerApp.Desktop.Views.ClassTeacher;

 public partial class ClassTeacherRegisterView : UserControl
 {
    public ClassTeacherRegisterView() => InitializeComponent();
+
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is not ClassTeacherDetailsViewModel vm) return;
+        vm.OnEditOwnDocumentation = ShowDocumentationDialog;
+        vm.OnConfirmDeleteOwnDocumentation = ShowDeleteDocumentationDialog;
+    }
+
+    private async Task<Documentation?> ShowDocumentationDialog(
+        List<StudentOption> studentOptions, Documentation? editing)
+    {
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null) return null;
+
+        var vm = new DocumentationDialogViewModel(editing?.StudentId ?? Guid.Empty, editing,
+            App.Services.GetRequiredService<IAttachmentStorage>(), studentOptions);
+        var dialog = new DocumentationDialog { DataContext = vm };
+        var saved = await dialog.ShowDialog<bool>(owner);
+        if (!saved) vm.DiscardUnsavedAttachments();
+        return saved ? vm.Result : null;
+    }
+
+    private async Task<bool> ShowDeleteDocumentationDialog(DocumentationItem item)
+    {
+        var info = new ConfirmDialogInfo
+        {
+            Title       = "Eintrag löschen?",
+            Message     = $"\"{item.Model.Title}\" ({item.StudentName}) wird als gelöscht markiert und nicht mehr angezeigt.",
+            ConfirmText = "Löschen",
+        };
+        var dialog = new ConfirmDialog { DataContext = info };
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        return owner is not null && await dialog.ShowDialog<bool>(owner);
+    }
 }