Ein Zwischenstand ist ein Durchgang aus Stichtag, Anlass und Schülerauswahl (ganze Gruppe, Teilgruppe oder Einzelfall, mit Schnellfilter für gefährdete Schüler). Der Zeugnisnoten-Assistent geht die gewählten Schüler im Zwischenstand-Modus durch und notiert vorläufige schriftliche, mündliche und Gesamtnote samt Notiz. Gespeichert wird das als eigenes Modell InterimGrade, getrennt von der Zeugnisnote. Die Berechnung endet am Stichtag und rechnet den laufenden Mitarbeits-Abschnitt mit ein. Zwischenstände erscheinen im Assistenten als Liste und Marker im Verlauf sowie als graue Spalte in der Notenübersicht (nicht in "Gesamt", nicht im PDF). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
67c5a906d1
commit
d9eac0d1d2
24 files changed
+1038
-37
No files matched your search
@@ -25,6 +25,10 @@ public partial class GradeOverviewTabView : UserControl
|
||||
vm.OnManageStudentGrades = ShowStudentGradesDialog;
|
||||
vm.OnCollectiveGrade = ShowCollectiveGradeDialog;
|
||||
vm.OnReportGrades = ShowReportGradesDialog;
|
||||
vm.OnInterimGrades = async studentId =>
|
||||
{
|
||||
if (TopLevel.GetTopLevel(this) is Window owner) await ShowInterimRun(owner, studentId);
|
||||
};
|
||||
vm.OnShowPerformanceOverview = ShowPerformanceOverviewDialog;
|
||||
vm.PropertyChanged += (_, pe) =>
|
||||
{
|
||||
@@ -75,12 +79,12 @@ public partial class GradeOverviewTabView : UserControl
|
||||
App.Services.GetRequiredService<GradingService>(),
|
||||
_vm!.GroupId, _vm.GroupType, _vm.GradingSystem, _vm.GroupLabel, _vm.SchoolYear);
|
||||
|
||||
var dialog = new ReportGradeDialog { DataContext = dialogVm, OnOpenAssistant = ShowReportGradeAssistant };
|
||||
var dialog = new ReportGradeDialog { DataContext = dialogVm, OnOpenAssistant = owner => ShowReportGradeAssistant(owner) };
|
||||
var owner = TopLevel.GetTopLevel(this) as Window;
|
||||
if (owner is not null) await dialog.ShowDialog(owner);
|
||||
}
|
||||
|
||||
private async Task ShowReportGradeAssistant(Window owner)
|
||||
private async Task ShowReportGradeAssistant(Window owner, InterimRunOptions? interim = null)
|
||||
{
|
||||
var dialogVm = new ReportGradeAssistantViewModel(
|
||||
App.Services.GetRequiredService<IGradeRepository>(),
|
||||
@@ -94,12 +98,42 @@ public partial class GradeOverviewTabView : UserControl
|
||||
App.Services.GetRequiredService<IParticipationRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationAspectRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationSectionRepository>(),
|
||||
App.Services.GetRequiredService<IInterimGradeRepository>(),
|
||||
App.Services.GetRequiredService<AttendanceBalanceService>(),
|
||||
App.Services.GetRequiredService<GradingService>(),
|
||||
_vm!.GroupId, _vm.GroupType, _vm.GradingSystem, _vm.GroupLabel, _vm.SchoolYear,
|
||||
App.Services.GetRequiredService<IGroupRepository>().GetById(_vm.GroupId)?.GradeLevel ?? 0);
|
||||
App.Services.GetRequiredService<IGroupRepository>().GetById(_vm.GroupId)?.GradeLevel ?? 0,
|
||||
interim: interim);
|
||||
|
||||
await new ReportGradeAssistantDialog { DataContext = dialogVm }.ShowDialog(owner);
|
||||
var dialog = new ReportGradeAssistantDialog { DataContext = dialogVm };
|
||||
dialogVm.OnStartInterim = studentId => ShowInterimRun(dialog, studentId);
|
||||
await dialog.ShowDialog(owner);
|
||||
}
|
||||
|
||||
/// Zwischenstand: erst Stichtag, Anlass und Schüler festlegen, dann geht der Assistent genau
|
||||
/// diese Schüler durch.
|
||||
private async Task ShowInterimRun(Window owner, Guid? preselectedStudentId)
|
||||
{
|
||||
var dialogVm = new InterimRunDialogViewModel(
|
||||
App.Services.GetRequiredService<IGradeRepository>(),
|
||||
App.Services.GetRequiredService<IExamRepository>(),
|
||||
App.Services.GetRequiredService<IExamResultRepository>(),
|
||||
App.Services.GetRequiredService<IStudentRepository>(),
|
||||
App.Services.GetRequiredService<IGroupMembershipRepository>(),
|
||||
App.Services.GetRequiredService<IGradingSchemeRepository>(),
|
||||
App.Services.GetRequiredService<IReportGradeRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationSessionRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationAspectRepository>(),
|
||||
App.Services.GetRequiredService<IParticipationSectionRepository>(),
|
||||
App.Services.GetRequiredService<IInterimGradeRepository>(),
|
||||
App.Services.GetRequiredService<GradingService>(),
|
||||
_vm!.GroupId, _vm.GroupType, _vm.GradingSystem, _vm.GroupLabel, _vm.SchoolYear,
|
||||
preselectedStudentId);
|
||||
|
||||
var dialog = new InterimRunDialog { DataContext = dialogVm };
|
||||
if (await dialog.ShowDialog<bool>(owner) && dialogVm.Result is { } run)
|
||||
await ShowReportGradeAssistant(owner, run);
|
||||
}
|
||||
|
||||
private async Task ShowPerformanceOverviewDialog(GradeOverviewRow row)
|
||||
@@ -123,10 +157,13 @@ public partial class GradeOverviewTabView : UserControl
|
||||
var topLevel = TopLevel.GetTopLevel(this);
|
||||
if (topLevel is null || _vm is null) return;
|
||||
|
||||
// Vorläufige Zwischenstände gehören nicht in die gedruckte Notenliste. Ihre Spalten
|
||||
// stehen immer am Ende, die Zellen lassen sich also einfach abschneiden.
|
||||
var printed = _vm.Columns.Where(c => !c.IsInterim).ToList();
|
||||
var data = new GradeListPrintData(
|
||||
_vm.GroupLabel, _vm.SchoolYear, _vm.SelectedPeriod.Label,
|
||||
_vm.Columns.Select(c => c.Header).ToList(),
|
||||
_vm.Rows.Select(r => new GradeListPrintRow(r.Name, r.Cells, r.TotalDisplay)).ToList());
|
||||
printed.Select(c => c.Header).ToList(),
|
||||
_vm.Rows.Select(r => new GradeListPrintRow(r.Name, r.Cells.Take(printed.Count).ToList(), r.TotalDisplay)).ToList());
|
||||
var pdf = App.Services.GetRequiredService<PdfExportService>().BuildGradeListPdf(data);
|
||||
|
||||
await App.Services.GetRequiredService<ExportService>().SaveAsync(topLevel.StorageProvider,
|
||||
@@ -150,12 +187,15 @@ public partial class GradeOverviewTabView : UserControl
|
||||
foreach (var (col, i) in _vm.Columns.Select((c, i) => (c, i)))
|
||||
{
|
||||
var idx = i;
|
||||
grid.Columns.Add(new DataGridTextColumn
|
||||
var column = new DataGridTextColumn
|
||||
{
|
||||
Header = col.Header,
|
||||
Binding = new Binding($"Cells[{idx}]"),
|
||||
Width = new DataGridLength(120, DataGridLengthUnitType.Pixel),
|
||||
});
|
||||
};
|
||||
// Zwischenstände sind vorläufig — grau, damit sie nicht wie eingetragene Noten wirken.
|
||||
if (col.IsInterim) column.Foreground = Avalonia.Media.Brushes.Gray;
|
||||
grid.Columns.Add(column);
|
||||
}
|
||||
|
||||
grid.Columns.Add(new DataGridTextColumn
|
||||
|
||||
Reference in new issue
Block a user