Automate overdue homework and show outstanding work in teaching mode
CI / build-and-test (push) Canceled after 0s

This commit is contained in:
admin committed 2026-09-25 22:02:00 +02:00
1 parent f3e23ad207
commit 4b73d2bea2
10 files changed
+314 -2

No files matched your search

+28
View File
@@ -28,6 +28,7 @@ public class App : Application
private static bool _exitHandlerAttached;
private static Task _initialPolls = Task.CompletedTask;
private static readonly CancellationTokenSource StartupCancellation = new();
private static DispatcherTimer? _homeworkOverdueTimer;
public override void Initialize() => AvaloniaXamlLoader.Load(this);
@@ -100,6 +101,7 @@ public class App : Application
splash?.SetProgress(60, "Papierkorb aufräumen …");
await Task.Run(() => Services.GetRequiredService<ITrashRepository>()
.PurgeOlderThan(DateTime.UtcNow.AddDays(-30)));
await AdvanceHomeworkAsync();
if (!_exitHandlerAttached)
{
@@ -126,6 +128,7 @@ public class App : Application
main.EnableFinalSync(syncEngine);
desktop.MainWindow = main;
main.Show();
StartHomeworkOverdueTimer();
splash?.SetProgress(100, "Bereit");
windowToClose?.Close();
AppBootstrapper.Logger.Info($"Start: Hauptfenster nach {timer.ElapsedMilliseconds} ms geöffnet.");
@@ -152,6 +155,30 @@ public class App : Application
});
}
private static async Task AdvanceHomeworkAsync()
{
try
{
var changed = await Task.Run(() => Services.GetRequiredService<HomeworkOverdueService>()
.Advance(DateOnly.FromDateTime(DateTime.Today)));
if (changed > 0) AppBootstrapper.Logger.Info($"{changed} offene Hausaufgaben als nicht nachgereicht markiert.");
}
catch (Exception ex) { AppBootstrapper.Logger.Error("Hausaufgaben-Fristprüfung fehlgeschlagen.", ex); }
}
private static void StartHomeworkOverdueTimer()
{
var timer = new DispatcherTimer { Interval = TimeSpan.FromHours(1) };
timer.Tick += async (_, _) =>
{
timer.Stop();
await AdvanceHomeworkAsync();
if (_serviceProvider is not null) timer.Start();
};
_homeworkOverdueTimer = timer;
timer.Start();
}
/// <summary>Wechselt die Darstellung sofort, ohne Neustart (12.4) — Avalonia stylt den
/// gesamten sichtbaren Baum automatisch neu, sobald sich <see cref="ThemeVariant"/>
/// ändert.</summary>
@@ -165,6 +192,7 @@ public class App : Application
private static void DisposeServices()
{
_homeworkOverdueTimer?.Stop();
var serviceProvider = Interlocked.Exchange(ref _serviceProvider, null);
if (serviceProvider is null) return;
+1
View File
@@ -197,6 +197,7 @@ public static class AppBootstrapper
services.AddSingleton<GradingService>();
services.AddSingleton<CompetencyAnalysisService>();
services.AddSingleton<SchoolYearService>();
services.AddSingleton<HomeworkOverdueService>();
services.AddSingleton<GroupRolloverService>();
services.AddSingleton<PublicHolidayService>();
services.AddSingleton(_ => new SchoolCalendarSettingsService(appData));
@@ -0,0 +1,33 @@
using LehrerApp.Core.Interfaces;
using LehrerApp.Core.Models;
namespace LehrerApp.Desktop.Services;
/// <summary>Schließt nicht nachgereichte Hausaufgaben 14 Kalendertage nach der Unterrichtsstunde.
/// Nur noch offene Nachreichungen werden geändert; andere Stati und archivierte Gruppen bleiben
/// unangetastet.</summary>
public sealed class HomeworkOverdueService(
IGroupRepository groups, IParticipationSessionRepository sessions,
IParticipationRepository participation)
{
public const int GracePeriodDays = 14;
public int Advance(DateOnly today)
{
var cutoff = today.AddDays(-GracePeriodDays);
var activeGroupIds = groups.GetAll().Where(g => g.IsActive).Select(g => g.Id).ToHashSet();
var changed = 0;
foreach (var session in sessions.GetAll()
.Where(s => s.Date <= cutoff && activeGroupIds.Contains(s.GroupId)))
foreach (var entry in participation.GetBySession(session.Id))
{
if (entry.Homework != HomeworkStatus.MissingOpen &&
!(entry.Homework is null && entry.HomeworkMissing)) continue;
entry.Homework = HomeworkStatus.MissingOverdue;
entry.HomeworkMissing = true;
participation.Save(entry);
changed++;
}
return changed;
}
}
@@ -0,0 +1,77 @@
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using LehrerApp.Core.Interfaces;
using LehrerApp.Core.Models;
using LehrerApp.Core.Services;
namespace LehrerApp.Desktop.ViewModels.Groups;
public sealed record OutstandingHomeworkRow(string StudentName, DateOnly Date, HomeworkStatus Status)
{
public string DateLabel => Date.ToString("dd.MM.yyyy");
public string StatusLabel => HomeworkDisplay.Label(Status);
}
/// <summary>Jüngste noch fehlende Hausaufgaben der aktuellen Lerngruppe. Liest bei jedem Öffnen
/// und auf Wunsch erneut, damit die Anwesenheit der laufenden Stunde berücksichtigt wird.</summary>
public partial class TeachingModeOutstandingHomeworkViewModel(
Guid groupId, DateOnly lessonDate,
IStudentRepository students, IGroupMembershipRepository memberships,
IParticipationSessionRepository sessions, IParticipationRepository participation) : ObservableObject
{
private const int LookbackDays = 120;
private const int MaxRows = 20;
private Guid? _currentSessionId;
public ObservableCollection<OutstandingHomeworkRow> Rows { get; } = [];
public string Header => $"Offene Nachreichungen ({Rows.Count})";
public bool HasRows => Rows.Count > 0;
[ObservableProperty] private bool _isExpanded;
[ObservableProperty] private bool _includeAbsentStudents;
partial void OnIsExpandedChanged(bool value)
{
if (value) Refresh();
}
partial void OnIncludeAbsentStudentsChanged(bool value) => Refresh();
public void SetCurrentSessionId(Guid? sessionId) => _currentSessionId = sessionId;
[RelayCommand]
public void Refresh()
{
Rows.Clear();
var groupMemberships = memberships.GetByGroup(groupId);
var roster = students.GetByGroup(groupId)
.Where(s => groupMemberships.FirstOrDefault(m => m.StudentId == s.Id) is not { } membership ||
GroupMembershipService.IsActiveOn(membership, lessonDate))
.ToDictionary(s => s.Id);
var absentIds = _currentSessionId is { } sessionId
? participation.GetBySession(sessionId)
.Where(e => e.Attendance is not null and not AttendanceStatus.Present
and not AttendanceStatus.Late and not AttendanceStatus.SignificantlyLate)
.Select(e => e.StudentId).ToHashSet()
: [];
var rows = sessions.GetByGroup(groupId)
.Where(s => s.Date < lessonDate && s.Date >= lessonDate.AddDays(-LookbackDays))
.SelectMany(session => participation.GetBySession(session.Id)
.Select(entry => (session.Date, Entry: entry)))
.Where(x => roster.ContainsKey(x.Entry.StudentId) &&
(IncludeAbsentStudents || !absentIds.Contains(x.Entry.StudentId)))
.Select(x => (x.Date, x.Entry.StudentId, Status: HomeworkDisplay.Effective(x.Entry)))
.Where(x => x.Status is { } status && HomeworkDisplay.CountsAsMissing(status))
.OrderByDescending(x => x.Date)
.ThenBy(x => roster[x.StudentId].FullName)
.Take(MaxRows);
foreach (var row in rows)
Rows.Add(new OutstandingHomeworkRow(roster[row.StudentId].FullName, row.Date, row.Status!.Value));
OnPropertyChanged(nameof(Header));
OnPropertyChanged(nameof(HasRows));
}
}
@@ -33,10 +33,12 @@ public class TeachingModeViewModel
/// der richtigen Sitzung starten.</summary>
public ParticipationTabViewModel Participation { get; }
public TeachingModeHomeworkViewModel Homework { get; }
public TeachingModeOutstandingHomeworkViewModel? OutstandingHomework { get; }
public TeachingModeViewModel(Lesson lesson, LearningGroup group,
IAlternativeLessonPathRepository alternativePaths, ILessonRepository lessons,
SeatingPlanTabViewModel seatingPlan, ParticipationTabViewModel participation)
SeatingPlanTabViewModel seatingPlan, ParticipationTabViewModel participation,
TeachingModeOutstandingHomeworkViewModel? outstandingHomework = null)
{
GroupName = group.Name;
Timeline = new TeachingTimelineViewModel(lesson, lessons, !group.IsActive);
@@ -52,6 +54,16 @@ public class TeachingModeViewModel
if (SeatingPlan.SelectedSession is { } linkedSession)
Participation.SelectedSession =
Participation.Sessions.FirstOrDefault(s => s.Id == linkedSession.Id);
OutstandingHomework = outstandingHomework;
OutstandingHomework?.SetCurrentSessionId(SeatingPlan.SelectedSession?.Id);
OutstandingHomework?.Refresh();
SeatingPlan.OnAssessmentChanged = () => OutstandingHomework?.Refresh();
SeatingPlan.PropertyChanged += (_, args) =>
{
if (args.PropertyName != nameof(SeatingPlan.SelectedSession)) return;
OutstandingHomework?.SetCurrentSessionId(SeatingPlan.SelectedSession?.Id);
OutstandingHomework?.Refresh();
};
// 4.5.4: dieselbe "letzte Stunde vor dieser"-Suche wie das Stundenplan-Badge
// "Hausaufgabe kontrollieren" (TimetableViewModel.HasUnhandledHomework) - 120 Tage
@@ -157,6 +157,35 @@
</StackPanel>
</Border>
<Expander Header="{Binding OutstandingHomework.Header}"
IsExpanded="{Binding OutstandingHomework.IsExpanded}">
<StackPanel Spacing="8" Margin="0,6,0,0">
<TextBlock Text="Jüngste fehlende Hausaufgaben der Lerngruppe (letzte 120 Tage)."
FontSize="11" Opacity="0.65" TextWrapping="Wrap"/>
<CheckBox Content="Abwesende dieser Stunde anzeigen"
IsChecked="{Binding OutstandingHomework.IncludeAbsentStudents}" FontSize="12"/>
<Button Content="Aktualisieren" Command="{Binding OutstandingHomework.RefreshCommand}"
HorizontalAlignment="Left" FontSize="11" Padding="6,4"/>
<TextBlock Text="Keine offenen Nachreichungen für die angezeigten Schüler."
IsVisible="{Binding !OutstandingHomework.HasRows}" FontSize="12" TextWrapping="Wrap"/>
<ItemsControl ItemsSource="{Binding OutstandingHomework.Rows}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:OutstandingHomeworkRow">
<Border Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
CornerRadius="5" Padding="8,6" Margin="0,0,0,5">
<StackPanel Spacing="2">
<TextBlock Text="{Binding StudentName}" FontWeight="SemiBold" TextWrapping="Wrap"/>
<TextBlock FontSize="11" Opacity="0.75" TextWrapping="Wrap">
<Run Text="{Binding DateLabel}"/><Run Text=" · "/><Run Text="{Binding StatusLabel}"/>
</TextBlock>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Expander>
<StackPanel Spacing="4">
<TextBlock Text="Hausaufgabe (diese Stunde)" FontSize="12" FontWeight="SemiBold" Opacity="0.6"/>
<TextBox Text="{Binding Homework.CurrentHomework, Mode=TwoWay}" AcceptsReturn="True"
@@ -26,13 +26,19 @@ public partial class TeachingModeWindow : Window
}
var group = App.Services.GetRequiredService<IGroupRepository>().GetById(lesson.GroupId);
if (group is null) return;
var outstandingHomework = new TeachingModeOutstandingHomeworkViewModel(group.Id, lesson.Date,
App.Services.GetRequiredService<IStudentRepository>(),
App.Services.GetRequiredService<IGroupMembershipRepository>(),
App.Services.GetRequiredService<IParticipationSessionRepository>(),
App.Services.GetRequiredService<IParticipationRepository>());
var window = new TeachingModeWindow
{
DataContext = new TeachingModeViewModel(lesson, group,
App.Services.GetRequiredService<IAlternativeLessonPathRepository>(),
App.Services.GetRequiredService<ILessonRepository>(),
App.Services.GetRequiredService<SeatingPlanTabViewModel>(),
App.Services.GetRequiredService<ParticipationTabViewModel>())
App.Services.GetRequiredService<ParticipationTabViewModel>(),
outstandingHomework)
};
OpenWindows.Add(lesson.Id, window);
window.Closed += (_, _) => OpenWindows.Remove(lesson.Id);
@@ -100,6 +106,7 @@ public partial class TeachingModeWindow : Window
var dialog = new AttendanceHomeworkQuickInputDialog { DataContext = quickVm };
await dialog.ShowDialog(this);
(DataContext as TeachingModeViewModel)?.SeatingPlan.ReloadSeatBadgesFromRepository();
(DataContext as TeachingModeViewModel)?.OutstandingHomework?.Refresh();
}
private void OnClose(object? sender, RoutedEventArgs e) => Close();