Gemeinsame Dokumentation für mehrere Beteiligte eines Vorgangs
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
Ein Dokumentationseintrag kann jetzt weitere Schüler*innen betreffen (Documentation.AdditionalStudentIds, StudentId bleibt Hauptperson). Der Eintrag existiert nur einmal, erscheint aber im Dokumentations-Tab jeder beteiligten Person. Der Dokumentations-Dialog bietet in beiden Vorgänge-Tabs "Betrifft außerdem" mit den Beteiligten des Vorgangs an. Klassenlehrer-Listen, WebUntis-Abgleich, Löschfristen und Referenzzählung berücksichtigen die weiteren Beteiligten. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e091b5c8de
commit
9a84bbaa38
23 files changed
+396
-49
No files matched your search
@@ -104,6 +104,12 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
[ObservableProperty] private StudentOption? _selectedStudent;
|
||||
[ObservableProperty] private string _studentError = "";
|
||||
|
||||
// Weitere Beteiligte (Documentation.AdditionalStudentIds) — nur angeboten, wenn der Aufrufer
|
||||
// Kandidaten mitgibt (z.B. die übrigen Schüler*innen eines Vorgangs). Die Hauptperson steht
|
||||
// mit in der Liste, wird aber ausgeblendet (CoStudentChoice.IsPrimary).
|
||||
public List<CoStudentChoice> CoStudents { get; }
|
||||
public bool HasCoStudents => CoStudents.Any(c => !c.IsPrimary);
|
||||
|
||||
[ObservableProperty] private string _typeName = DocumentationTypeDisplay.Options[0];
|
||||
[ObservableProperty] private string _dateText = DateOnly.FromDateTime(DateTime.Today).ToString("dd.MM.yyyy");
|
||||
[ObservableProperty] private string _title = "";
|
||||
@@ -163,8 +169,11 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
|
||||
public Documentation? Result { get; private set; }
|
||||
|
||||
/// <param name="coStudentOptions">Kandidaten für "Betrifft außerdem" — ohne Angabe bleiben
|
||||
/// bestehende weitere Beteiligte eines bearbeiteten Eintrags unverändert erhalten.</param>
|
||||
public DocumentationDialogViewModel(Guid studentId, Documentation? editing, IAttachmentStorage attachmentStorage,
|
||||
List<StudentOption>? studentOptions = null, Guid? contextGroupId = null, bool isNewDraft = false)
|
||||
List<StudentOption>? studentOptions = null, Guid? contextGroupId = null, bool isNewDraft = false,
|
||||
List<StudentOption>? coStudentOptions = null)
|
||||
{
|
||||
_studentId = studentId;
|
||||
_editing = editing;
|
||||
@@ -174,8 +183,17 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
_attachmentStorage = attachmentStorage;
|
||||
_contextGroupId = contextGroupId;
|
||||
StudentOptions = studentOptions ?? [];
|
||||
CoStudents = (coStudentOptions ?? [])
|
||||
.Where(o => o.Id != Guid.Empty)
|
||||
.DistinctBy(o => o.Id)
|
||||
.Select(o => new CoStudentChoice(o.Id, o.Name)
|
||||
{
|
||||
IsSelected = editing?.AdditionalStudentIds.Contains(o.Id) == true,
|
||||
})
|
||||
.ToList();
|
||||
if (CanPickStudent)
|
||||
SelectedStudent = StudentOptions.FirstOrDefault(s => s.Id == studentId);
|
||||
UpdatePrimaryCoStudent();
|
||||
if (editing is null) return;
|
||||
|
||||
TypeName = DocumentationTypeDisplay.Label(editing.Type);
|
||||
@@ -212,6 +230,22 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
foreach (var tag in editing.Tags) Tags.Add(tag);
|
||||
}
|
||||
|
||||
// Beim Bearbeiten bleibt die Hauptperson die des bestehenden Eintrags (Save() übernimmt die
|
||||
// Auswahl dann nicht), sonst folgt sie der Bezug-Auswahl.
|
||||
private Guid PrimaryStudentId =>
|
||||
_editing is not null && !_isNewDraft ? _editing.StudentId
|
||||
: CanPickStudent ? SelectedStudent?.Id ?? Guid.Empty
|
||||
: _editing?.StudentId ?? _studentId;
|
||||
|
||||
partial void OnSelectedStudentChanged(StudentOption? value) => UpdatePrimaryCoStudent();
|
||||
|
||||
private void UpdatePrimaryCoStudent()
|
||||
{
|
||||
var primary = PrimaryStudentId;
|
||||
foreach (var c in CoStudents) c.IsPrimary = c.Id == primary;
|
||||
OnPropertyChanged(nameof(HasCoStudents));
|
||||
}
|
||||
|
||||
partial void OnTypeNameChanged(string value)
|
||||
{
|
||||
OnPropertyChanged(nameof(IsConversation));
|
||||
@@ -348,6 +382,14 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
var type = DocumentationTypeDisplay.FromLabel(TypeName);
|
||||
var effectiveStudentId = CanPickStudent ? SelectedStudent!.Id : _studentId;
|
||||
Result = _editing ?? new Documentation { StudentId = effectiveStudentId, GroupId = _contextGroupId };
|
||||
// Nicht angebotene weitere Beteiligte bleiben erhalten (z.B. beim Bearbeiten aus dem Schülerdatensatz,
|
||||
// wo keine Kandidaten bekannt sind), angebotene folgen der Auswahl.
|
||||
var offered = CoStudents.Select(c => c.Id).ToHashSet();
|
||||
Result.AdditionalStudentIds = Result.AdditionalStudentIds.Where(id => !offered.Contains(id))
|
||||
.Concat(CoStudents.Where(c => c.IsSelected).Select(c => c.Id))
|
||||
.Where(id => id != Result.StudentId && id != Guid.Empty)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
Result.Type = type;
|
||||
Result.Date = date;
|
||||
Result.Title = Title.Trim();
|
||||
@@ -413,6 +455,14 @@ public partial class DocumentationDialogViewModel : ObservableObject
|
||||
}
|
||||
}
|
||||
|
||||
public partial class CoStudentChoice(Guid id, string name) : ObservableObject
|
||||
{
|
||||
public Guid Id { get; } = id;
|
||||
public string Name { get; } = name;
|
||||
[ObservableProperty] private bool _isSelected;
|
||||
[ObservableProperty] private bool _isPrimary;
|
||||
}
|
||||
|
||||
public class AttachmentItem(string storageId, string fileName, long sizeBytes, DateTime uploadedAt)
|
||||
{
|
||||
public const string HazardAssessmentSuffix = ".gbu.json";
|
||||
@@ -458,6 +508,10 @@ public partial class DocumentationItem : ObservableObject
|
||||
public string OtherGroupLabel { get; }
|
||||
/// Dimmt Einträge aus anderen Lerngruppen im Gruppen-Tab, ohne sie zu verstecken.
|
||||
public double ContentOpacity => IsOwnGroup ? 1.0 : 0.55;
|
||||
/// Nur im Schülerdatensatz gefüllt: die übrigen Beteiligten eines gemeinsamen Eintrags
|
||||
/// (Documentation.AdditionalStudentIds bzw. Hauptperson), damit er dort als geteilt erkennbar ist.
|
||||
public string SharedWith { get; init; } = "";
|
||||
public bool IsShared => SharedWith != "";
|
||||
|
||||
[ObservableProperty] private bool _isRevealed;
|
||||
|
||||
|
||||
@@ -334,7 +334,12 @@ public partial class StudentDetailViewModel : ObservableObject
|
||||
if (Student is null) return;
|
||||
Documentation.Clear();
|
||||
foreach (var d in _docs.GetByStudent(Student.Id))
|
||||
Documentation.Add(new DocumentationItem(d));
|
||||
{
|
||||
var others = d.InvolvedStudentIds().Where(id => id != Student.Id)
|
||||
.Select(id => _students.GetById(id)?.FullName)
|
||||
.Where(n => !string.IsNullOrEmpty(n));
|
||||
Documentation.Add(new DocumentationItem(d) { SharedWith = string.Join("; ", others) });
|
||||
}
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
|
||||
@@ -39,7 +39,8 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
|
||||
public Func<List<StudentOption>, Vorgang?, Task<Vorgang?>>? OnEditVorgang { get; set; }
|
||||
public Func<VorgangItem, Task<bool>>? OnConfirmDeleteVorgang { get; set; }
|
||||
public Func<Guid, Documentation?, Task<Documentation?>>? OnEditDocumentation { get; set; }
|
||||
/// Parameter: Hauptperson, Kandidaten für "Betrifft außerdem", bestehender Eintrag.
|
||||
public Func<Guid, List<StudentOption>, Documentation?, Task<Documentation?>>? OnEditDocumentation { get; set; }
|
||||
/// Rückfrage vor dem automatischen Anlegen eines Vorgangs aus einer Dashboard-Warnung heraus
|
||||
/// (siehe <see cref="HandleWarningNavigation"/>) — Parameter ist das gesuchte Tag.
|
||||
public Func<string, Task<bool>>? OnConfirmCreateForWarning { get; set; }
|
||||
@@ -89,8 +90,8 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
IEnumerable<Vorgang> vorgaenge = _vorgaenge.GetByStudent(studentId);
|
||||
if (OnlyOpen) vorgaenge = vorgaenge.Where(v => v.Status == VorgangStatus.Open);
|
||||
|
||||
// Nur die Dokumentation dieses einen Schülers (nicht GetAll()) — dieses Panel ist die Sicht
|
||||
// "von diesem Schüler aus", nicht Vorgangsverwaltung für mehrere Beteiligte.
|
||||
// Nur die Dokumentation, die diesen Schüler betrifft (nicht GetAll()) — dieses Panel ist die
|
||||
// Sicht "von diesem Schüler aus"; gemeinsame Einträge mit weiteren Beteiligten zählen dazu.
|
||||
var ownDocs = _documentation.GetByStudent(studentId);
|
||||
|
||||
foreach (var vorgang in vorgaenge.OrderByDescending(v => v.UpdatedAt))
|
||||
@@ -107,9 +108,9 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
|
||||
var linkedIds = vorgang.DocumentationIds.ToHashSet();
|
||||
foreach (var doc in ownDocs.Where(d => linkedIds.Contains(d.Id)))
|
||||
item.LinkedDocumentation.Add(new DocumentationItem(doc, _studentName));
|
||||
item.LinkedDocumentation.Add(new DocumentationItem(doc, InvolvedNames(doc)));
|
||||
foreach (var doc in ClassTeacherCasesViewModel.FilterAvailableDocumentation(ownDocs, vorgang))
|
||||
item.AvailableDocumentation.Add(new DocumentationItem(doc, _studentName));
|
||||
item.AvailableDocumentation.Add(new DocumentationItem(doc, InvolvedNames(doc)));
|
||||
foreach (var entry in vorgang.ClassRegisterEntries.OrderByDescending(e => e.Date))
|
||||
item.ClassRegisterRows.Add(new VorgangClassRegisterEntryRow(entry));
|
||||
|
||||
@@ -118,6 +119,27 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
OnPropertyChanged(nameof(HasCases));
|
||||
}
|
||||
|
||||
private string StudentName(Guid id) => id == _studentId ? _studentName : _students.GetById(id)?.FullName ?? "";
|
||||
|
||||
private string InvolvedNames(Documentation doc) =>
|
||||
string.Join(", ", doc.InvolvedStudentIds().Select(StudentName).Where(n => n != ""));
|
||||
|
||||
private List<StudentOption> VorgangStudentOptions(Vorgang vorgang) => vorgang.StudentIds
|
||||
.Select(id => new StudentOption(id, StudentName(id)))
|
||||
.Where(o => o.Name != "")
|
||||
.ToList();
|
||||
|
||||
/// "Betrifft außerdem"-Kandidaten beim Bearbeiten: Beteiligte der angezeigten Vorgänge, in denen der
|
||||
/// Eintrag verknüpft oder verknüpfbar ist, plus die schon Beteiligten.
|
||||
private List<StudentOption> CoStudentOptionsFor(Documentation doc) => Cases.Select(c => c.Model)
|
||||
.Where(v => v.DocumentationIds.Contains(doc.Id) || v.StudentIds.Any(doc.Concerns))
|
||||
.SelectMany(v => v.StudentIds)
|
||||
.Concat(doc.InvolvedStudentIds())
|
||||
.Distinct()
|
||||
.Select(id => new StudentOption(id, StudentName(id)))
|
||||
.Where(o => o.Name != "")
|
||||
.ToList();
|
||||
|
||||
[RelayCommand]
|
||||
private async Task AddVorgang()
|
||||
{
|
||||
@@ -161,7 +183,7 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
private async Task CreateAndLinkDocumentation(VorgangItem? item)
|
||||
{
|
||||
if (item is null || OnEditDocumentation is null) return;
|
||||
var result = await OnEditDocumentation(_studentId, null);
|
||||
var result = await OnEditDocumentation(_studentId, VorgangStudentOptions(item.Model), null);
|
||||
if (result is null) return;
|
||||
_documentation.Save(result);
|
||||
item.Model.DocumentationIds.Add(result.Id);
|
||||
@@ -179,7 +201,7 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
if (draft is null) return;
|
||||
_documentationDraftId = draft.Id;
|
||||
Documentation? result;
|
||||
try { result = await OnEditDocumentation(_studentId, draft); }
|
||||
try { result = await OnEditDocumentation(_studentId, VorgangStudentOptions(item.Model), draft); }
|
||||
finally { _documentationDraftId = null; }
|
||||
if (result is null) return;
|
||||
_documentation.Save(result);
|
||||
@@ -193,7 +215,7 @@ public partial class StudentVorgaengeViewModel : ObservableObject
|
||||
private async Task EditDocumentation(DocumentationItem doc)
|
||||
{
|
||||
if (OnEditDocumentation is null) return;
|
||||
var result = await OnEditDocumentation(doc.Model.StudentId, doc.Model);
|
||||
var result = await OnEditDocumentation(doc.Model.StudentId, CoStudentOptionsFor(doc.Model), doc.Model);
|
||||
if (result is null) return;
|
||||
_documentation.Save(result);
|
||||
Load(_studentId);
|
||||
|
||||
@@ -106,7 +106,7 @@ public partial class WebUntisDocumentationComparisonViewModel : ObservableObject
|
||||
// Nur nach Schüler*in+Datum erkannt, nicht nach Wortlaut: ein lokaler Eintrag von vor dieser
|
||||
// Funktion (oder frei formuliert) hat selten denselben Titel wie die WebUntis-Kategorie.
|
||||
List<Documentation> LocalDocsFor(Guid studentId, DateOnly date) =>
|
||||
localDocs.Where(d => d.StudentId == studentId && d.Date == date).ToList();
|
||||
localDocs.Where(d => d.Concerns(studentId) && d.Date == date).ToList();
|
||||
|
||||
foreach (var (entry, date) in ordered)
|
||||
{
|
||||
@@ -128,15 +128,20 @@ public partial class WebUntisDocumentationComparisonViewModel : ObservableObject
|
||||
});
|
||||
}
|
||||
|
||||
// WebUntis-Klassenbucheinträge sind personenbezogen — ein gemeinsamer lokaler Eintrag
|
||||
// (weitere Beteiligte) wird deshalb je beteiligter Person einzeln abgeglichen.
|
||||
foreach (var doc in localDocs)
|
||||
{
|
||||
if (doc.ExcludeFromWebUntisSync) continue;
|
||||
var coveredByReport = Rows.Any(r => r.AssignedStudent?.Id == doc.StudentId && r.Date == doc.Date);
|
||||
if (coveredByReport) continue;
|
||||
var student = ownStudents.FirstOrDefault(s => s.Id == doc.StudentId);
|
||||
if (student is null) continue;
|
||||
LocalOnlyRows.Add(new LocalOnlyDocumentationRow(student.FullName, doc.Date,
|
||||
doc.GroupId is { } groupId ? _groups.GetById(groupId)?.Name : null, doc.Title, doc.Content));
|
||||
foreach (var studentId in doc.InvolvedStudentIds())
|
||||
{
|
||||
var coveredByReport = Rows.Any(r => r.AssignedStudent?.Id == studentId && r.Date == doc.Date);
|
||||
if (coveredByReport) continue;
|
||||
var student = ownStudents.FirstOrDefault(s => s.Id == studentId);
|
||||
if (student is null) continue;
|
||||
LocalOnlyRows.Add(new LocalOnlyDocumentationRow(student.FullName, doc.Date,
|
||||
doc.GroupId is { } groupId ? _groups.GetById(groupId)?.Name : null, doc.Title, doc.Content));
|
||||
}
|
||||
}
|
||||
|
||||
var unresolved = Rows.Count(x => x.AssignedStudent is null);
|
||||
|
||||
Reference in new issue
Block a user