Handle absent students in meetin schedule
This commit is contained in:
@@ -79,6 +79,7 @@
|
|||||||
@foreach (var student in team.Students)
|
@foreach (var student in team.Students)
|
||||||
{
|
{
|
||||||
var overlap = context.StudentHasOverlaps(student);
|
var overlap = context.StudentHasOverlaps(student);
|
||||||
|
var isAbsent = _absentStudents.Contains(student);
|
||||||
var color = overlap ? Color.Warning : Color.Default;
|
var color = overlap ? Color.Warning : Color.Default;
|
||||||
|
|
||||||
@if(!first) {<MudText>, </MudText>}
|
@if(!first) {<MudText>, </MudText>}
|
||||||
@@ -86,7 +87,7 @@
|
|||||||
<MudText
|
<MudText
|
||||||
Typo="Typo.body2"
|
Typo="Typo.body2"
|
||||||
Color="@color">
|
Color="@color">
|
||||||
@student.FirstName@(overlap ? "*" : "")
|
@student.FirstName@(overlap ? "*" : "")@(isAbsent ? " (absent)" : "")
|
||||||
</MudText>
|
</MudText>
|
||||||
}
|
}
|
||||||
</MudLink>
|
</MudLink>
|
||||||
@@ -101,8 +102,9 @@
|
|||||||
<MudStack>
|
<MudStack>
|
||||||
@foreach (var student in context.UnscheduledStudents)
|
@foreach (var student in context.UnscheduledStudents)
|
||||||
{
|
{
|
||||||
|
var isAbsent = _absentStudents.Contains(student);
|
||||||
<MudItem>
|
<MudItem>
|
||||||
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName </MudText>
|
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName@(isAbsent ? " (absent)" : "") </MudText>
|
||||||
@{var first = true;}
|
@{var first = true;}
|
||||||
@foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student))
|
@foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student))
|
||||||
{
|
{
|
||||||
@@ -150,6 +152,22 @@
|
|||||||
</MudToggleItem>
|
</MudToggleItem>
|
||||||
}
|
}
|
||||||
</MudToggleGroup>
|
</MudToggleGroup>
|
||||||
|
|
||||||
|
<MudDivider Class="my-4" />
|
||||||
|
|
||||||
|
<MudText Typo="Typo.h4">Absent Students</MudText>
|
||||||
|
<MudToggleGroup T="Student"
|
||||||
|
SelectionMode="SelectionMode.MultiSelection"
|
||||||
|
@bind-Values="_absentStudents"
|
||||||
|
Vertical="true"
|
||||||
|
CheckMark>
|
||||||
|
@foreach (var student in _students.OrderBy(e => e.FirstName))
|
||||||
|
{
|
||||||
|
<MudToggleItem Value="@student" Style="font-size: .75rem;">
|
||||||
|
@student.FirstNameLastName
|
||||||
|
</MudToggleItem>
|
||||||
|
}
|
||||||
|
</MudToggleGroup>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
|
|
||||||
@@ -158,12 +176,13 @@
|
|||||||
|
|
||||||
@code {
|
@code {
|
||||||
private Team[]? _teams;
|
private Team[]? _teams;
|
||||||
private Student[]? _students; // TODO: Add absent student functionality
|
private Student[]? _students;
|
||||||
MudTable<TeamScheduleTimeSlot> _solutionData;
|
MudTable<TeamScheduleTimeSlot> _solutionData;
|
||||||
private TeamSchedulerSolution _solution;
|
private TeamSchedulerSolution _solution;
|
||||||
private TeamSchedulerOptions _parameters;
|
private TeamSchedulerOptions _parameters;
|
||||||
bool _isSolving;
|
bool _isSolving;
|
||||||
private IEnumerable<Team> _scheduledTeams = [];
|
private IEnumerable<Team> _scheduledTeams = [];
|
||||||
|
private IEnumerable<Student> _absentStudents = [];
|
||||||
private IEnumerable<Team> _possibleAdditions = [];
|
private IEnumerable<Team> _possibleAdditions = [];
|
||||||
|
|
||||||
private async Task AddRegionals()
|
private async Task AddRegionals()
|
||||||
@@ -264,7 +283,13 @@
|
|||||||
{
|
{
|
||||||
_isSolving = true;
|
_isSolving = true;
|
||||||
|
|
||||||
var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots, _students);
|
// Filter out absent students
|
||||||
|
var availableStudents = _students.Where(s => !_absentStudents.Contains(s)).ToArray();
|
||||||
|
|
||||||
|
// Update parameters with absent student names
|
||||||
|
_parameters.AbsentStudents = _absentStudents.Select(s => s.FirstNameLastName).ToArray();
|
||||||
|
|
||||||
|
var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots, availableStudents);
|
||||||
_solution = teamScheduler.Solve();
|
_solution = teamScheduler.Solve();
|
||||||
|
|
||||||
var loe = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.LevelOfEffort);
|
var loe = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.LevelOfEffort);
|
||||||
@@ -306,7 +331,7 @@
|
|||||||
scheduledTeam.Students
|
scheduledTeam.Students
|
||||||
.OrderBy(e => e == scheduledTeam.Captain)
|
.OrderBy(e => e == scheduledTeam.Captain)
|
||||||
.ThenBy(e => e.FirstName)
|
.ThenBy(e => e.FirstName)
|
||||||
.Select(e => e.FirstName + (timeslot.StudentHasOverlaps(e) ? "*" : "")));
|
.Select(e => e.FirstName + (timeslot.StudentHasOverlaps(e) ? "*" : "") + (_absentStudents.Contains(e) ? " (absent)" : "")));
|
||||||
|
|
||||||
if (scheduledTeam.Event.EventFormat is EventFormat.Individual)
|
if (scheduledTeam.Event.EventFormat is EventFormat.Individual)
|
||||||
sb.Append(t);
|
sb.Append(t);
|
||||||
@@ -321,7 +346,7 @@
|
|||||||
sb.Append(Environment.NewLine);
|
sb.Append(Environment.NewLine);
|
||||||
foreach (var student in timeslot.UnscheduledStudents)
|
foreach (var student in timeslot.UnscheduledStudents)
|
||||||
{
|
{
|
||||||
var s = student.FirstName;
|
var s = student.FirstName + (_absentStudents.Contains(student) ? " (absent)" : "");
|
||||||
var unassignedTeams = _solution.StudentUnassignedTeams(student);
|
var unassignedTeams = _solution.StudentUnassignedTeams(student);
|
||||||
var t = string.Join(", ", unassignedTeams.Select(e => e.ToString()));
|
var t = string.Join(", ", unassignedTeams.Select(e => e.ToString()));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user