Arbeitszeit: Aufgabenverwaltung (Kapitel 6.1)

Navigationspunkt "Arbeitszeit" zeigt jetzt eine echte Aufgabenliste statt eines Placeholders: Filter nach Status/Kategorie/Gruppe (Standard blendet Erledigtes aus), Sortierung nach Fälligkeit, Anlegen/Bearbeiten-Dialog, Status per Klick durchschalten.
2026-08-15 22:33:40 +02:00
parent 0800832ae5
commit 5c0b6854f5
11 changed files with 692 additions and 6 deletions
@@ -0,0 +1,69 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Workload"
+        xmlns:models="clr-namespace:LehrerApp.Core.Models;assembly=LehrerApp.Core"
+        x:Class="LehrerApp.Desktop.Views.Workload.AddEditWorkTaskDialog"
+        x:DataType="vm:AddEditWorkTaskDialogViewModel"
+        Title="{Binding DialogTitle}"
+        Width="420" Height="480" MinWidth="380" MinHeight="420"
+        CanResize="True" WindowStartupLocation="CenterOwner">
+
+  <Grid RowDefinitions="*,Auto" Margin="24">
+    <ScrollViewer Grid.Row="0">
+      <StackPanel Spacing="14" Margin="0,0,12,0">
+        <TextBlock Text="{Binding DialogTitle}" Classes="dialogtitle"/>
+
+        <StackPanel Spacing="4">
+          <TextBlock Text="Titel *" FontSize="12" Opacity="0.7"/>
+          <TextBox Text="{Binding Title}" PlaceholderText="z.B. Klausur 8a korrigieren"/>
+          <TextBlock Text="{Binding TitleError}" Foreground="Red" FontSize="11"
+                     IsVisible="{Binding TitleError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+        </StackPanel>
+
+        <Grid ColumnDefinitions="*,8,*">
+          <StackPanel Grid.Column="0" Spacing="4">
+            <TextBlock Text="Kategorie *" FontSize="12" Opacity="0.7"/>
+            <ComboBox ItemsSource="{Binding CategoryOptions}" SelectedItem="{Binding SelectedCategory}"
+                      HorizontalAlignment="Stretch"/>
+          </StackPanel>
+          <StackPanel Grid.Column="2" Spacing="4">
+            <TextBlock Text="Gruppe (optional)" FontSize="12" Opacity="0.7"/>
+            <ComboBox ItemsSource="{Binding Groups}" SelectedItem="{Binding SelectedGroup}"
+                      HorizontalAlignment="Stretch" PlaceholderText="Keine Gruppe">
+              <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="models:LearningGroup">
+                  <TextBlock Text="{Binding Name}"/>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+          </StackPanel>
+        </Grid>
+
+        <Grid ColumnDefinitions="*,8,*">
+          <StackPanel Grid.Column="0" Spacing="4">
+            <TextBlock Text="Fällig am (optional)" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding DueDateText}" PlaceholderText="TT.MM.JJJJ"/>
+            <TextBlock Text="{Binding DueDateError}" Foreground="Red" FontSize="11"
+                       IsVisible="{Binding DueDateError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+          </StackPanel>
+          <StackPanel Grid.Column="2" Spacing="4">
+            <TextBlock Text="Geschätzte Dauer in min (optional)" FontSize="12" Opacity="0.7"/>
+            <TextBox Text="{Binding EstimatedMinutesText}" PlaceholderText="z.B. 90"/>
+            <TextBlock Text="{Binding EstimatedMinutesError}" Foreground="Red" FontSize="11"
+                       IsVisible="{Binding EstimatedMinutesError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+          </StackPanel>
+        </Grid>
+
+        <StackPanel Spacing="4">
+          <TextBlock Text="Notizen (optional)" FontSize="12" Opacity="0.7"/>
+          <TextBox Text="{Binding Notes}" AcceptsReturn="True" TextWrapping="Wrap" Height="80"/>
+        </StackPanel>
+      </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="Speichern" HorizontalAlignment="Stretch" Click="OnSave"/>
+    </Grid>
+  </Grid>
+</Window>
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using LehrerApp.Desktop.ViewModels.Workload;
+
+namespace LehrerApp.Desktop.Views.Workload;
+
+public partial class AddEditWorkTaskDialog : Window
+{
+    public AddEditWorkTaskDialog() => InitializeComponent();
+
+    private void OnSave(object? s, RoutedEventArgs e)
+    {
+        if (DataContext is AddEditWorkTaskDialogViewModel 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);
+}
@@ -0,0 +1,70 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Workload"
+             xmlns:shared="clr-namespace:LehrerApp.Desktop.Views.Shared"
+             x:Class="LehrerApp.Desktop.Views.Workload.WorkTaskListView"
+             x:DataType="vm:WorkTaskListViewModel">
+  <Grid RowDefinitions="Auto,Auto,*">
+    <Border Grid.Row="0" Padding="20,16"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"
+            BorderThickness="0,0,0,1">
+      <Grid ColumnDefinitions="*,Auto">
+        <shared:PageHeader Grid.Column="0" Title="Arbeitszeit" Subtitle="{Binding CountSummary}"/>
+        <Button Grid.Column="1" Content="＋ Neue Aufgabe"
+                Command="{Binding AddTaskCommand}" VerticalAlignment="Center"/>
+      </Grid>
+    </Border>
+
+    <Grid Grid.Row="1" ColumnDefinitions="Auto,Auto,Auto" Margin="16,10" HorizontalAlignment="Left">
+      <ComboBox Grid.Column="0" ItemsSource="{Binding StatusFilterOptions}"
+                SelectedItem="{Binding StatusFilter}" Margin="0,0,8,0"/>
+      <ComboBox Grid.Column="1" ItemsSource="{Binding CategoryFilterOptions}"
+                SelectedItem="{Binding CategoryFilter}" Margin="0,0,8,0"/>
+      <ComboBox Grid.Column="2" ItemsSource="{Binding GroupFilterOptions}"
+                SelectedItem="{Binding GroupFilter}"/>
+    </Grid>
+
+    <ScrollViewer Grid.Row="2" Margin="16,0,16,16">
+      <StackPanel>
+        <ItemsControl ItemsSource="{Binding Tasks}">
+          <ItemsControl.ItemTemplate>
+            <DataTemplate x:DataType="vm:WorkTaskListItem">
+              <Border Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
+                      CornerRadius="6" Padding="12,10" Margin="0,0,0,8">
+                <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto">
+                  <Button Grid.Column="0" Background="{Binding StatusColorHex}" Padding="8,4"
+                          CornerRadius="4" VerticalAlignment="Center"
+                          Command="{Binding $parent[ItemsControl].((vm:WorkTaskListViewModel)DataContext).CycleStatusCommand}"
+                          CommandParameter="{Binding}"
+                          ToolTip.Tip="Klicken, um den Status zu wechseln">
+                    <TextBlock Text="{Binding StatusLabel}" FontSize="12" Foreground="White"/>
+                  </Button>
+                  <StackPanel Grid.Column="1" Margin="10,0" VerticalAlignment="Center">
+                    <TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="13"/>
+                    <TextBlock FontSize="11" Opacity="0.6">
+                      <Run Text="{Binding CategoryLabel}"/>
+                      <Run Text=" · "/>
+                      <Run Text="{Binding GroupName}"/>
+                    </TextBlock>
+                  </StackPanel>
+                  <TextBlock Grid.Column="2" Text="{Binding DueDateDisplay}" VerticalAlignment="Center"
+                             Margin="0,0,10,0" FontSize="12" Foreground="{Binding DueDateColorHex}"/>
+                  <TextBlock Grid.Column="3" Text="{Binding EstimatedMinutesDisplay}"
+                             VerticalAlignment="Center" Opacity="0.6" FontSize="12" Margin="0,0,10,0"/>
+                  <Button Grid.Column="4" Content="Bearbeiten" FontSize="11" Padding="8,3" Margin="0,0,4,0"
+                          Command="{Binding $parent[ItemsControl].((vm:WorkTaskListViewModel)DataContext).EditTaskCommand}"
+                          CommandParameter="{Binding}"/>
+                  <Button Grid.Column="5" Content="Löschen" FontSize="11" Padding="8,3"
+                          Command="{Binding $parent[ItemsControl].((vm:WorkTaskListViewModel)DataContext).DeleteTaskCommand}"
+                          CommandParameter="{Binding}"/>
+                </Grid>
+              </Border>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <TextBlock Text="Keine Aufgaben in dieser Filteransicht." Opacity="0.6" Margin="4,12"
+                   IsVisible="{Binding !Tasks.Count}"/>
+      </StackPanel>
+    </ScrollViewer>
+  </Grid>
+</UserControl>
@@ -0,0 +1,31 @@
+using Avalonia.Controls;
+using LehrerApp.Core.Interfaces;
+using LehrerApp.Core.Models;
+using LehrerApp.Desktop.ViewModels.Workload;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace LehrerApp.Desktop.Views.Workload;
+
+public partial class WorkTaskListView : UserControl
+{
+    public WorkTaskListView() => InitializeComponent();
+
+    protected override void OnDataContextChanged(EventArgs e)
+    {
+        base.OnDataContextChanged(e);
+        if (DataContext is WorkTaskListViewModel vm)
+            vm.OnEditTask = ShowEditDialog;
+    }
+
+    private async Task<WorkTask?> ShowEditDialog(WorkTask? source)
+    {
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null) return null;
+
+        var groups = App.Services.GetRequiredService<IGroupRepository>().GetAll(includeInactive: true);
+        var vm = new AddEditWorkTaskDialogViewModel(source, groups);
+        var dialog = new AddEditWorkTaskDialog { DataContext = vm };
+        await dialog.ShowDialog<bool>(owner);
+        return vm.Result;
+    }
+}