TSA/chapter-organizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add recomendations for meeting scheduler

Browse Source
This commit is contained in:
James Kolpack
2025-10-31 13:29:43 -04:00
parent cf9949876d
commit b7fa7fcbe1
4 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Calculation/TeamIdComparer.cs
+16
View File
@@ -0,0 +1,16 @@
using Core.Entities;
namespace Core.Calculation;
public class TeamIdComparer : IEqualityComparer<Team>
{
public bool Equals(Team? x, Team? y)
{
return x != null && y != null && x.Id == y.Id;
}
public int GetHashCode(Team obj)
{
return obj.Id.GetHashCode();
}
}
Core/Calculation/TeamSchedulerSolution.cs
+3 -1
View File
@@ -11,7 +11,9 @@ public class TeamSchedulerSolution(
public TeamScheduleTimeSlot[] TimeSlots { get; set; } public TeamScheduleTimeSlot[] TimeSlots { get; set; }
= timeSlots.Select( (teams,i) => = timeSlots.Select( (teams,i) =>
new TeamScheduleTimeSlot{Name = i.ToString(), Teams = teams, new TeamScheduleTimeSlot{
Name = "Time Slot " + (i + 1),
Teams = teams,
StudentOverlaps = GetStudentTeamOverlaps(teams), StudentOverlaps = GetStudentTeamOverlaps(teams),
UnscheduledStudents = GetStudentsNotInTimSlot(teams, students) UnscheduledStudents = GetStudentsNotInTimSlot(teams, students)
} }
Core/Entities/Team.cs
+13
View File
@@ -62,4 +62,17 @@ public class Team
{ {
return $"{Event.Name} {(Identifier != null ? $"({Identifier})" : "")}"; return $"{Event.Name} {(Identifier != null ? $"({Identifier})" : "")}";
} }
public string StudentsFirstNames
{
get
{
return
string.Join(", ",
Students.Select(e =>
e.FirstName
+ (Captain != null && (Captain.Equals(e)) ? "(Cpt)" : ""))
);
}
}
} }
WebApp/Components/Pages/MeetingSchedulePages/Index.razor
+60 -59
View File
@@ -16,14 +16,16 @@
<MudText Typo="Typo.h4">Time Slots</MudText> <MudText Typo="Typo.h4">Time Slots</MudText>
<MudPaper Class="pa-2 ma-2" Elevation="3"> <MudPaper Class="pa-2 ma-2" Elevation="3">
<MudGrid> <MudGrid>
<MudItem xs="12" sm="6" lg="4"> <MudItem xs="6" sm="3" lg="2">
<MudNumericField @bind-Value="_parameters.TimeSlots" <MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"> Label="Time Slots" Min="1" Max="4">
</MudNumericField> </MudNumericField>
</MudItem> </MudItem>
<MudFlexBreak/> <MudFlexBreak/>
<MudItem xs="12" sm="6" lg="4"> <MudItem xs="12" sm="6" lg="4">
<MudTooltip Text="Schedule teams with Level of Effort >= 3" Inline="false">
<MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton> <MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton>
</MudTooltip>
</MudItem> </MudItem>
<MudItem xs="12" sm="6" lg="4"> <MudItem xs="12" sm="6" lg="4">
<MudButton Variant="Variant.Outlined" OnClick="() => AddRegionals()" FullWidth="true">Add Regionals</MudButton> <MudButton Variant="Variant.Outlined" OnClick="() => AddRegionals()" FullWidth="true">Add Regionals</MudButton>
@@ -55,55 +57,59 @@
</HeaderContent> </HeaderContent>
<RowTemplate> <RowTemplate>
<MudTd> <MudTd>
<MudGrid Class="d-flex justify-start align-start"> <MudGrid Class="">
@foreach (var team in context.Teams.OrderBy(e => e.ToString())) <MudItem xs="12" lg="6">
{ <MudStack>
var removed = !_scheduledTeams.Contains(team); <MudText Typo="Typo.h6">@context.Name</MudText>
<MudItem xs="12"> @foreach (var team in context.Teams.OrderBy(e => e.ToString()))
<MudLink Typo="Typo.body1" {
Class="d-flex align-center" var removed = !_scheduledTeams.Contains(team);
Color="Color.Default"
OnClick="@(() => ToggleRequiredTeam(team))">
<MudIcon Icon="@Icons.Material.Filled.Clear"
Size="Size.Small"
Class="@(removed ? "" : "d-none")">
</MudIcon>
@team -
@foreach (var student in team.Students)
{
var overlap = context.StudentHasOverlaps(student);
var color = overlap ? Color.Warning : Color.Default;
<MudText <MudLink Typo="Typo.body1"
Typo="Typo.body2" Class="d-flex align-center"
Class="d-inline-block ml-3" Color="Color.Default"
Color="color"> OnClick="@(() => ToggleRequiredTeam(team))">
&nbsp;@student.FirstName@(overlap ? "*" : "") <MudIcon Icon="@Icons.Material.Filled.Clear"
</MudText> Size="Size.Small"
} Class="@(removed ? "" : "d-none")">
</MudLink> </MudIcon>
</MudItem> @team -
} @{var first = true;}
</MudGrid> @foreach (var student in team.Students)
</MudTd> {
<MudTd> var overlap = context.StudentHasOverlaps(student);
@if (context.UnscheduledStudents.Any()) var color = overlap ? Color.Warning : Color.Default;
{
<MudItem>Unscheduled</MudItem> @if(!first) {<MudText>, </MudText>}
<MudGrid> {first = false;}
@foreach (var student in context.UnscheduledStudents) <MudText
{ Typo="Typo.body2"
<MudItem xs="12" sm="6" lg="3"> Color="color">
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName </MudText>&nbsp; &nbsp;@student.FirstName@(overlap ? "*" : "")
@{ </MudText>
var pa = _possibleAdditions.ToArray(); }
} </MudLink>
}
</MudStack>
</MudItem>
<MudItem xs="12" lg="6">
@if (context.UnscheduledStudents.Any())
{
<MudText Typo="Typo.body1" HtmlTag="strong">Unscheduled</MudText>
<MudStack>
@foreach (var student in context.UnscheduledStudents)
{
<MudItem>
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName&nbsp;</MudText>
@{var first = true;}
@foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student)) @foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student))
{ {
var color = pa.Contains(unassignedTeam) ? Color.Error : Color.Default; var color = _possibleAdditions.Contains(unassignedTeam, new TeamIdComparer()) ? Color.Success : Color.Default;
var added = _scheduledTeams.Contains(unassignedTeam); var added = _scheduledTeams.Contains(unassignedTeam);
@if(!first) {<span>, </span>}
{first = false;}
<MudLink Typo="Typo.body2" <MudLink Typo="Typo.body2"
Class="d-flex align-center ml-3"
Color="@color" Color="@color"
OnClick="@(() => ToggleRequiredTeam(unassignedTeam))"> OnClick="@(() => ToggleRequiredTeam(unassignedTeam))">
<MudIcon Icon="@Icons.Material.Filled.Check" <MudIcon Icon="@Icons.Material.Filled.Check"
@@ -113,10 +119,12 @@
@unassignedTeam @unassignedTeam
</MudLink> </MudLink>
} }
</MudItem> </MudItem>
} }
</MudGrid> </MudStack>
} }
</MudItem>
</MudGrid>
</MudTd> </MudTd>
</RowTemplate> </RowTemplate>
</MudTable> </MudTable>
@@ -124,7 +132,6 @@
<MudItem xs="5" sm="4" lg="3"> <MudItem xs="5" sm="4" lg="3">
<MudStack> <MudStack>
<MudText Typo="Typo.h4">Scheduled Teams</MudText> <MudText Typo="Typo.h4">Scheduled Teams</MudText>
<MudItem>@string.Join(", ", (_possibleAdditions ?? []).Select(e => e.ToString()))</MudItem>
<MudToggleGroup T="Team" <MudToggleGroup T="Team"
SelectionMode="SelectionMode.MultiSelection" SelectionMode="SelectionMode.MultiSelection"
@bind-Values="_scheduledTeams" @bind-Values="_scheduledTeams"
@@ -133,7 +140,7 @@
@foreach (var team in _teams.OrderBy(e => e.Event.Name)) @foreach (var team in _teams.OrderBy(e => e.Event.Name))
{ {
<MudToggleItem Value="@team" Style="font-size: .75rem;"> <MudToggleItem Value="@team" Style="font-size: .75rem;">
<MudTooltip Text="@string.Join(", ", team.Students.Select(s => s.FirstName))"> <MudTooltip Text="@team.StudentsFirstNames">
<div class="d-flex align-center justify-space-between flex-wrap"> <div class="d-flex align-center justify-space-between flex-wrap">
<MudText Class="ellipsis">@team.ToString()</MudText> <MudText Class="ellipsis">@team.ToString()</MudText>
<EventAttributes EventDefinition="@team.Event"></EventAttributes> <EventAttributes EventDefinition="@team.Event"></EventAttributes>
@@ -150,7 +157,7 @@
@code { @code {
private Team[]? _teams; private Team[]? _teams;
private Student[]? _students; private Student[]? _students; // TODO: Add absent student functionality
MudTable<TeamScheduleTimeSlot> _solutionData; MudTable<TeamScheduleTimeSlot> _solutionData;
private TeamSchedulerSolution _solution; private TeamSchedulerSolution _solution;
private TeamSchedulerOptions _parameters; private TeamSchedulerOptions _parameters;
@@ -255,14 +262,8 @@
private async Task<TableData<TeamScheduleTimeSlot>> SolveSchedule(TableState arg1, CancellationToken arg2) private async Task<TableData<TeamScheduleTimeSlot>> SolveSchedule(TableState arg1, CancellationToken arg2)
{ {
_isSolving = true; _isSolving = true;
var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots); var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots);
// teamScheduler
// .ScheduleSeparate(
// _teams.First(e => e.Event.Name.Contains("Data Science")),
// _teams.First(e => e.Event.Name.Contains("Microcontroller Design"))
// );
_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);