Add animated classroom grouping with saved editable plans
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
This commit is contained in:
1 parent
d4b1419f9a
commit
f0462bd2a1
27 files changed
+775
-46
No files matched your search
@@ -7,7 +7,7 @@ using System.Collections.ObjectModel;
|
||||
|
||||
namespace LehrerApp.Desktop.ViewModels.Groups;
|
||||
|
||||
public sealed record StudentGroupMember(string Name);
|
||||
public sealed record StudentGroupMember(Guid Id, string Name);
|
||||
public sealed record StudentPairCandidate(Guid Id, string Name);
|
||||
|
||||
public sealed class StudentPairRule
|
||||
@@ -29,8 +29,9 @@ public sealed class StudentPairRule
|
||||
FirstId == first && SecondId == second || FirstId == second && SecondId == first;
|
||||
}
|
||||
|
||||
public sealed class GeneratedStudentGroup
|
||||
public sealed partial class GeneratedStudentGroup : ObservableObject
|
||||
{
|
||||
[ObservableProperty] private bool _isDropTarget;
|
||||
public string Title { get; }
|
||||
public ObservableCollection<StudentGroupMember> Members { get; } = [];
|
||||
|
||||
@@ -39,7 +40,13 @@ public sealed class GeneratedStudentGroup
|
||||
Title = $"Gruppe {number}";
|
||||
foreach (var student in students.OrderBy(s => s.LastName, StringComparer.CurrentCultureIgnoreCase)
|
||||
.ThenBy(s => s.FirstName, StringComparer.CurrentCultureIgnoreCase))
|
||||
Members.Add(new StudentGroupMember(student.FullName));
|
||||
Members.Add(new StudentGroupMember(student.Id, student.FullName));
|
||||
}
|
||||
|
||||
public GeneratedStudentGroup(int number, IEnumerable<StudentGroupMember> members)
|
||||
{
|
||||
Title = $"Gruppe {number}";
|
||||
foreach (var member in members) Members.Add(member);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,10 +62,12 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
private readonly IParticipationRepository _participation;
|
||||
private readonly IGradeRepository _grades;
|
||||
private readonly IGroupRepository _groupRepository;
|
||||
private readonly IStudentGroupPlanRepository? _savedPlans;
|
||||
private readonly Random _random;
|
||||
private readonly List<Student> _participants = [];
|
||||
private readonly Dictionary<Guid, double?> _performance = [];
|
||||
private readonly HashSet<Guid> _supportStudentIds = [];
|
||||
private Guid? _editingPlanId;
|
||||
private string _attendanceWarning = "";
|
||||
|
||||
[ObservableProperty] private StudentDrawGroup? _selectedGroup;
|
||||
@@ -77,14 +86,24 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
[ObservableProperty] private string _statusText = "Optionen wählen und Gruppen zusammenstellen.";
|
||||
[ObservableProperty] private string _warningText = "";
|
||||
[ObservableProperty] private bool _hasGeneratedGroups;
|
||||
[ObservableProperty] private StudentGroupPlan? _selectedSavedPlan;
|
||||
[ObservableProperty] private string _planName = "";
|
||||
[ObservableProperty] private string _saveStatus = "";
|
||||
[ObservableProperty] private bool _hasUnsavedChanges;
|
||||
|
||||
public ObservableCollection<StudentDrawGroup> Groups { get; } = [];
|
||||
public ObservableCollection<GeneratedStudentGroup> GeneratedGroups { get; } = [];
|
||||
public ObservableCollection<StudentPairCandidate> PairCandidates { get; } = [];
|
||||
public ObservableCollection<StudentPairRule> ForcedPairs { get; } = [];
|
||||
public ObservableCollection<StudentPairRule> ExcludedPairs { get; } = [];
|
||||
public ObservableCollection<StudentGroupPlan> SavedPlans { get; } = [];
|
||||
public string[] ParticipantModeOptions { get; } = [FutureModeLabel, AdHocModeLabel];
|
||||
public bool CanGenerate => SelectedGroup is not null && _participants.Count >= 2;
|
||||
public bool CanSave => _savedPlans is not null && SelectedGroup is not null &&
|
||||
HasGeneratedGroups && !string.IsNullOrWhiteSpace(PlanName);
|
||||
public bool CanLoadSavedPlan => SelectedSavedPlan is not null;
|
||||
public bool CanDeleteSavedPlan => SelectedSavedPlan is not null;
|
||||
public bool HasSavedPlans => SavedPlans.Count > 0;
|
||||
public string SizePriorityLabel => PriorityLabel(SizePriority);
|
||||
public string CountPriorityLabel => PriorityLabel(CountPriority);
|
||||
public string PerformanceDistributionLabel => PerformanceDistribution switch
|
||||
@@ -106,7 +125,8 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
IParticipationRepository participation,
|
||||
IGradeRepository grades,
|
||||
Guid? initialGroupId = null,
|
||||
Random? random = null)
|
||||
Random? random = null,
|
||||
IStudentGroupPlanRepository? savedPlans = null)
|
||||
{
|
||||
_students = students;
|
||||
_groupRepository = groups;
|
||||
@@ -115,9 +135,13 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
_participation = participation;
|
||||
_grades = grades;
|
||||
_random = random ?? Random.Shared;
|
||||
_savedPlans = savedPlans;
|
||||
|
||||
foreach (var group in groups.GetAll().OrderBy(g => g.Name, StringComparer.CurrentCultureIgnoreCase))
|
||||
Groups.Add(new StudentDrawGroup(group.Id, group.Name));
|
||||
if (initialGroupId is { } requestedId && Groups.All(g => g.Id != requestedId) &&
|
||||
groups.GetById(requestedId) is { } archived)
|
||||
Groups.Add(new StudentDrawGroup(archived.Id, $"{archived.Name} (archiviert)"));
|
||||
SelectedGroup = Groups.FirstOrDefault(g => g.Id == initialGroupId) ?? Groups.FirstOrDefault();
|
||||
}
|
||||
|
||||
@@ -126,8 +150,24 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
ForcedPairs.Clear();
|
||||
ExcludedPairs.Clear();
|
||||
ReloadParticipants();
|
||||
ReloadSavedPlans();
|
||||
_editingPlanId = null;
|
||||
PlanName = "";
|
||||
}
|
||||
partial void OnParticipantModeNameChanged(string value) => ReloadParticipants();
|
||||
partial void OnSelectedSavedPlanChanged(StudentGroupPlan? value)
|
||||
{
|
||||
OnPropertyChanged(nameof(CanLoadSavedPlan));
|
||||
OnPropertyChanged(nameof(CanDeleteSavedPlan));
|
||||
LoadSavedPlanCommand.NotifyCanExecuteChanged();
|
||||
DeleteSavedPlanCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
partial void OnPlanNameChanged(string value)
|
||||
{
|
||||
SavePlanCommand.NotifyCanExecuteChanged();
|
||||
if (HasGeneratedGroups) HasUnsavedChanges = true;
|
||||
}
|
||||
partial void OnHasGeneratedGroupsChanged(bool value) => SavePlanCommand.NotifyCanExecuteChanged();
|
||||
partial void OnTargetGroupSizeChanged(int value) => InvalidateResult();
|
||||
partial void OnTargetGroupCountChanged(int value) => InvalidateResult();
|
||||
partial void OnSizePriorityChanged(double value)
|
||||
@@ -177,11 +217,118 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
GeneratedGroups.Add(new GeneratedStudentGroup(i + 1, assignments[i]));
|
||||
|
||||
HasGeneratedGroups = true;
|
||||
_editingPlanId = null;
|
||||
SelectedSavedPlan = null;
|
||||
PlanName = $"Einteilung {DateTime.Now:dd.MM.yyyy HH:mm:ss}";
|
||||
HasUnsavedChanges = true;
|
||||
SaveStatus = "Noch nicht gespeichert.";
|
||||
StatusText = $"{_participants.Count} Schüler · {groupCount} Gruppen · Größen " +
|
||||
string.Join("/", capacities.Distinct().OrderBy(x => x));
|
||||
UpdateWarning(groupCount, assignments);
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanSave))]
|
||||
private void SavePlan()
|
||||
{
|
||||
if (_savedPlans is null || SelectedGroup is null) return;
|
||||
var plan = new StudentGroupPlan
|
||||
{
|
||||
Id = _editingPlanId ?? Guid.NewGuid(),
|
||||
GroupId = SelectedGroup.Id,
|
||||
Name = PlanName,
|
||||
Groups = GeneratedGroups.Select(group => new StudentGroupPlanGroup
|
||||
{
|
||||
StudentIds = group.Members.Select(member => member.Id).ToList(),
|
||||
}).ToList(),
|
||||
};
|
||||
try
|
||||
{
|
||||
_savedPlans.Save(plan);
|
||||
_editingPlanId = plan.Id;
|
||||
ReloadSavedPlans(plan.Id);
|
||||
HasUnsavedChanges = false;
|
||||
SaveStatus = "Einteilung gespeichert.";
|
||||
}
|
||||
catch (Exception ex) when (ex is ArgumentException or InvalidOperationException)
|
||||
{
|
||||
SaveStatus = ex.Message;
|
||||
}
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanLoadSavedPlan))]
|
||||
private void LoadSavedPlan()
|
||||
{
|
||||
if (_savedPlans is null || SelectedSavedPlan is not { } selected ||
|
||||
SelectedGroup?.Id != selected.GroupId) return;
|
||||
var plan = _savedPlans.GetById(selected.Id);
|
||||
if (plan is null) { ReloadSavedPlans(); return; }
|
||||
_editingPlanId = plan.Id;
|
||||
|
||||
var missing = 0;
|
||||
GeneratedGroups.Clear();
|
||||
foreach (var group in plan.Groups ?? [])
|
||||
{
|
||||
var members = new List<StudentGroupMember>();
|
||||
foreach (var id in group.StudentIds ?? [])
|
||||
{
|
||||
if (_students.GetById(id) is { } student)
|
||||
members.Add(new StudentGroupMember(id, student.FullName));
|
||||
else missing++;
|
||||
}
|
||||
GeneratedGroups.Add(new GeneratedStudentGroup(GeneratedGroups.Count + 1, members));
|
||||
}
|
||||
HasGeneratedGroups = GeneratedGroups.Count > 0;
|
||||
PlanName = plan.Name;
|
||||
HasUnsavedChanges = missing > 0;
|
||||
SaveStatus = missing > 0
|
||||
? $"{missing} nicht mehr vorhandene Schüler wurden ausgelassen. Bitte erneut speichern."
|
||||
: "Gespeicherte Einteilung geladen.";
|
||||
StatusText = $"{GeneratedGroups.Sum(group => group.Members.Count)} Schüler · " +
|
||||
$"{GeneratedGroups.Count} Gruppen · gespeichert am {plan.UpdatedAt.ToLocalTime():dd.MM.yyyy}";
|
||||
WarningText = missing > 0 ? SaveStatus : "";
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanDeleteSavedPlan))]
|
||||
private void DeleteSavedPlan()
|
||||
{
|
||||
if (_savedPlans is null || SelectedSavedPlan is not { } plan) return;
|
||||
_savedPlans.Delete(plan.Id);
|
||||
var deletedCurrent = _editingPlanId == plan.Id;
|
||||
if (deletedCurrent) _editingPlanId = null;
|
||||
ReloadSavedPlans();
|
||||
if (deletedCurrent) HasUnsavedChanges = HasGeneratedGroups;
|
||||
SaveStatus = "Gespeicherte Einteilung gelöscht.";
|
||||
}
|
||||
|
||||
public bool MoveStudent(StudentGroupMember member, GeneratedStudentGroup target)
|
||||
{
|
||||
if (!HasGeneratedGroups || !GeneratedGroups.Contains(target)) return false;
|
||||
var source = GeneratedGroups.FirstOrDefault(group => group.Members.Contains(member));
|
||||
if (source is null || source == target || target.Members.Any(m => m.Id == member.Id)) return false;
|
||||
source.Members.Remove(member);
|
||||
target.Members.Add(member);
|
||||
HasUnsavedChanges = true;
|
||||
SaveStatus = "Änderungen noch nicht gespeichert.";
|
||||
StatusText = $"{GeneratedGroups.Sum(group => group.Members.Count)} Schüler · " +
|
||||
$"{GeneratedGroups.Count} Gruppen · manuell angepasst";
|
||||
var assignments = GeneratedGroups.Select(group => group.Members
|
||||
.Select(m => _students.GetById(m.Id)).OfType<Student>().ToList()).ToList();
|
||||
UpdateWarning(GeneratedGroups.Count, assignments);
|
||||
return true;
|
||||
}
|
||||
|
||||
private void ReloadSavedPlans(Guid? selectedId = null)
|
||||
{
|
||||
SavedPlans.Clear();
|
||||
SelectedSavedPlan = null;
|
||||
if (_savedPlans is not null && SelectedGroup is not null)
|
||||
{
|
||||
foreach (var plan in _savedPlans.GetByGroup(SelectedGroup.Id)) SavedPlans.Add(plan);
|
||||
SelectedSavedPlan = SavedPlans.FirstOrDefault(plan => plan.Id == selectedId);
|
||||
}
|
||||
OnPropertyChanged(nameof(HasSavedPlans));
|
||||
}
|
||||
|
||||
private void ReloadParticipants()
|
||||
{
|
||||
_participants.Clear();
|
||||
@@ -385,6 +532,8 @@ public partial class StudentGroupGeneratorViewModel : ObservableObject
|
||||
{
|
||||
GeneratedGroups.Clear();
|
||||
HasGeneratedGroups = false;
|
||||
HasUnsavedChanges = false;
|
||||
SaveStatus = "";
|
||||
StatusText = _participants.Count >= 2
|
||||
? $"{_participants.Count} Schüler stehen zur Einteilung bereit."
|
||||
: "Für eine Gruppeneinteilung werden mindestens zwei Schüler benötigt.";
|
||||
|
||||
Reference in new issue
Block a user