Untis API Integration

2026-08-24 21:52:00 +02:00
parent 5841d96c5b
commit 0f10f754d0
26 changed files with 1237 additions and 58 deletions
@@ -25,6 +25,9 @@
          <Button Content="＋ Schüler" Command="{Binding AddStudentCommand}" IsEnabled="{Binding IsEditable}"/>
          <Button Content="⇩ Teilnehmer importieren…" Click="OnImportParticipantsClick"
                  IsEnabled="{Binding IsEditable}"/>
+          <Button Content="↻ Aus WebUntis…" Click="OnImportParticipantsFromWebUntisClick"
+                  IsEnabled="{Binding IsEditable}"/>
+          <Button Content="Fehlzeiten abgleichen…" Click="OnCompareWebUntisAbsencesClick"/>
          <Button Content="{Binding SelectedStudent.WithdrawActionLabel}"
                  Command="{Binding WithdrawStudentCommand}"
                  IsVisible="{Binding SelectedStudent, Converter={x:Static ObjectConverters.IsNotNull}}"/>
@@ -13,6 +13,7 @@ using LehrerApp.Desktop.Views.Shared;
 using LehrerApp.Desktop.Views.Students;
 using LehrerApp.Desktop.Views.Workload;
 using Microsoft.Extensions.DependencyInjection;
+using System.Text;

 namespace LehrerApp.Desktop.Views.Groups;

@@ -113,18 +114,7 @@ public partial class GroupDetailView : UserControl
                throw new InvalidDataException("Die Importdatei ist größer als 20 MB.");

            var importFile = new ImportFile(files[0].Name, buffer.ToArray());
-            var preview = await Task.Run(async () =>
-                await service.AnalyzeAsync(importFile, vm.Group.Id).ConfigureAwait(false));
-            var dialogVm = new StudentImportDialogViewModel(service, preview, files[0].Name);
-            var dialog = new StudentImportDialog { DataContext = dialogVm };
-            if (!await dialog.ShowDialog<bool>(owner)) return;
-
-            vm.LoadStudents();
-            vm.ParticipationTab.RefreshCurrentGrid();
-            var result = dialogVm.Result!;
-            App.Services.GetRequiredService<NotificationService>().ShowSuccess(
-                $"Teilnehmerimport abgeschlossen: {result.CreatedStudents} neu, "
-                + $"{result.UpdatedStudents} ergänzt, {result.CreatedMemberships} zugeordnet.");
+            await ShowStudentImportPreview(owner, vm, importFile, files[0].Name);
        }
        catch (Exception ex) when (ex is ImportFormatException
                                   or InvalidDataException
@@ -135,6 +125,85 @@ public partial class GroupDetailView : UserControl
        }
    }

