Zurückgestellte Dashboard-Warnungen in eigener Gruppe sammeln
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
Entschärfte Warnungen (zurückgestellt oder Vorgang in Bearbeitung) liefen bisher grau am Ende ihrer Art-Gruppe mit und zählten weiter zu den offenen Punkten. Sie stehen jetzt in einer eingeklappten "Zurückgestellt"-Gruppe ganz unten, mit dem Grund als Untertitel, und zählen nicht mehr mit. Nach Fristablauf kehren sie automatisch in ihre Gruppe und die Zählung zurück. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
7d8deaf79c
commit
770a1833c8
5 files changed
+184
-47
No files matched your search
@@ -84,6 +84,11 @@ public sealed class DashboardViewModelTests
|
||||
private static IEnumerable<AttentionItem> Items(DashboardViewModel vm, AttentionKind kind) =>
|
||||
vm.Attention.Where(g => g.Kind == kind).SelectMany(g => g.Items);
|
||||
|
||||
/// Entschärfte Warnungen stehen nicht in ihrer Art-Gruppe, sondern gesammelt in der
|
||||
/// "Zurückgestellt"-Gruppe am Ende.
|
||||
private static IEnumerable<AttentionItem> DeferredItems(DashboardViewModel vm) =>
|
||||
vm.Attention.Where(g => g.IsDeferred).SelectMany(g => g.Items);
|
||||
|
||||
/// AttentionItem traegt fuer MissingTeachingTime kein eigenes Date-Feld (Title ist bereits der
|
||||
/// formatierte Anzeigetext) — das genaue Datum steckt im mitgegebenen Action-Parameter
|
||||
/// (derselbe MissingTeachingTimeItem, den auch der "Erfassen"-Dialog erhaelt).
|
||||
@@ -973,7 +978,7 @@ public sealed class DashboardViewModelTests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AttendanceWarnings_MitKuerzlichBearbeitetemVorgang_IstEntschaerftUndAmEndeSortiert()
|
||||
public void AttendanceWarnings_MitKuerzlichBearbeitetemVorgang_WandertInZurueckgestelltGruppe()
|
||||
{
|
||||
var today = DateOnly.FromDateTime(DateTime.Today);
|
||||
var group = new LearningGroup { Name = "9c" };
|
||||
@@ -992,12 +997,13 @@ public sealed class DashboardViewModelTests
|
||||
students: new FakeStudents([handled, active]), sessions: sessions, entries: entries,
|
||||
vorgaenge: vorgaenge);
|
||||
|
||||
var items = Items(vm, AttentionKind.Attendance).ToList();
|
||||
Assert.Equal(2, items.Count);
|
||||
Assert.False(items[0].IsDefused);
|
||||
Assert.Equal(active.FullName, items[0].Title);
|
||||
Assert.True(items[1].IsDefused);
|
||||
Assert.Equal(handled.FullName, items[1].Title);
|
||||
var item = Assert.Single(Items(vm, AttentionKind.Attendance));
|
||||
Assert.False(item.IsDefused);
|
||||
Assert.Equal(active.FullName, item.Title);
|
||||
var deferred = Assert.Single(DeferredItems(vm));
|
||||
Assert.True(deferred.IsDefused);
|
||||
Assert.Equal(handled.FullName, deferred.Title);
|
||||
Assert.Equal("Fehlzeiten · Vorgang in Bearbeitung", deferred.Subtitle);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -1040,9 +1046,63 @@ public sealed class DashboardViewModelTests
|
||||
students: new FakeStudents([handled, active]), sessions: sessions, entries: entries,
|
||||
warningSnoozes: snoozes);
|
||||
|
||||
var byName = Items(vm, AttentionKind.Attendance).ToDictionary(i => i.Title);
|
||||
Assert.True(byName[handled.FullName].IsDefused);
|
||||
Assert.False(byName[active.FullName].IsDefused);
|
||||
Assert.Equal(active.FullName, Assert.Single(Items(vm, AttentionKind.Attendance)).Title);
|
||||
var deferred = Assert.Single(DeferredItems(vm));
|
||||
Assert.Equal(handled.FullName, deferred.Title);
|
||||
Assert.Equal($"Fehlzeiten · zurückgestellt bis {today.AddDays(7):dd.MM.}", deferred.Subtitle);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ZurueckgestelltGruppe_StehtEingeklapptAmEndeUndZaehltNichtMit()
|
||||
{
|
||||
var today = DateOnly.FromDateTime(DateTime.Today);
|
||||
var group = new LearningGroup { Name = "9c" };
|
||||
var sessions = new FakeSessions([]);
|
||||
var entries = new FakeEntries();
|
||||
var (handled, active) = BuildTwoOverThresholdStudents(group, today, sessions, entries);
|
||||
var snoozes = new FakeDashboardWarningSnoozeRepository();
|
||||
snoozes.Save(new DashboardWarningSnooze { StudentId = handled.Id, WarningTag = "Absentismus", SnoozedUntil = today.AddDays(7) });
|
||||
|
||||
var vm = BuildVm(group, new Lesson { GroupId = group.Id, Date = today },
|
||||
students: new FakeStudents([handled, active]), sessions: sessions, entries: entries,
|
||||
warningSnoozes: snoozes);
|
||||
|
||||
var last = vm.Attention.Last();
|
||||
Assert.True(last.IsDeferred);
|
||||
Assert.Null(last.Kind);
|
||||
Assert.False(last.IsExpanded);
|
||||
Assert.Equal(1, vm.AttentionCount);
|
||||
Assert.True(vm.HasOpenAttention);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ZurueckgestelltGruppe_AufklappzustandUeberlebtNeuaufbauUndFilterBlendetAus()
|
||||
{
|
||||
var today = DateOnly.FromDateTime(DateTime.Today);
|
||||
var group = new LearningGroup { Name = "9c" };
|
||||
var sessions = new FakeSessions([]);
|
||||
var entries = new FakeEntries();
|
||||
var (handled, active) = BuildTwoOverThresholdStudents(group, today, sessions, entries);
|
||||
var snoozes = new FakeDashboardWarningSnoozeRepository();
|
||||
snoozes.Save(new DashboardWarningSnooze { StudentId = handled.Id, WarningTag = "Absentismus", SnoozedUntil = today.AddDays(7) });
|
||||
snoozes.Save(new DashboardWarningSnooze { StudentId = active.Id, WarningTag = "Absentismus", SnoozedUntil = today.AddDays(7) });
|
||||
|
||||
var vm = BuildVm(group, new Lesson { GroupId = group.Id, Date = today },
|
||||
students: new FakeStudents([handled, active]), sessions: sessions, entries: entries,
|
||||
warningSnoozes: snoozes);
|
||||
|
||||
// Nur noch zurückgestellte Warnungen: kein offener Punkt, Kachel bleibt aber erreichbar.
|
||||
Assert.Equal(0, vm.AttentionCount);
|
||||
Assert.False(vm.HasOpenAttention);
|
||||
Assert.False(vm.AttentionCard.IsEmpty);
|
||||
|
||||
vm.Attention.Single(g => g.IsDeferred).ToggleExpandedCommand.Execute(null);
|
||||
var filter = vm.AttentionFilters.Single(f => f.Kind == AttentionKind.Attendance);
|
||||
filter.IsActive = false;
|
||||
Assert.DoesNotContain(vm.Attention, g => g.IsDeferred);
|
||||
filter.IsActive = true;
|
||||
|
||||
Assert.True(vm.Attention.Single(g => g.IsDeferred).IsExpanded);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -1078,7 +1138,9 @@ public sealed class DashboardViewModelTests
|
||||
Assert.Equal(student.Id, saved.StudentId);
|
||||
Assert.Equal("Absentismus", saved.WarningTag);
|
||||
Assert.Equal(today.AddDays(14), saved.SnoozedUntil);
|
||||
Assert.True(Assert.Single(Items(vm, AttentionKind.Attendance)).IsDefused);
|
||||
Assert.Empty(Items(vm, AttentionKind.Attendance));
|
||||
Assert.True(Assert.Single(DeferredItems(vm)).IsDefused);
|
||||
Assert.Equal(0, vm.AttentionCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
Reference in new issue
Block a user