Fix Untis homework comparison and student selection
This commit is contained in:
1 parent
1291b24478
commit
f3e23ad207
8 files changed
+372
-66
No files matched your search
@@ -19,6 +19,7 @@ public partial class WebUntisHomeworkRow : ObservableObject
|
||||
public required string ClassName { get; init; }
|
||||
public required DateOnly Date { get; init; }
|
||||
public required string UntisStudentName { get; init; }
|
||||
public string? CategoryName { get; init; }
|
||||
public string? SubjectLabel { get; init; }
|
||||
public string? Text { get; init; }
|
||||
public required IReadOnlyList<Student> Candidates { get; init; }
|
||||
@@ -26,15 +27,39 @@ public partial class WebUntisHomeworkRow : ObservableObject
|
||||
internal Action<WebUntisHomeworkRow>? OnAssignmentChanged { get; init; }
|
||||
public string DateLabel => Date.ToString("dd.MM.yyyy");
|
||||
public bool CanApply => SessionId is not null;
|
||||
private static readonly HomeworkStatus[] SelectableStatuses =
|
||||
[
|
||||
HomeworkStatus.MissingOpen, HomeworkStatus.MissingOverdue,
|
||||
HomeworkStatus.PartiallyCompleted, HomeworkStatus.PartialMissingOverdue,
|
||||
HomeworkStatus.PartialSubmittedLate, HomeworkStatus.SubmittedLate,
|
||||
HomeworkStatus.Completed,
|
||||
];
|
||||
public static string[] StatusOptions { get; } = SelectableStatuses.Select(s => HomeworkDisplay.Label(s)).ToArray();
|
||||
public HomeworkStatus SelectedStatus =>
|
||||
SelectableStatuses.FirstOrDefault(s => HomeworkDisplay.Label(s) == SelectedStatusName,
|
||||
HomeworkStatus.MissingOpen);
|
||||
|
||||
[ObservableProperty] private Student? _assignedStudent;
|
||||
[ObservableProperty] private string _localStatus = "ohne Zuordnung";
|
||||
[ObservableProperty] private Guid? _sessionId;
|
||||
[ObservableProperty] private bool _selected;
|
||||
[ObservableProperty] private string _selectedStatusName = HomeworkDisplay.Label(HomeworkStatus.MissingOpen);
|
||||
|
||||
partial void OnAssignedStudentChanged(Student? value) => OnAssignmentChanged?.Invoke(this);
|
||||
}
|
||||
|
||||
/// <summary>Lokal erfasste fehlende Hausaufgabe ohne zugeordnete WebUntis-Zeile. Dient nur als
|
||||
/// Kopiervorlage; WebUntis wird aus dem Dialog heraus nicht beschrieben.</summary>
|
||||
public sealed record LocalOnlyHomeworkRow(string StudentName, DateOnly Date, string GroupName,
|
||||
string? SubjectName, HomeworkStatus HomeworkStatus, bool PossibleUntisMatch)
|
||||
{
|
||||
public string DateLabel => Date.ToString("dd.MM.yyyy");
|
||||
public string StatusLabel => HomeworkDisplay.Label(HomeworkStatus);
|
||||
public string? Warning => PossibleUntisMatch ? "WebUntis-Eintrag am selben Tag ohne Fachzuordnung prüfen" : null;
|
||||
public string ClipboardText => $"{DateLabel} – {StudentName} ({GroupName})\n" +
|
||||
$"Fehlende HA{(string.IsNullOrWhiteSpace(SubjectName) ? "" : $" ({SubjectName})")}\n{StatusLabel}";
|
||||
}
|
||||
|
||||
/// <summary>Abgleich negativer Klassenbucheinträge zum Stichwort "Hausaufgabe" (eigene, siehe
|
||||
/// <see cref="WebUntisIntegrationService.GetOwnClassRegisterEventsAsync"/>) gegen
|
||||
/// <see cref="ParticipationEntry.Homework"/> - Dashboard-weit statt pro Lerngruppe, aus demselben
|
||||
@@ -43,10 +68,8 @@ public partial class WebUntisHomeworkRow : ObservableObject
|
||||
/// Schülerkennung noch eine feste Fach-/Lerngruppenzuordnung, aber der Lehrkraft-eigene Text enthält
|
||||
/// praktisch immer das Untis-Fachkürzel - darüber wird die passende Lerngruppe (SubjectId + aktive
|
||||
/// Mitgliedschaft am Eintragsdatum) aufgelöst, mehrdeutige Treffer bleiben unaufgelöst statt zu raten.
|
||||
/// Ein Eintrag setzt lokal ausschließlich <see cref="HomeworkStatus.MissingOpen"/> vor, und auch nur,
|
||||
/// wenn dort noch gar kein Status hinterlegt ist - bereits vorhandene, feinere Erfassungen ("Teilweise
|
||||
/// angefertigt", "nachgereicht" usw.) werden nie automatisch überschrieben, sondern nur zum Vergleich
|
||||
/// danebengestellt (Nutzerwunsch).</summary>
|
||||
/// Als Ziel ist <see cref="HomeworkStatus.MissingOpen"/> vorbelegt und vor der Übernahme änderbar.
|
||||
/// Bereits vorhandene lokale Stati werden nicht automatisch zur Übernahme markiert.</summary>
|
||||
public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
{
|
||||
private readonly WebUntisIntegrationService _untis;
|
||||
@@ -59,6 +82,7 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
private readonly SchoolYearService _schoolYears;
|
||||
|
||||
public ObservableCollection<WebUntisHomeworkRow> Rows { get; } = [];
|
||||
public ObservableCollection<LocalOnlyHomeworkRow> LocalOnlyRows { get; } = [];
|
||||
[ObservableProperty] private DateTimeOffset? _startDate = DateTimeOffset.Now.AddDays(-7);
|
||||
[ObservableProperty] private DateTimeOffset? _endDate = DateTimeOffset.Now;
|
||||
[ObservableProperty] private string _status = "Zeitraum wählen und Klassenbucheinträge laden.";
|
||||
@@ -80,11 +104,11 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
var start = DateOnly.FromDateTime((StartDate ?? DateTimeOffset.Now).LocalDateTime);
|
||||
var end = DateOnly.FromDateTime((EndDate ?? DateTimeOffset.Now).LocalDateTime);
|
||||
if (end < start) { Status = "Das Enddatum darf nicht vor dem Startdatum liegen."; return; }
|
||||
Busy = true; Rows.Clear();
|
||||
Busy = true; Rows.Clear(); LocalOnlyRows.Clear();
|
||||
try
|
||||
{
|
||||
var ownStudents = _students.GetAll();
|
||||
var globalIndex = BuildNameIndex(ownStudents);
|
||||
var globalIndex = UntisNameMatching.BuildNameIndex(ownStudents);
|
||||
// Wie beim Dokumentations-Abgleich zusätzlich pro Klasse indiziert, um gleiche Namen in
|
||||
// verschiedenen Klassen unterscheiden zu können.
|
||||
var classIndexes = _groups.GetAll()
|
||||
@@ -92,7 +116,8 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
.GroupBy(g => g.Name, StringComparer.OrdinalIgnoreCase)
|
||||
.ToDictionary(
|
||||
g => g.Key,
|
||||
g => BuildNameIndex(g.SelectMany(x => _students.GetByGroup(x.Id)).Distinct().ToList()),
|
||||
g => UntisNameMatching.BuildClassNameIndex(ownStudents,
|
||||
g.SelectMany(x => _students.GetByGroup(x.Id))),
|
||||
StringComparer.OrdinalIgnoreCase);
|
||||
var shortNameIndex = _subjects.GetAll()
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s.ShortName))
|
||||
@@ -107,11 +132,39 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
.Where(x => x.Date is not null)
|
||||
.OrderBy(x => x.Date).ThenBy(x => x.Entry.StudentName);
|
||||
|
||||
var rowsLoaded = false;
|
||||
|
||||
void RefreshLocalOnlyRows()
|
||||
{
|
||||
LocalOnlyRows.Clear();
|
||||
var covered = Rows.Where(r => r.AssignedStudent is not null && r.SessionId is not null)
|
||||
.Select(r => (StudentId: r.AssignedStudent!.Id, SessionId: r.SessionId!.Value))
|
||||
.ToHashSet();
|
||||
foreach (var student in _students.GetAll(includeInactive: true))
|
||||
foreach (var localEntry in _participation.GetByStudent(student.Id))
|
||||
{
|
||||
var homework = HomeworkDisplay.Effective(localEntry);
|
||||
if (homework is null || !HomeworkDisplay.CountsAsMissing(homework)) continue;
|
||||
var session = _sessions.GetById(localEntry.SessionId);
|
||||
if (session is null || session.Date < start || session.Date > end ||
|
||||
covered.Contains((student.Id, session.Id))) continue;
|
||||
var group = _groups.GetById(session.GroupId);
|
||||
if (group is null) continue;
|
||||
var subjectName = group.SubjectId is { } subjectId ? _subjects.GetById(subjectId)?.ShortName : null;
|
||||
var possibleMatch = Rows.Any(r => r.Date == session.Date && r.SessionId is null &&
|
||||
(r.AssignedStudent?.Id == student.Id ||
|
||||
UntisNameMatching.NamesMatch(r.UntisStudentName, student.FullName)));
|
||||
LocalOnlyRows.Add(new LocalOnlyHomeworkRow(student.FullName, session.Date, group.Name,
|
||||
subjectName, homework.Value, possibleMatch));
|
||||
}
|
||||
}
|
||||
|
||||
void ResolveLocalMatch(WebUntisHomeworkRow row)
|
||||
{
|
||||
if (row.AssignedStudent is not { } student)
|
||||
{
|
||||
row.SessionId = null; row.LocalStatus = "ohne Zuordnung"; row.Selected = false;
|
||||
if (rowsLoaded) RefreshLocalOnlyRows();
|
||||
return;
|
||||
}
|
||||
var group = ResolveGroup(student, row.MatchedSubjectId, row.Date);
|
||||
@@ -123,10 +176,11 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
row.LocalStatus = session is null
|
||||
? row.MatchedSubjectId is null ? "Fachkürzel nicht erkannt"
|
||||
: group is null ? "kein passender Kurs gefunden" : "keine lokale Stunde"
|
||||
: HomeworkDisplay.Label(current);
|
||||
: current is null ? "Noch kein Status erfasst" : HomeworkDisplay.Label(current);
|
||||
// Nur vorbelegen, wenn lokal noch überhaupt nichts erfasst ist - jeder vorhandene
|
||||
// Status (auch ein bereits gesetztes "fehlt") bleibt unangetastet, siehe Klassenkommentar.
|
||||
row.Selected = session is not null && current is null;
|
||||
if (rowsLoaded) RefreshLocalOnlyRows();
|
||||
}
|
||||
|
||||
foreach (var (entry, date) in ordered)
|
||||
@@ -141,6 +195,7 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
var row = new WebUntisHomeworkRow
|
||||
{
|
||||
ClassName = entry.ClassName, Date = date!.Value, UntisStudentName = entry.StudentName,
|
||||
CategoryName = entry.CategoryName,
|
||||
SubjectLabel = subject?.ShortName, Text = entry.Text, Candidates = ownStudents,
|
||||
MatchedSubjectId = subject?.Id, OnAssignmentChanged = ResolveLocalMatch,
|
||||
};
|
||||
@@ -148,12 +203,16 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
row.AssignedStudent = match; // löst OnAssignedStudentChanged aus und setzt SessionId/LocalStatus/Selected
|
||||
}
|
||||
|
||||
rowsLoaded = true;
|
||||
RefreshLocalOnlyRows();
|
||||
|
||||
var unresolvedStudent = Rows.Count(x => x.AssignedStudent is null);
|
||||
var unresolvedSubject = Rows.Count(x => x.MatchedSubjectId is null);
|
||||
Status = $"{Rows.Count} Einträge \"fehlende Hausaufgabe\" erhalten" +
|
||||
Status = $"{Rows.Count} passende Einträge von {entries.Count} eigenen Klassenbucheinträgen" +
|
||||
(unresolvedStudent > 0 ? $", {unresolvedStudent} bitte manuell zuordnen" : "") +
|
||||
(unresolvedSubject > 0 ? $", bei {unresolvedSubject} kein Fachkürzel im Text erkannt" : "") +
|
||||
$". {Rows.Count(x => x.CanApply)} einer lokalen Stunde zuordenbar.";
|
||||
$". {Rows.Count(x => x.CanApply)} einer lokalen Stunde zuordenbar." +
|
||||
$" {LocalOnlyRows.Count} lokale fehlende Hausaufgaben ohne zugeordneten WebUntis-Eintrag.";
|
||||
}
|
||||
catch (WebUntisIntegrationException ex) { Status = ex.Message; }
|
||||
finally { Busy = false; }
|
||||
@@ -168,11 +227,11 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
var studentId = row.AssignedStudent!.Id;
|
||||
var entry = _participation.GetBySessionAndStudent(row.SessionId!.Value, studentId)
|
||||
?? new ParticipationEntry { SessionId = row.SessionId.Value, StudentId = studentId };
|
||||
entry.Homework = HomeworkStatus.MissingOpen;
|
||||
entry.HomeworkMissing = true;
|
||||
entry.Homework = row.SelectedStatus;
|
||||
entry.HomeworkMissing = HomeworkDisplay.CountsAsMissing(row.SelectedStatus);
|
||||
entry.UpdatedAt = DateTime.UtcNow;
|
||||
_participation.Save(entry);
|
||||
row.LocalStatus = HomeworkDisplay.Label(HomeworkStatus.MissingOpen);
|
||||
row.LocalStatus = HomeworkDisplay.Label(row.SelectedStatus);
|
||||
row.Selected = false;
|
||||
}
|
||||
Status = $"{selected.Count} Hausaufgaben-Status übernommen.";
|
||||
@@ -194,12 +253,16 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
return candidates.Count == 1 ? candidates[0] : null;
|
||||
}
|
||||
|
||||
// Gleiche Heuristik wie ClassTeacherDetailsViewModel.ContainsHomework, zusätzlich auf negative
|
||||
// Einträge eingeschränkt (eine positive "Hausaufgabe"-Kategorie wäre kein Fehlen-Signal).
|
||||
private static bool IsMissingHomeworkEntry(UntisClassRegisterEventDto entry) =>
|
||||
string.Equals(entry.CategoryGroup, "Negativ", StringComparison.OrdinalIgnoreCase) &&
|
||||
(entry.CategoryName?.Contains("Hausauf", StringComparison.OrdinalIgnoreCase) == true ||
|
||||
entry.Text?.Contains("Hausauf", StringComparison.OrdinalIgnoreCase) == true);
|
||||
// Die Kategorie ist das verlässliche Signal. Der freie Text kann andere Hinweise enthalten und
|
||||
// wird nur verwendet, wenn WebUntis gar keine Kategorie geliefert hat. "HA" muss ein Wort sein.
|
||||
public static bool IsMissingHomeworkEntry(UntisClassRegisterEventDto entry) =>
|
||||
string.Equals(entry.CategoryGroup?.Trim(), "Negativ", StringComparison.OrdinalIgnoreCase) &&
|
||||
MentionsHomework(string.IsNullOrWhiteSpace(entry.CategoryName) ? entry.Text : entry.CategoryName);
|
||||
|
||||
private static bool MentionsHomework(string? value) =>
|
||||
value?.Contains("Hausauf", StringComparison.OrdinalIgnoreCase) == true ||
|
||||
(value is not null && Regex.IsMatch(value, @"(?<![\p{L}\p{Nd}])HA(?![\p{L}\p{Nd}])",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
|
||||
|
||||
private static Subject? MatchSubject(string? text, IReadOnlyDictionary<string, Subject> shortNameIndex)
|
||||
{
|
||||
@@ -210,15 +273,6 @@ public partial class WebUntisHomeworkComparisonViewModel : ObservableObject
|
||||
return null;
|
||||
}
|
||||
|
||||
// Wie bei den übrigen WebUntis-Abgleichen: Reihenfolge und Satzzeichen werden normalisiert,
|
||||
// aber nur innerhalb der Kandidaten eindeutige Namen automatisch zugeordnet.
|
||||
private static Dictionary<string, Student> BuildNameIndex(IReadOnlyList<Student> candidates) =>
|
||||
candidates
|
||||
.Select(student => (Key: UntisNameMatching.NameKey(student.FullName), Student: student))
|
||||
.GroupBy(x => x.Key)
|
||||
.Where(group => group.Select(x => x.Student).Distinct().Count() == 1)
|
||||
.ToDictionary(group => group.Key, group => group.First().Student);
|
||||
|
||||
private static bool TryDate(int value, out DateOnly date) =>
|
||||
DateOnly.TryParseExact(value.ToString(), "yyyyMMdd", out date);
|
||||
}
|
||||
Reference in new issue
Block a user