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

Team schedule improvements

Browse Source
This commit is contained in:
James Kolpack
2025-10-17 07:58:14 -04:00
parent 551688f6fe
commit 3964a61794
11 changed files with 99 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebApp/Components/Pages/MeetingSchedulePages/Scheduler.razor
+11 -140
View File
@@ -15,129 +15,9 @@
<MudNumericField @bind-Value="_parameters.TimeSlots"
Label="Time Slots" Min="1" Max="4"></MudNumericField>
</MudItem>
@foreach (var evt in _options)
{
<MudItem Style="width:200px">
<MudButtonGroup>
<MudTooltip Text="Require">
<MudToggleIconButton @bind-Toggled="@evt.Require"
Icon="@Icons.Material.Filled.CheckBoxOutlineBlank"
ToggledIcon="@Icons.Material.Filled.CheckBox"
ToggledColor="@Color.Success"
Disabled="@evt.Omit"
Size="Size.Small"
title="@(evt.Require ? "Required" : "Optional")" />
</MudTooltip>
<MudTooltip Text="Extend">
<MudToggleIconButton @bind-Toggled="@evt.Extend"
Icon="@Icons.Material.Filled.PlusOne"
ToggledIcon="@Icons.Material.Filled.PlusOne"
ToggledColor="@Color.Success"
Disabled="@evt.Omit"
Size="Size.Small"
title="@(evt.Extend ? "Extend" : "Single")" />
</MudTooltip>
<MudTooltip Text="Extend">
<MudToggleIconButton @bind-Toggled="@evt.Omit"
Icon="@Icons.Material.Filled.EventBusy"
ToggledIcon="@Icons.Material.Filled.EventBusy"
ToggledColor="@Color.Error"
Size="Size.Small"
title="@(evt.Omit ? "Omit" : "Optional")" />
</MudTooltip>
</MudButtonGroup>
<MudTooltip Text="@string.Join(", ", evt.Team.Students.Select(e => e.FirstName))">
<MudText>@evt.Team.ToString()</MudText>
</MudTooltip>
</MudItem>
}
@* <MudItem>
<MudTooltip Text="Require at least one On-Site Event">
<MudSwitch @bind-Value="_parameters" Color="Color.Info"
Label="On-Site" />
</MudTooltip>
</MudItem>
<MudItem>
<MudTooltip Text="Require at least one Regional Event">
<MudSwitch @bind-Value="_parameters.RequireRegional" Color="Color.Info"
Label="Regional" />
</MudTooltip>
</MudItem>
<MudItem>
<MudStack Style="width:100px;">
<MudTooltip Text="Student Event Count Assignment Range">
<MudInputLabel>Event Count</MudInputLabel>
</MudTooltip>
<MudNumericField @bind-Value="_parameters.EventsLowerBound"
Label="At Least" Min="2" Max="4"></MudNumericField>
<MudNumericField @bind-Value="_parameters.EventsUpperBound"
Label="Up to" Min="3" Max="5"></MudNumericField>
</MudStack>
</MudItem>
<MudItem>
<MudStack Style="width:100px;">
<MudTooltip Text="Student Level of Effort Range">
<MudInputLabel>LOE</MudInputLabel>
</MudTooltip>
<MudNumericField @bind-Value="_parameters.EffortLowerBound"
Label="At Least" Min="4" Max="7"></MudNumericField>
<MudNumericField @bind-Value="_parameters.EffortUpperBound"
Label="Up to" Min="7" Max="12"></MudNumericField>
</MudStack>
</MudItem>
<MudItem>
<MudInputLabel>Assignment Requirements</MudInputLabel>
<MudTable T="AssignmentRequirement" ServerData="ReloadAssignmentRequirements" @ref="_assignmentRequirementData">
<RowTemplate Context="item">
<MudTd Class="align-center">
<MudIconButton Icon="@Icons.Material.Filled.RemoveCircle" Size="Size.Small"
OnClick="() => RemoveRequireEvent(item)"></MudIconButton>
</MudTd>
<MudTd Class="align-center">
@item.Student.FirstName
@item.EventDefinition.ShortName
@if (item.Requirement == Requirement.Include)
{
<MudIcon Class="ml-3" Icon="@Icons.Material.Filled.ThumbUp" Size="Size.Small"></MudIcon>
}
@if (item.Requirement == Requirement.Exclude)
{
<MudIcon Class="ml-3" Icon="@Icons.Material.Filled.ThumbDownAlt" Size="Size.Small"></MudIcon>
}
</MudTd>
</RowTemplate>
</MudTable>
</MudItem>
<MudItem>
<MudInputLabel>Two Team Events</MudInputLabel>
<MudTable T="EventDefinition" ServerData="ReloadEventTwoTeam" @ref="_eventTwoTeamData">
<RowTemplate Context="item">
<MudTd Class="align-center">
<MudIconButton Icon="@Icons.Material.Filled.RemoveCircle" Size="Size.Small"
OnClick="() => RemoveTwoTeam(item)"></MudIconButton>
</MudTd>
<MudTd Class="align-center">@item.ShortName</MudTd>
</RowTemplate>
</MudTable>
</MudItem>
<MudItem>
<MudInputLabel>Omitted Events</MudInputLabel>
<MudTable T="EventDefinition" ServerData="ReloadOmittedEvents" @ref="_eventOmittedData">
<RowTemplate Context="item">
<MudTd Class="align-center">
<MudIconButton Icon="@Icons.Material.Filled.RemoveCircle" Size="Size.Small"
OnClick="() => RemoveOmitted(item)"></MudIconButton>
</MudTd>
<MudTd Class="align-center">@item.ShortName</MudTd>
</RowTemplate>
</MudTable>
</MudItem> *@
<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>
@@ -188,17 +68,16 @@
private TeamSchedulerSolution _solution;
private TeamSchedulerOptions _parameters;
bool _isSolving = false;
private HashSet<Team> _requiredTeams = [];
public class TeamOptions
private void RequireRegionals()
{
public Team Team { get; set; }
public bool Require { get; set; } = false;
public bool Omit { get; set; } = false;
public bool Extend { get; set; } = false;
foreach (var team in _teams.Where(e => e.Event.RegionalEvent))
{
_requiredTeams.Add(team);
}
}
private TeamOptions[]? _options;
protected override async Task OnInitializedAsync()
{
_parameters =
@@ -246,11 +125,6 @@
.Include(e => e.EventRankings)
.ThenInclude(e => e.EventDefinition)
.OrderBy(e => e.FirstName).ToArrayAsync();
_options = _teams
.Select(e => new TeamOptions { Team = e })
.ToArray();
}
private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
@@ -259,12 +133,9 @@
var mustIncludeTeams = _teams;
mustIncludeTeams = mustIncludeTeams.Where(t => t.Event.EventFormat != EventFormat.Individual).ToArray();
mustIncludeTeams = mustIncludeTeams.Where(t => !t.ToString().Contains("#1")).ToArray();
//mustIncludeTeams = mustIncludeTeams.Where(t => !t.ToString().Contains("Photo")).ToArray();
var requiredTeams = _teams;
var teamScheduler = new TeamScheduler(mustIncludeTeams, 3);
var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots);
// teamScheduler
// .ScheduleSeparate(