Klausurvarianten, Bonuspunkte und Wiederholungen ergänzen
This commit is contained in:
1 parent
54ad7f7419
commit
431d023c1a
22 files changed
+522
-40
No files matched your search
@@ -18,6 +18,7 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
private readonly GradingService _grading;
|
||||
private readonly Exam _exam;
|
||||
private readonly GradingSystem _gradingSystem;
|
||||
private readonly IStudentRepository? _students;
|
||||
private readonly double _examMaxPoints;
|
||||
private List<ExamResult> _gradedResults = [];
|
||||
|
||||
@@ -38,19 +39,63 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
|
||||
public ObservableCollection<GradeBarItem> GradeDistribution { get; } = [];
|
||||
public ObservableCollection<TaskAnalysisItem> TaskAnalysis { get; } = [];
|
||||
public ObservableCollection<RepeatComparisonItem> RepeatComparison { get; } = [];
|
||||
public bool HasRepeatComparison => RepeatComparison.Count > 0;
|
||||
public string RepeatComparisonTitle { get; private set; } = "";
|
||||
public ObservableCollection<GradingKeyEntryEditItem> GradingKeyEntries { get; } = [];
|
||||
|
||||
public ExamEvaluationDialogViewModel(IExamRepository exams, IExamResultRepository results,
|
||||
GradingService grading, Exam exam, GradingSystem gradingSystem)
|
||||
GradingService grading, Exam exam, GradingSystem gradingSystem,
|
||||
IStudentRepository? students = null)
|
||||
{
|
||||
_exams = exams; _results = results; _grading = grading; _exam = exam;
|
||||
_gradingSystem = gradingSystem;
|
||||
_examMaxPoints = exam.Tasks.Sum(t => t.MaxPoints);
|
||||
_gradingSystem = gradingSystem; _students = students;
|
||||
_examMaxPoints = ExamScoringService.Maximum(exam.Tasks, ExamVariant.A);
|
||||
|
||||
foreach (var e in exam.GradingKey.OrderByDescending(e => e.MinPercent))
|
||||
AddGradingKeyRowInternal(e.Grade, e.MinPercent);
|
||||
|
||||
LoadResults();
|
||||
LoadRepeatComparison(students);
|
||||
}
|
||||
|
||||
private void LoadRepeatComparison(IStudentRepository? students)
|
||||
{
|
||||
RepeatComparison.Clear();
|
||||
RepeatComparisonTitle = "";
|
||||
var original = _exam.RepeatOfExamId is { } originalId ? _exams.GetById(originalId) : _exam;
|
||||
if (original is null) return;
|
||||
var repeat = _exam.RepeatOfExamId is not null ? _exam
|
||||
: _exams.GetByGroup(_exam.GroupId).FirstOrDefault(e => e.RepeatOfExamId == _exam.Id);
|
||||
if (repeat is null) return;
|
||||
var rule = repeat.RepeatGradeRule switch
|
||||
{
|
||||
RepeatGradeRule.Repeat => "Wiederholung zählt",
|
||||
RepeatGradeRule.Original => "Erste Arbeit zählt",
|
||||
_ => "Bessere zählt",
|
||||
};
|
||||
RepeatComparisonTitle = $"Erste Arbeit: {original.Title} · Wiederholung: {repeat.Title} · {rule}";
|
||||
var first = _results.GetByExam(original.Id).Where(r => !r.Absent && r.Grade is not null)
|
||||
.ToDictionary(r => r.StudentId);
|
||||
var second = _results.GetByExam(repeat.Id).Where(r => !r.Absent && r.Grade is not null)
|
||||
.ToDictionary(r => r.StudentId);
|
||||
var names = students?.GetByGroup(_exam.GroupId).ToDictionary(s => s.Id, s => s.FullName);
|
||||
foreach (var studentId in first.Keys.Union(second.Keys)
|
||||
.OrderBy(id => names?.GetValueOrDefault(id) ?? id.ToString()))
|
||||
{
|
||||
first.TryGetValue(studentId, out var originalResult);
|
||||
second.TryGetValue(studentId, out var repeatResult);
|
||||
var entries = new List<(Exam Exam, string Grade)>();
|
||||
if (originalResult?.Grade is { } g1) entries.Add((original, g1));
|
||||
if (repeatResult?.Grade is { } g2) entries.Add((repeat, g2));
|
||||
var effective = ExamScoringService.EffectiveGrades(entries, _gradingSystem);
|
||||
RepeatComparison.Add(new RepeatComparisonItem(
|
||||
names?.GetValueOrDefault(studentId) ?? studentId.ToString(),
|
||||
originalResult?.Grade ?? "–", repeatResult?.Grade ?? "–",
|
||||
effective.FirstOrDefault() ?? "–"));
|
||||
}
|
||||
OnPropertyChanged(nameof(HasRepeatComparison));
|
||||
OnPropertyChanged(nameof(RepeatComparisonTitle));
|
||||
}
|
||||
|
||||
private void LoadResults()
|
||||
@@ -98,8 +143,11 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
foreach (var e in GradingKeyEntries)
|
||||
e.AbsolutePointsDisplay = _examMaxPoints <= 0
|
||||
? "–"
|
||||
: $"ab {(e.MinPercent / 100.0 * _examMaxPoints).ToString("0.##", CultureInfo.InvariantCulture)} " +
|
||||
$"von {_examMaxPoints.ToString("0.##", CultureInfo.InvariantCulture)} Punkten";
|
||||
: _exam.Tasks.Any(t => t.Variant is not null)
|
||||
? $"A ab {e.MinPercent / 100.0 * _examMaxPoints:0.##} / " +
|
||||
$"B ab {e.MinPercent / 100.0 * ExamScoringService.Maximum(_exam.Tasks, ExamVariant.B):0.##} Punkten"
|
||||
: $"ab {(e.MinPercent / 100.0 * _examMaxPoints).ToString("0.##", CultureInfo.InvariantCulture)} " +
|
||||
$"von {_examMaxPoints.ToString("0.##", CultureInfo.InvariantCulture)} Punkten";
|
||||
}
|
||||
|
||||
private List<GradingKeyEntry> BuildCurrentGradingKey() => GradingKeyEntries
|
||||
@@ -116,6 +164,12 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
GradingKeyValidation = "";
|
||||
_exam.GradingKey = key;
|
||||
_exams.Save(_exam);
|
||||
var results = _results.GetByExam(_exam.Id);
|
||||
foreach (var result in results.Where(r => !r.Absent))
|
||||
result.Grade = _grading.CalculateGrade(result.TotalPoints,
|
||||
ExamScoringService.Maximum(_exam.Tasks, result.Variant), key);
|
||||
_results.SaveMany(results);
|
||||
LoadRepeatComparison(_students);
|
||||
GradingKeyStatus = "Notenschlüssel für diese Klausur übernommen.";
|
||||
}
|
||||
|
||||
@@ -127,7 +181,8 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
GradingKeyValidation = _grading.ValidateGradingKey(currentKey) ?? "";
|
||||
|
||||
var grades = _gradedResults
|
||||
.Select(r => _grading.CalculateGrade(r.TotalPoints, _examMaxPoints, currentKey))
|
||||
.Select(r => _grading.CalculateGrade(r.TotalPoints,
|
||||
ExamScoringService.Maximum(_exam.Tasks, r.Variant), currentKey))
|
||||
.ToList();
|
||||
|
||||
GradeDistribution.Clear();
|
||||
@@ -174,11 +229,14 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
for (var i = 0; i < tasks.Count; i++)
|
||||
{
|
||||
var task = tasks[i];
|
||||
var achieved = _gradedResults.Where(r => i < r.Points.Count).Select(r => r.Points[i]).ToList();
|
||||
var achieved = _gradedResults.Where(r => i < r.Points.Count &&
|
||||
ExamScoringService.AppliesTo(task, r.Variant)).Select(r => r.Points[i]).ToList();
|
||||
var avgPercent = task.MaxPoints <= 0 || achieved.Count == 0
|
||||
? 0
|
||||
: achieved.Average() / task.MaxPoints * 100.0;
|
||||
TaskAnalysis.Add(new TaskAnalysisItem(task.Nr, task.Title, avgPercent));
|
||||
var suffix = (task.Variant is null ? "" : $" ({task.Variant})")
|
||||
+ (task.IsBonus ? " · Bonus" : "");
|
||||
TaskAnalysis.Add(new TaskAnalysisItem(task.Nr, (task.Title ?? "") + suffix, avgPercent));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -209,8 +267,15 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
if (!string.IsNullOrEmpty(BelowThresholdLabel1)) csv.AddRow(BelowThresholdLabel1, BelowThresholdDisplay1);
|
||||
if (!string.IsNullOrEmpty(BelowThresholdLabel2)) csv.AddRow(BelowThresholdLabel2, BelowThresholdDisplay2);
|
||||
csv.AddRow("Bewertet", GradedCount)
|
||||
.AddRow("Abwesend", AbsentCount)
|
||||
.AddBlankRow()
|
||||
.AddRow("Abwesend", AbsentCount);
|
||||
if (HasRepeatComparison)
|
||||
{
|
||||
csv.AddBlankRow().AddRow("Vergleich", RepeatComparisonTitle)
|
||||
.AddRow("Schüler", "Erste Arbeit", "Wiederholung", "Zählt");
|
||||
foreach (var item in RepeatComparison)
|
||||
csv.AddRow(item.StudentName, item.OriginalGrade, item.RepeatGrade, item.EffectiveGrade);
|
||||
}
|
||||
csv.AddBlankRow()
|
||||
.AddRow("Aufgabenanalyse")
|
||||
.AddRow("Aufgabe", "Ø Erfüllungsgrad", "Auffällig schwach");
|
||||
foreach (var t in TaskAnalysis)
|
||||
@@ -221,6 +286,9 @@ public partial class ExamEvaluationDialogViewModel : ObservableObject
|
||||
|
||||
// ── Notenspiegel-Balken ────────────────────────────────────────────────────
|
||||
|
||||
public record RepeatComparisonItem(string StudentName, string OriginalGrade,
|
||||
string RepeatGrade, string EffectiveGrade);
|
||||
|
||||
public class GradeBarItem
|
||||
{
|
||||
public string Grade { get; }
|
||||
|
||||
Reference in new issue
Block a user