+    private async void OnImportParticipantsFromWebUntisClick(object? sender, RoutedEventArgs e)
+    {
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null || DataContext is not GroupDetailViewModel vm || vm.Group is null) return;
+        try
+        {
+            var untis = App.Services.GetRequiredService<WebUntisIntegrationService>();
+            var selectionVm = new WebUntisClassSelectionViewModel(untis);
+            var selection = new WebUntisClassSelectionDialog { DataContext = selectionVm };
+            await selectionVm.InitializeAsync();
+            if (!await selection.ShowDialog<bool>(owner) || selectionVm.SelectedClass is null) return;
+
+            var report = await untis.GetStudentsAsync(selectionVm.SelectedClass.Name);
+            var importFile = BuildWebUntisStudentImport(report);
+            await ShowStudentImportPreview(owner, vm, importFile,
+                $"WebUntis · {selectionVm.SelectedClass.Name}");
+        }
+        catch (WebUntisIntegrationException ex)
+        {
+            App.Services.GetRequiredService<NotificationService>().ShowError(ex.Message);
+        }
+        catch (Exception ex) when (ex is ImportFormatException or InvalidDataException)
+        {
+            App.Services.GetRequiredService<NotificationService>().ShowError(ex.Message);
+        }
+    }
+
+    private async void OnCompareWebUntisAbsencesClick(object? sender, RoutedEventArgs e)
+    {
+        var owner = TopLevel.GetTopLevel(this) as Window;
+        if (owner is null || DataContext is not GroupDetailViewModel vm || vm.Group is null) return;
+        var dialogVm = new WebUntisAbsenceComparisonViewModel(vm.Group,
+            App.Services.GetRequiredService<WebUntisIntegrationService>(),
+            App.Services.GetRequiredService<IStudentRepository>(),
+            App.Services.GetRequiredService<IParticipationSessionRepository>(),
+            App.Services.GetRequiredService<IParticipationRepository>());
+        await new WebUntisAbsenceComparisonDialog { DataContext = dialogVm }.ShowDialog(owner);
+        vm.ParticipationTab.RefreshCurrentGrid();
+    }
+
+    private static ImportFile BuildWebUntisStudentImport(UntisStudentReportDto report)
+    {
+        var builder = new StringBuilder();
+        builder.AppendLine("longName\tforeName\tgender\tbirthDate\tklasse.name\texternKey\taddress.email\taddress.mobile\taddress.phone\taddress.city\taddress.postCode\taddress.street");
+        foreach (var student in report.Students)
+        {
+            var values = new[]
+            {
+                student.LongName ?? student.Name, student.ForeName, student.Gender,
+                student.BirthDate?.ToString() ?? student.BirthDateRaw, student.ClassName,
+                student.ExternKey.ToString(), student.Address.Email, student.Address.Mobile,
+                student.Address.Phone, student.Address.City, student.Address.PostCode, student.Address.Street,
+            };
+            builder.AppendLine(string.Join('\t', values.Select(SafeTsv)));
+        }
+        return new ImportFile("webuntis-students.csv", Encoding.UTF8.GetBytes(builder.ToString()));
+    }
+
+    private static string SafeTsv(string? value) => (value ?? "").Replace('\t', ' ')
+        .Replace('\r', ' ').Replace('\n', ' ');
+
+    private static async Task ShowStudentImportPreview(Window owner, GroupDetailViewModel vm,
+        ImportFile importFile, string sourceName)
+    {
+        var service = App.Services.GetRequiredService<StudentImportService>();
+        var preview = await Task.Run(async () =>
+            await service.AnalyzeAsync(importFile, vm.Group!.Id).ConfigureAwait(false));
+        var dialogVm = new StudentImportDialogViewModel(service, preview, sourceName);
+        var dialog = new StudentImportDialog { DataContext = dialogVm };
+        if (!await dialog.ShowDialog<bool>(owner)) return;
+
+        vm.LoadStudents();
+        vm.ParticipationTab.RefreshCurrentGrid();
+        var result = dialogVm.Result!;
+        App.Services.GetRequiredService<NotificationService>().ShowSuccess(
+            $"Teilnehmerimport abgeschlossen: {result.CreatedStudents} neu, "
+            + $"{result.UpdatedStudents} ergänzt, {result.CreatedMemberships} zugeordnet.");
+    }
+
    private async Task<bool> ShowWithdrawStudentDialog(StudentSummary student)
    {
        if (DataContext is not GroupDetailViewModel vm || vm.Group is null) return false;
@@ -0,0 +1,42 @@
+<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.WebUntisAbsenceComparisonDialog"
+        x:DataType="vm:WebUntisAbsenceComparisonViewModel"
+        Title="Fehlzeiten mit WebUntis abgleichen" Width="850" Height="620"
+        MinWidth="700" MinHeight="450" WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="24" RowSpacing="12">
+    <StackPanel Grid.Row="0" Spacing="4">
+      <TextBlock Text="Fehlzeiten mit WebUntis abgleichen" Classes="dialogtitle"/>
+      <TextBlock Text="Nur markierte Zeilen mit einer vorhandenen lokalen Kursstunde werden übernommen."
+                 FontSize="12" Opacity="0.65"/>
+    </StackPanel>
+    <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8">
+      <DatePicker SelectedDate="{Binding StartDate}"/>
+      <TextBlock Text="bis" VerticalAlignment="Center"/>
+      <DatePicker SelectedDate="{Binding EndDate}"/>
+      <Button Content="Fehlzeiten laden" Command="{Binding LoadCommand}" IsEnabled="{Binding !Busy}"/>
+    </StackPanel>
+    <ScrollViewer Grid.Row="2">
+      <ItemsControl ItemsSource="{Binding Rows}">
+        <ItemsControl.ItemTemplate>
+          <DataTemplate x:DataType="vm:WebUntisAbsenceRow">
+            <Grid ColumnDefinitions="Auto,1.5*,90,90,1.5*,1.5*" ColumnSpacing="8" Margin="0,3">
+              <CheckBox Grid.Column="0" IsChecked="{Binding Selected}" IsEnabled="{Binding CanApply}"/>
+              <TextBlock Grid.Column="1" Text="{Binding StudentName}" VerticalAlignment="Center"/>
+              <TextBlock Grid.Column="2" Text="{Binding DateLabel}" VerticalAlignment="Center"/>
+              <TextBlock Grid.Column="3" Text="{Binding TimeLabel}" VerticalAlignment="Center"/>
+              <TextBlock Grid.Column="4" Text="{Binding UntisStatus}" TextWrapping="Wrap" VerticalAlignment="Center"/>
+              <TextBlock Grid.Column="5" Text="{Binding LocalStatus}" TextWrapping="Wrap" VerticalAlignment="Center"/>
+            </Grid>
+          </DataTemplate>
+        </ItemsControl.ItemTemplate>
+      </ItemsControl>
+    </ScrollViewer>
+    <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
+      <TextBlock Grid.Column="0" Text="{Binding Status}" FontSize="12" TextWrapping="Wrap" VerticalAlignment="Center"/>
+      <Button Grid.Column="1" Content="Schließen" Click="OnClose"/>
+      <Button Grid.Column="2" Content="Markierte übernehmen" Command="{Binding ApplyCommand}" IsEnabled="{Binding !Busy}"/>
+    </Grid>
+  </Grid>
+</Window>
@@ -0,0 +1,10 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace LehrerApp.Desktop.Views.Groups;
+
+public partial class WebUntisAbsenceComparisonDialog : Window
+{
+    public WebUntisAbsenceComparisonDialog() => InitializeComponent();
+    private void OnClose(object? sender, RoutedEventArgs e) => Close();
+}
@@ -0,0 +1,34 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Groups"
+        xmlns:svc="clr-namespace:LehrerApp.Desktop.Services"
+        x:Class="LehrerApp.Desktop.Views.Groups.WebUntisClassSelectionDialog"
+        x:DataType="vm:WebUntisClassSelectionViewModel"
+        Title="Schüler aus WebUntis" Width="480" SizeToContent="Height"
+        CanResize="False" WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="*,Auto" Margin="24">
+    <StackPanel Grid.Row="0" Spacing="12">
+      <TextBlock Text="WebUntis-Klasse auswählen" Classes="dialogtitle"/>
+      <TextBlock Text="Die Schülerliste wird danach im gewohnten Importdialog geprüft."
+                 FontSize="12" Opacity="0.65" TextWrapping="Wrap"/>
+      <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+        <ComboBox Grid.Column="0" ItemsSource="{Binding SchoolYears}" SelectedItem="{Binding SelectedSchoolYear}">
+          <ComboBox.ItemTemplate><DataTemplate x:DataType="svc:UntisSchoolYearDto"><TextBlock Text="{Binding Name}"/></DataTemplate></ComboBox.ItemTemplate>
+        </ComboBox>
+        <Button Grid.Column="1" Content="Klassen laden" Command="{Binding LoadClassesCommand}" IsEnabled="{Binding !Busy}"/>
+      </Grid>
+      <ComboBox ItemsSource="{Binding Classes}" SelectedItem="{Binding SelectedClass}" PlaceholderText="Klasse auswählen">
+        <ComboBox.ItemTemplate>
+          <DataTemplate x:DataType="svc:UntisClassDto">
+            <TextBlock><Run Text="{Binding Name}"/><Run Text=" — "/><Run Text="{Binding LongName}"/></TextBlock>
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+      <TextBlock Text="{Binding Status}" FontSize="12" TextWrapping="Wrap"/>
+    </StackPanel>
+    <Grid Grid.Row="1" ColumnDefinitions="*,8,*" Margin="0,20,0,0">
+      <Button Grid.Column="0" Content="Abbrechen" Click="OnCancel"/>
+      <Button Grid.Column="2" Content="Schülerliste laden" IsEnabled="{Binding CanConfirm}" Click="OnConfirm"/>
+    </Grid>
+  </Grid>
+</Window>
@@ -0,0 +1,15 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using LehrerApp.Desktop.ViewModels.Groups;
+
+namespace LehrerApp.Desktop.Views.Groups;
+
+public partial class WebUntisClassSelectionDialog : Window
+{
+    public WebUntisClassSelectionDialog() => InitializeComponent();
+    private void OnCancel(object? sender, RoutedEventArgs e) => Close(false);
+    private void OnConfirm(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is WebUntisClassSelectionViewModel { SelectedClass: not null }) Close(true);
+    }
+}