fix: Fehlzeitenkalender in Templates

2026-09-16 00:50:10 +02:00
parent 6e57bf407d
commit 6dccf96039
7 changed files with 166 additions and 42 deletions
@@ -14,6 +14,7 @@ public partial class CreateLetterDialogViewModel : ObservableObject
    private readonly ITemplateRenderer _renderer;
    private readonly Func<AttendanceCalendarOptions, DrawingValue>? _attendanceCalendarFactory;
    private readonly Func<AttendanceCalendarOptions, DrawingValue>? _absenceDayListFactory;
+    private readonly Func<AttendanceCalendarOptions, CancellationToken, Task>? _attendanceDataRefresher;
    private AttendanceCalendarOptions _attendanceCalendarOptions = new(
        new DateOnly(DateTime.Today.Year, DateTime.Today.Month, 1), 1);

@@ -21,6 +22,7 @@ public partial class CreateLetterDialogViewModel : ObservableObject
    [ObservableProperty] private LetterContactChoice? _selectedContact;
    [ObservableProperty] private LetterGroupChoice? _selectedGroup;
    [ObservableProperty] private DateTimeOffset? _letterDate = DateTimeOffset.Now;
+    [ObservableProperty] private string _anrede = "";
    [ObservableProperty] private string _letterText = "";
    [ObservableProperty] private string _teacherName = "";
    [ObservableProperty] private string _generationError = "";
@@ -29,6 +31,8 @@ public partial class CreateLetterDialogViewModel : ObservableObject
    [ObservableProperty] private bool _usesAbsenceDayList;
    [ObservableProperty] private bool _attendanceCalendarConfigured;
    [ObservableProperty] private string _attendanceCalendarSummary = "1 Monat · Standardgröße";
+    [ObservableProperty] private bool _isRefreshingAttendanceData;
+    [ObservableProperty] private string _attendanceRefreshError = "";

    public string StudentName => _student.FullName;
    public ObservableCollection<LetterTemplateChoice> Templates { get; } = [];
@@ -47,11 +51,13 @@ public partial class CreateLetterDialogViewModel : ObservableObject
    public CreateLetterDialogViewModel(Student student, TemplateStore templates, ITemplateRenderer renderer,
        IGroupMembershipRepository memberships, IGroupRepository groups,
        Func<AttendanceCalendarOptions, DrawingValue>? attendanceCalendarFactory = null,
-        Func<AttendanceCalendarOptions, DrawingValue>? absenceDayListFactory = null)
+        Func<AttendanceCalendarOptions, DrawingValue>? absenceDayListFactory = null,
+        Func<AttendanceCalendarOptions, CancellationToken, Task>? attendanceDataRefresher = null)
    {
        _student = student; _templates = templates; _renderer = renderer;
        _attendanceCalendarFactory = attendanceCalendarFactory;
        _absenceDayListFactory = absenceDayListFactory;
+        _attendanceDataRefresher = attendanceDataRefresher;
        foreach (var template in templates.GetTemplates()) Templates.Add(new(template));
        foreach (var contact in student.Contacts.Where(c => !c.InvalidSince.HasValue).OrderBy(c => c.Name)) Contacts.Add(new(contact));
        foreach (var membership in memberships.GetByStudent(student.Id))
@@ -73,7 +79,12 @@ public partial class CreateLetterDialogViewModel : ObservableObject
        RebuildCustomPlaceholders(value);
        RefreshValidation();
    }
-    partial void OnSelectedContactChanged(LetterContactChoice? value) => RefreshValidation();
+    partial void OnSelectedContactChanged(LetterContactChoice? value)
+    {
+        Anrede = value?.Model.LetterSalutation ?? "";
+        RefreshValidation();
+    }
+    partial void OnAnredeChanged(string value) => RefreshValidation();
    partial void OnSelectedGroupChanged(LetterGroupChoice? value) => RefreshValidation();
    partial void OnLetterDateChanged(DateTimeOffset? value)
    {
@@ -127,6 +138,7 @@ public partial class CreateLetterDialogViewModel : ObservableObject
            DateOnly.FromDateTime((LetterDate ?? DateTimeOffset.Now).LocalDateTime), LetterText, TeacherName,
            UsesAttendanceCalendar ? _attendanceCalendarFactory?.Invoke(_attendanceCalendarOptions) : null,
            UsesAbsenceDayList ? _absenceDayListFactory?.Invoke(_attendanceCalendarOptions) : null);
+        values["Anrede"] = new TextValue(Anrede); values["Letter.Salutation"] = new TextValue(Anrede);
        foreach (var custom in CustomPlaceholders) values[custom.Name] = custom.ToPlaceholderValue();
        return values;
    }
@@ -159,19 +171,28 @@ public partial class CreateLetterDialogViewModel : ObservableObject
    private static readonly HashSet<string> StandardPlaceholderNames = new(StringComparer.Ordinal)
    {
        "Datum", "CurrentDate", "Empfaenger", "Anrede", "Brieftext", "LehrerName",
-        "Student.FirstName", "Student.LastName", "Contact.Name", "Contact.Address", "Contact.Street",
+        "Student.FirstName", "Student.LastName", "Student.Name", "Contact.Name", "Contact.Address", "Contact.Street",
        "Contact.PostalCode", "Contact.City", "Letter.Salutation", "Group.Name", "SchoolYear",
        StudentAttendanceCalendarDrawingBuilder.PlaceholderName, StudentAbsenceDayListDrawingBuilder.PlaceholderName,
    };

    public AttendanceCalendarOptions GetAttendanceCalendarOptions() => _attendanceCalendarOptions;

-    public void SetAttendanceCalendarOptions(AttendanceCalendarOptions options)
+    public async Task SetAttendanceCalendarOptionsAsync(AttendanceCalendarOptions options, CancellationToken token = default)
    {
        _attendanceCalendarOptions = options with { StartMonth = options.NormalizedStartMonth,
            MonthCount = options.NormalizedMonthCount };
        AttendanceCalendarConfigured = true;
        AttendanceCalendarSummary = FormatAttendanceCalendarSummary(_attendanceCalendarOptions);
+        AttendanceRefreshError = "";
+        if (_attendanceDataRefresher is not null)
+        {
+            IsRefreshingAttendanceData = true;
+            try { await _attendanceDataRefresher(_attendanceCalendarOptions, token); }
+            catch (WebUntisIntegrationException ex)
+            { AttendanceRefreshError = $"WebUntis-Daten konnten nicht aktualisiert werden: {ex.Message}"; }
+            finally { IsRefreshingAttendanceData = false; }
+        }
        RefreshValidation();
    }