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

Scheduler improvements

Browse Source
This commit is contained in:
James Kolpack
2025-10-19 10:03:26 -04:00
parent 0ff45f9310
commit 349ec09cd7
1 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebApp/Components/Pages/MeetingSchedulePages/Scheduler.razor
+77 -48
View File
@@ -1,5 +1,6 @@
@using Core.Calculation @using Core.Calculation
@using Microsoft.EntityFrameworkCore @using Microsoft.EntityFrameworkCore
@using NuGet.Packaging
@page "/meeting-schedule/scheduler" @page "/meeting-schedule/scheduler"
@inject IConfiguration Configuration @inject IConfiguration Configuration
@inject AppDbContext Context @inject AppDbContext Context
@@ -10,56 +11,77 @@
<MudPaper Class="pa-4 mt-5"> <MudPaper Class="pa-4 mt-5">
<MudText>Include: @string.Join(", ", _requiredTeams) </MudText>
<MudGrid> <MudGrid>
<MudItem Style="width:160px;"> <MudItem Style="width:250px;">
<MudNumericField @bind-Value="_parameters.TimeSlots" <MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"></MudNumericField> Label="Time Slots" Min="1" Max="4"></MudNumericField>
<MudStack>
<MudButton OnClick="() => AddRegionals()">Add Regionals</MudButton>
<MudButton OnClick="() => RemoveIndividual()">Remove Individual</MudButton>
<MudToggleGroup T="Team"
SelectionMode="SelectionMode.MultiSelection"
@bind-Values="_requiredTeams"
Vertical="true" CheckMark>
@foreach (var team in _teams.OrderBy(e => e.Event.Name))
{
<MudToggleItem Value="@team" Text="@team.ToString()" Style="font-size: .6rem;"/>
}
</MudToggleGroup>
</MudStack>
</MudItem> </MudItem>
<TeamSelector Teams="@_teams" SelectedTeams="@_requiredTeams" Label="Required"></TeamSelector> @* <TeamSelector Teams="@_teams" SelectedTeams="@_requiredTeams" Label="Required"></TeamSelector> *@
<MudButton OnClick="() => RequireRegionals()">Require Regionals</MudButton>
</MudGrid>
<MudButton Class="ma-3" OnClick="Solve" Variant="Variant.Filled" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
</MudPaper>
<MudItem xs="12" lg="4">
<MudText Typo="Typo.h4">Time Slots</MudText>
<MudButton Class="ma-3" OnClick="Solve" Variant="Variant.Filled" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
<MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
<HeaderContent>
<MudItem xs="12" lg="4"> </HeaderContent>
<MudText Typo="Typo.h4">Time Slots</MudText> <RowTemplate>
<MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData"> <MudTd>
<HeaderContent> @{
var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);
</HeaderContent> }
<RowTemplate> @foreach (var t in context)
<MudTd> {
@{ <MudItem>
var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);} @t.ToString() -
@foreach (var t in context) @string.Join(", ", t.Students.Select(s => s.FirstName + " " + (ol.Any(o => o.Item1.Equals(s)) ? "*" : "")))
{ </MudItem>
<MudItem> }
@t.ToString() - @* @foreach (var overlap in ol)
@string.Join(", ", t.Students.Select(s => s.FirstName + " " + (ol.Any(o => o.Item1.Equals(s)) ? "*" : "" )) )
</MudItem>
}
@* @foreach (var overlap in ol)
{ {
<MudItem> <MudItem>
@string.Join(", ", overlap.Item1) @string.Join(", ", overlap.Item1)
</MudItem> </MudItem>
} *@ } *@
@{ var notInTimeSLot = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
@if (notInTimeSLot.Any()) {
<MudItem>
<i>
Not scheduled: @string.Join(", ", notInTimeSLot.Select(s => s.FirstName))
</i>
</MudItem>
}
</MudTd> @{ var notInTimeSLot = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
</RowTemplate> @if (notInTimeSLot.Any())
</MudTable> {
</MudItem> <MudItem>
<i>
Not scheduled: @string.Join(", ", notInTimeSLot.Select(s => s.FirstName))
</i>
</MudItem>
}
</MudTd>
</RowTemplate>
</MudTable>
</MudItem>
</MudGrid>
</MudPaper>
@code { @code {
private Team[]? _teams; private Team[]? _teams;
@@ -68,14 +90,24 @@
private TeamSchedulerSolution _solution; private TeamSchedulerSolution _solution;
private TeamSchedulerOptions _parameters; private TeamSchedulerOptions _parameters;
bool _isSolving = false; bool _isSolving = false;
private HashSet<Team> _requiredTeams = []; private IEnumerable<Team> _requiredTeams = [];
//private Team[] _requiredTeams = [];
private void RequireRegionals() private void OnSelectedValuesChanged(IEnumerable<Team> obj)
{ {
foreach (var team in _teams.Where(e => e.Event.RegionalEvent)) _requiredTeams = obj.ToList();
{ }
_requiredTeams.Add(team);
} private void AddRegionals()
{
_requiredTeams
= _teams.Where(e => e.Event.RegionalEvent).Concat(_requiredTeams).Distinct();
}
private void RemoveIndividual()
{
_requiredTeams
= _requiredTeams.Where(t => t.Event.EventFormat != EventFormat.Individual);
} }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
@@ -129,10 +161,6 @@
private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2) private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
{ {
//_isSolving = true;
var requiredTeams = _teams; var requiredTeams = _teams;
var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots); var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots);
@@ -155,4 +183,5 @@
{ {
_solutionData.ReloadServerData(); _solutionData.ReloadServerData();
} }
} }