admin/LehrerApp
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Klausuren-Hauptseite: gruppenübergreifende Liste mit Prioritäts-Score statt Datum

Browse Source 
Sidebar-Klausuren war bisher ein Placeholder. Neue Seite zeigt alle Klausuren des
Schuljahres sortiert nach abgeleiteter Dringlichkeit (Korrekturfortschritt statt
manuellem Status), mit Detailbereich, Parallelkurs-Umschalter und Notenspiegel.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
admin
2026-08-29 01:27:18 +02:00
co-authored by Claude Sonnet 5
parent 9b04d7eb98
commit 7fbf035cbb
16 changed files with 950 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LehrerApp.Desktop/ViewModels/DashboardViewModel.cs
+3 -5
View File
@@ -386,12 +386,10 @@ public partial class DashboardViewModel : ObservableObject
.Where(e => e.Status is ExamStatus.Conducted or ExamStatus.Graded)
.OrderBy(e => e.Date))
{
var expected = _memberships.GetByGroup(group.Id)
.Count(m => GroupMembershipService.IsActiveOn(m, exam.Date));
var evaluated = _examResults.GetByExam(exam.Id)
.Count(r => r.Absent || !string.IsNullOrWhiteSpace(r.Grade) || r.Points.Count > 0);
var (expected, evaluated) = ExamCorrectionCounter.Count(exam,
_memberships.GetByGroup(group.Id), _examResults.GetByExam(exam.Id));
OpenCorrections.Add(new CorrectionProgressItem(exam.Id, group.Id, exam.Title,
group.Name, exam.Date, Math.Min(evaluated, expected), expected, today));
group.Name, exam.Date, evaluated, expected, today));
}
}
LehrerApp.Desktop/ViewModels/Exams/ExamsOverviewViewModel.cs
+253
View File
@@ -0,0 +1,253 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using LehrerApp.Core.Interfaces;
using LehrerApp.Core.Models;
using LehrerApp.Core.Services;
using LehrerApp.Desktop.ViewModels.Groups;
using System.Collections.ObjectModel;
using System.Globalization;
namespace LehrerApp.Desktop.ViewModels.Exams;
/// Klausuren-Hauptseite (Sidebar "Klausuren"): gruppenübergreifende Liste aller Klausuren des
/// aktuellen Schuljahres, sortiert nach einem unsichtbaren Prioritäts-Score
/// (`ExamPriorityService`) statt nach Datum — unbearbeitete/überfällige Korrekturen oben,
/// erledigte unten. Oben ein Detailbereich zur ausgewählten Klausur, der sich je nach Status
/// unterscheidet (Korrekturfortschritt vs. Notenspiegel), inklusive Umschalter für Parallelkurse
/// (gleiche Arbeit, mehrere Kurse — siehe `Exam.SharedExamGroupId`).
public partial class ExamsOverviewViewModel : ObservableObject
{
private readonly IExamRepository _exams;
private readonly IExamResultRepository _examResults;
private readonly IGroupRepository _groups;
private readonly IGroupMembershipRepository _memberships;
private readonly GradingService _grading;
private readonly SchoolYearService _schoolYear;
public ObservableCollection<ExamListRowViewModel> Rows { get; } = [];
public ObservableCollection<ExamListRowViewModel> Siblings { get; } = [];
public ObservableCollection<GradeBarItem> DetailGradeDistribution { get; } = [];
[ObservableProperty] private ExamListRowViewModel? _selectedRow;
[ObservableProperty] private bool _hasSelection;
[ObservableProperty] private string _emptyHint = "";
[ObservableProperty] private bool _showCorrectionProgress;
[ObservableProperty] private string _progressLabel = "";
[ObservableProperty] private double _progressBarWidth;
[ObservableProperty] private bool _showGradeSummary;
[ObservableProperty] private string _averageLabel = "";
[ObservableProperty] private string _approvalLabel = "";
[ObservableProperty] private string _announcementLabel = "";
public Func<Exam, Task>? OnGradeExam { get; set; }
public Func<Exam, Task>? OnEvaluateExam { get; set; }
public Action<Guid>? OnNavigateToGroup { get; set; }
public ExamsOverviewViewModel(IExamRepository exams, IExamResultRepository examResults,
IGroupRepository groups, IGroupMembershipRepository memberships, GradingService grading,
SchoolYearService schoolYear)
{
_exams = exams; _examResults = examResults; _groups = groups;
_memberships = memberships; _grading = grading; _schoolYear = schoolYear;
}
[RelayCommand]
public void Load()
{
var selectedId = SelectedRow?.Exam.Id;
Rows.Clear();
var groups = _groups.GetBySchoolYear(_schoolYear.CurrentSchoolYear());
var today = DateOnly.FromDateTime(DateTime.Today);
var rows = new List<ExamListRowViewModel>();
foreach (var group in groups)
{
var groupMemberships = _memberships.GetByGroup(group.Id);
foreach (var exam in _exams.GetByGroup(group.Id))
{
var (expected, evaluated) = ExamCorrectionCounter.Count(exam, groupMemberships,
_examResults.GetByExam(exam.Id));
var info = ExamPriorityService.Evaluate(exam, expected, evaluated, today);
rows.Add(new ExamListRowViewModel(exam, group, expected, evaluated, info, today));
}
}
// Parallelkurse markieren, damit die Liste einen Verknüpfungs-Hinweis zeigen kann.
foreach (var group in rows.GroupBy(r => r.Exam.SharedExamGroupId ?? r.Exam.Id))
{
if (group.Count() <= 1) continue;
foreach (var row in group) row.HasSibling = true;
}
foreach (var row in rows.OrderByDescending(r => r.Score))
Rows.Add(row);
EmptyHint = Rows.Count == 0 ? "Keine Klausuren angelegt." : "";
SelectedRow = selectedId is { } id
? Rows.FirstOrDefault(r => r.Exam.Id == id) ?? Rows.FirstOrDefault()
: Rows.FirstOrDefault();
}
partial void OnSelectedRowChanged(ExamListRowViewModel? value) => UpdateDetail(value);
private void UpdateDetail(ExamListRowViewModel? row)
{
HasSelection = row is not null;
Siblings.Clear();
DetailGradeDistribution.Clear();
ShowCorrectionProgress = false;
ShowGradeSummary = false;
if (row is null) return;
ApprovalLabel = row.Exam.ApprovalGrantedAt is { } a
? $"Genehmigt am {a.ToString("dd.MM.yyyy", CultureInfo.InvariantCulture)}"
: "Genehmigung noch ausstehend";
AnnouncementLabel = row.Exam.AnnouncedAt is { } n
? $"Angekündigt am {n.ToString("dd.MM.yyyy", CultureInfo.InvariantCulture)}"
: "Noch nicht angekündigt";
if (row.HasSibling)
{
var anchor = row.Exam.SharedExamGroupId ?? row.Exam.Id;
foreach (var sibling in Rows.Where(r => r != row && (r.Exam.SharedExamGroupId ?? r.Exam.Id) == anchor))
Siblings.Add(sibling);
}
ShowCorrectionProgress = row.Status is ExamListStatus.AwaitingCorrection
or ExamListStatus.CorrectionInProgress or ExamListStatus.CorrectionStuck;
if (ShowCorrectionProgress)
{
ProgressLabel = $"{row.Evaluated} / {row.Expected} korrigiert";
var fraction = row.Expected <= 0 ? 0 : Math.Clamp((double)row.Evaluated / row.Expected, 0, 1);
ProgressBarWidth = fraction * 240.0;
}
ShowGradeSummary = row.Status is ExamListStatus.AwaitingReturn or ExamListStatus.Returned;
if (ShowGradeSummary) LoadGradeSummary(row);
}
private void LoadGradeSummary(ExamListRowViewModel row)
{
var grades = _examResults.GetByExam(row.Exam.Id)
.Where(r => !r.Absent && !string.IsNullOrWhiteSpace(r.Grade))
.Select(r => r.Grade!).ToList();
if (grades.Count == 0) { AverageLabel = "Noch keine Noten erfasst."; return; }
AverageLabel = "Ø " + _grading.WeightedAverage(grades.Select(g => (Grade: g, Weight: 1.0)).ToList())
.ToString("0.00", CultureInfo.InvariantCulture);
var counts = grades.GroupBy(g => g).ToDictionary(g => g.Key, g => g.Count());
var maxCount = counts.Count == 0 ? 0 : counts.Values.Max();
foreach (var entry in row.Exam.GradingKey.OrderByDescending(e => e.MinPercent))
{
counts.TryGetValue(entry.Grade, out var count);
DetailGradeDistribution.Add(new GradeBarItem(entry.Grade, count, grades.Count, maxCount));
}
}
[RelayCommand]
private void SelectExam(ExamListRowViewModel row) => SelectedRow = row;
[RelayCommand]
private async Task GradeSelected()
{
if (SelectedRow is null || OnGradeExam is null) return;
await OnGradeExam(SelectedRow.Exam);
Load();
}
[RelayCommand]
private async Task EvaluateSelected()
{
if (SelectedRow is null || OnEvaluateExam is null) return;
await OnEvaluateExam(SelectedRow.Exam);
Load();
}
[RelayCommand]
private void GoToGroup()
{
if (SelectedRow is null) return;
OnNavigateToGroup?.Invoke(SelectedRow.GroupId);
}
[RelayCommand]
private void ToggleApproval() => ToggleDate(SelectedRow?.Exam, e => e.ApprovalGrantedAt,
(e, v) => e.ApprovalGrantedAt = v);
[RelayCommand]
private void ToggleAnnouncement() => ToggleDate(SelectedRow?.Exam, e => e.AnnouncedAt,
(e, v) => e.AnnouncedAt = v);
private void ToggleDate(Exam? exam, Func<Exam, DateOnly?> get, Action<Exam, DateOnly?> set)
{
if (exam is null) return;
set(exam, get(exam) is null ? DateOnly.FromDateTime(DateTime.Today) : null);
exam.UpdatedAt = DateTime.UtcNow;
_exams.Save(exam);
UpdateDetail(SelectedRow);
}
}
// ── Zeile in der Klausurliste ────────────────────────────────────────────────
public class ExamListRowViewModel
{
public Exam Exam { get; }
public Guid GroupId { get; }
public string Title { get; }
public string GroupLabel { get; }
public int Expected { get; }
public int Evaluated { get; }
public ExamListStatus Status { get; }
public double Score { get; }
public string StatusLabel { get; }
public string SubLabel { get; }
public bool HasSibling { get; set; }
public bool IsOk { get; }
public bool IsInfo { get; }
public bool IsWarning { get; }
public bool IsDanger { get; }
public ExamListRowViewModel(Exam exam, LearningGroup group, int expected, int evaluated,
ExamPriorityInfo info, DateOnly today)
{
Exam = exam; GroupId = group.Id; Title = exam.Title; GroupLabel = group.Name;
Expected = expected; Evaluated = evaluated; Status = info.Status; Score = info.Score;
(StatusLabel, SubLabel, IsOk, IsInfo, IsWarning, IsDanger) = Status switch
{
ExamListStatus.Planned => ("Geplant", $"geplant für {RelativeDay(exam.Date, today)}",
false, false, false, false),
ExamListStatus.AwaitingCorrection when today.DayNumber - exam.Date.DayNumber <= 3 =>
("Korrektur ausstehend", $"geschrieben {RelativeDay(exam.Date, today)}",
false, false, true, false),
ExamListStatus.AwaitingCorrection =>
("überfällig", $"geschrieben {RelativeDay(exam.Date, today)}", false, false, false, true),
ExamListStatus.CorrectionInProgress =>
("Korrektur läuft", $"{evaluated}/{expected} korrigiert", false, false, true, false),
ExamListStatus.CorrectionStuck =>
("hängt fest", $"{evaluated}/{expected} korrigiert", false, false, false, false),
ExamListStatus.AwaitingReturn => ("Korrigiert", "Rückgabe aussteht", false, true, false, false),
ExamListStatus.Returned => ("Abgeschlossen",
exam.ReturnedAt is { } r ? $"zurückgegeben {r:dd.MM.yyyy}" : "zurückgegeben", true, false, false, false),
_ => ("", "", false, false, false, false),
};
}
private static string RelativeDay(DateOnly date, DateOnly today)
{
var diff = date.DayNumber - today.DayNumber;
return diff switch
{
0 => "heute",
1 => "morgen",
-1 => "gestern",
> 1 => $"in {diff} Tagen",
_ => $"vor {-diff} Tagen",
};
}
}
LehrerApp.Desktop/ViewModels/Groups/ExamGradingViewModels.cs
+11
View File
@@ -1,4 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using LehrerApp.Core.Interfaces;
using LehrerApp.Core.Models;
using LehrerApp.Core.Services;
@@ -52,6 +53,16 @@ public partial class ExamGradingDialogViewModel : ObservableObject
private void SaveRow(ExamResultRow row) => _results.Save(row.ToModel(_exam.Id));
/// Rest als abwesend markieren (Nutzerwunsch): Schüler, die nie nachschreiben, blockieren
/// sonst dauerhaft den live abgeleiteten Korrekturstatus (ExamPriorityService), weil niemand
/// eine leere Zeile anfasst, für die es nichts einzutragen gibt. Rührt bewusst nur unberührte
/// Zeilen an — bereits eingetragene Punkte/Kommentare bleiben unangetastet.
[RelayCommand]
private void MarkRemainingAbsent()
{
foreach (var row in Rows.Where(r => !r.Absent && r.Cells.All(c => c.Value is null)))
row.Absent = true;
}
}
// ── Zeile im Punkteraster ──────────────────────────────────────────────────
LehrerApp.Desktop/ViewModels/Groups/ExamViewModels.cs
+7
View File
@@ -21,6 +21,7 @@ public partial class ExamDialogViewModel : ObservableObject
private readonly int _gradeLevel;
private readonly GradingSystem _gradingSystem;
private readonly Exam? _editingExam;
private readonly Exam? _duplicateSource;
private readonly string _subjectName;
[ObservableProperty] private string _title = "";
@@ -68,6 +69,7 @@ public partial class ExamDialogViewModel : ObservableObject
_groupId = groupId; _subjectId = subjectId; _gradeLevel = gradeLevel;
_gradingSystem = gradingSystem;
_editingExam = editingExam;
_duplicateSource = duplicateSource;
_subjectName = defaultSubjectName;
IsDifferentiated = isDifferentiated;
@@ -304,6 +306,11 @@ public partial class ExamDialogViewModel : ObservableObject
Result.Niveau = NiveauDisplay.FromName(SelectedNiveauName);
Result.Tasks = Tasks.Select(t => t.ToModel()).ToList();
Result.GradingKey = gradingKey;
// Parallelkurse (gleiche Arbeit, mehrere Kurse): beim Duplizieren verknüpfen, damit die
// Klausuren-Hauptseite zwischen ihnen umschalten kann. Der Anker ist die Id der zuerst
// angelegten Klausur der Kette — schon verknüpfte Quellen geben ihren Anker weiter.
if (_duplicateSource is not null)
Result.SharedExamGroupId = _duplicateSource.SharedExamGroupId ?? _duplicateSource.Id;
_exams.Save(Result);
}
}
LehrerApp.Desktop/ViewModels/MainWindowViewModel.cs
+10 -1
View File
@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.Input;
using LehrerApp.Core.Services;
using LehrerApp.Desktop.Services;
using LehrerApp.Desktop.ViewModels.ClassTeacher;
using LehrerApp.Desktop.ViewModels.Exams;
using LehrerApp.Desktop.ViewModels.Groups;
using LehrerApp.Desktop.ViewModels.Planning;
using LehrerApp.Desktop.ViewModels.Settings;
@@ -90,6 +91,7 @@ public partial class MainWindowViewModel : ObservableObject
case WorkloadViewModel vm:
vm.Tasks.Load(); vm.TimeTracking.Load(); vm.Evaluation.Load(); break;
case ClassTeacherOverviewViewModel vm: vm.LoadCommand.Execute(null); break;
case ExamsOverviewViewModel vm: vm.LoadCommand.Execute(null); break;
case GroupDetailViewModel { Group: { } group } vm: vm.LoadGroup(group.Id); break;
// Inline-Bearbeitung (IsEditing) nicht überschreiben - anders als die Gruppenansicht
// laufen Namens-/Geschlechtsänderungen hier nicht über einen Dialog.
@@ -119,7 +121,7 @@ public partial class MainWindowViewModel : ObservableObject
NavItem.Dashboard => GetDashboard(),
NavItem.Groups => _services.GetRequiredService<GroupListViewModel>(),
NavItem.Students => GetStudents(),
NavItem.Exams => new PlaceholderViewModel { Title = "Klausuren", Icon = "📝" },
NavItem.Exams => GetExams(),
NavItem.Planner => GetTimetable(),
NavItem.Workload => GetWorkload(),
NavItem.ClassTeacher => GetClassTeacherOverview(),
@@ -162,6 +164,13 @@ public partial class MainWindowViewModel : ObservableObject
return workload;
}
private ExamsOverviewViewModel GetExams()
{
var exams = _services.GetRequiredService<ExamsOverviewViewModel>();
exams.LoadCommand.Execute(null);
return exams;
}
private ClassTeacherOverviewViewModel GetClassTeacherOverview()
{
var vm = _services.GetRequiredService<ClassTeacherOverviewViewModel>();