Add a TimeSlot object, refactor
This commit is contained in:
@@ -11,66 +11,67 @@
|
||||
<MudText Typo="Typo.h3">@Configuration["ChapterSettings:Shortname"] TSA Schedule @Configuration["ChapterSettings:CompetitionYear"]</MudText>
|
||||
|
||||
<MudPaper Class="pa-4 mt-5">
|
||||
@* <MudText>Include: @string.Join(", ", _scheduledTeams) </MudText> *@
|
||||
<MudGrid>
|
||||
<MudItem xs="7" sm="8" lg="9">
|
||||
<MudText Typo="Typo.h4">Time Slots</MudText>
|
||||
<MudGrid>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudNumericField @bind-Value="_parameters.TimeSlots"
|
||||
Label="Time Slots" Min="1" Max="4"></MudNumericField>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => AddRegionals()" FullWidth="true">Add Regionals</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => RemoveIndividual()" FullWidth="true">Remove Individual</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => RemoveLowLevelOfEffort()" FullWidth="true">Remove Low Effort</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => Invert()" FullWidth="true">Invert</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" Color="Color.Warning" OnClick="() => Reset()" FullWidth="true">Reset</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12">
|
||||
<MudButton Variant="Variant.Filled" Class="ma-3" OnClick="Solve" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
|
||||
<MudTooltip Text="Copy to Clipboard">
|
||||
<MudIconButton OnClick="CopyToClipboard" Icon="@Icons.Material.Filled.ContentCopy"></MudIconButton>
|
||||
</MudTooltip>
|
||||
</MudItem>
|
||||
<MudPaper Class="pa-2 ma-2" Elevation="3">
|
||||
<MudGrid>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudNumericField @bind-Value="_parameters.TimeSlots"
|
||||
Label="Time Slots" Min="1" Max="4">
|
||||
</MudNumericField>
|
||||
</MudItem>
|
||||
<MudFlexBreak/>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => AddRegionals()" FullWidth="true">Add Regionals</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => RemoveIndividual()" FullWidth="true">Remove Individual</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => RemoveLowLevelOfEffort()" FullWidth="true">Remove Low Effort</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" OnClick="() => Invert()" FullWidth="true">Invert</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="6" lg="4">
|
||||
<MudButton Variant="Variant.Outlined" Color="Color.Warning" OnClick="() => Reset()" FullWidth="true">Reset</MudButton>
|
||||
</MudItem>
|
||||
<MudItem xs="12">
|
||||
<MudButton Variant="Variant.Filled" Class="ma-3" OnClick="Solve" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
|
||||
<MudTooltip Text="Copy to Clipboard">
|
||||
<MudIconButton OnClick="CopyToClipboard" Icon="@Icons.Material.Filled.ContentCopy"></MudIconButton>
|
||||
</MudTooltip>
|
||||
</MudItem>
|
||||
|
||||
</MudGrid>
|
||||
<MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
|
||||
<HeaderContent>
|
||||
</HeaderContent>
|
||||
<RowTemplate>
|
||||
</MudGrid>
|
||||
</MudPaper>
|
||||
|
||||
<MudTable T="TeamScheduleTimeSlot" ServerData="SolveSchedule" @ref="_solutionData">
|
||||
<HeaderContent>
|
||||
</HeaderContent>
|
||||
<RowTemplate>
|
||||
<MudTd>
|
||||
@{
|
||||
var overlaps
|
||||
= TeamSchedulerSolution.GetStudentTeamOverlaps(context).ToArray();
|
||||
}
|
||||
<MudGrid Class="d-flex justify-start align-start">
|
||||
@foreach (var team in context.OrderBy(e => e.ToString()))
|
||||
@foreach (var team in context.Teams.OrderBy(e => e.ToString()))
|
||||
{
|
||||
var removed = !_scheduledTeams.Contains(team);
|
||||
<MudItem xs="12">
|
||||
<MudLink Typo="Typo.body1"
|
||||
Class="d-flex align-center"
|
||||
Class="d-flex align-center"
|
||||
Color="Color.Default"
|
||||
OnClick="@(() => ToggleRequiredTeam(team))">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Clear"
|
||||
Size="Size.Small"
|
||||
Class="@(removed ? "" : "d-none")"></MudIcon>
|
||||
@team -
|
||||
Class="@(removed ? "" : "d-none")">
|
||||
</MudIcon>
|
||||
@team -
|
||||
@foreach (var student in team.Students)
|
||||
{
|
||||
var overlap = overlaps.Any(o => o.Item1.Equals(student));
|
||||
var overlap = context.StudentHasOverlaps(student);
|
||||
var color = overlap ? Color.Warning : Color.Default;
|
||||
|
||||
<MudText
|
||||
@@ -84,17 +85,13 @@
|
||||
</MudItem>
|
||||
}
|
||||
</MudGrid>
|
||||
</MudTd>
|
||||
<MudTd>
|
||||
@{
|
||||
var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students);
|
||||
}
|
||||
@if (unscheduled.Any())
|
||||
{
|
||||
|
||||
<MudItem>Unscheduled</MudItem>
|
||||
<MudGrid>
|
||||
@foreach (var student in unscheduled)
|
||||
</MudTd>
|
||||
<MudTd>
|
||||
@if (context.UnscheduledStudents.Any())
|
||||
{
|
||||
<MudItem>Unscheduled</MudItem>
|
||||
<MudGrid>
|
||||
@foreach (var student in context.UnscheduledStudents)
|
||||
{
|
||||
<MudItem xs="12" sm="6" lg="3">
|
||||
<MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName </MudText>
|
||||
@@ -111,20 +108,22 @@
|
||||
OnClick="@(() => ToggleRequiredTeam(unassignedTeam))">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Check"
|
||||
Size="Size.Small"
|
||||
Class="@(added ? "" : "d-none")"></MudIcon>
|
||||
Class="@(added ? "" : "d-none")">
|
||||
</MudIcon>
|
||||
@unassignedTeam
|
||||
</MudLink>
|
||||
}
|
||||
</MudItem>
|
||||
}
|
||||
</MudGrid>
|
||||
}
|
||||
</MudTd>
|
||||
</RowTemplate>
|
||||
</MudTable>
|
||||
}
|
||||
</MudTd>
|
||||
</RowTemplate>
|
||||
</MudTable>
|
||||
</MudItem>
|
||||
<MudItem xs="5" sm="4" lg="3">
|
||||
<MudStack>
|
||||
<MudText Typo="Typo.h4">Scheduled Teams</MudText>
|
||||
<MudItem>@string.Join(", ", (_possibleAdditions ?? []).Select(e => e.ToString()))</MudItem>
|
||||
<MudToggleGroup T="Team"
|
||||
SelectionMode="SelectionMode.MultiSelection"
|
||||
@@ -152,7 +151,7 @@
|
||||
@code {
|
||||
private Team[]? _teams;
|
||||
private Student[]? _students;
|
||||
MudTable<Team[]> _solutionData;
|
||||
MudTable<TeamScheduleTimeSlot> _solutionData;
|
||||
private TeamSchedulerSolution _solution;
|
||||
private TeamSchedulerOptions _parameters;
|
||||
bool _isSolving;
|
||||
@@ -161,13 +160,13 @@
|
||||
|
||||
private async Task AddRegionals()
|
||||
{
|
||||
_scheduledTeams
|
||||
_scheduledTeams
|
||||
= _teams.Where(e => e.Event.RegionalEvent).Concat(_scheduledTeams).Distinct();
|
||||
}
|
||||
|
||||
private async Task AddHighLevelOfEffort()
|
||||
{
|
||||
_scheduledTeams
|
||||
_scheduledTeams
|
||||
= _teams.Where(e => e.Event.LevelOfEffort >= 3).Concat(_scheduledTeams).Distinct();
|
||||
}
|
||||
|
||||
@@ -209,27 +208,27 @@
|
||||
{
|
||||
_parameters =
|
||||
new TeamSchedulerOptions(
|
||||
timeSlots: 2,
|
||||
2,
|
||||
mustIncludeEvents:
|
||||
[
|
||||
// "Medical Technology", "Electrical Applications" , "RegionalTeam",
|
||||
// ,"Dragster", "Flight"
|
||||
// "Medical Technology", "Electrical Applications" , "RegionalTeam",
|
||||
// ,"Dragster", "Flight"
|
||||
],
|
||||
extended:
|
||||
[
|
||||
// "Invention", "Construction Challenge", "Mechanical", "Mass", "Micro"
|
||||
//"STEM"
|
||||
//"Community", "Vlogging"// "Microcontroller"
|
||||
// "Invention", "Construction Challenge", "Mechanical", "Mass", "Micro"
|
||||
//"STEM"
|
||||
//"Community", "Vlogging"// "Microcontroller"
|
||||
],
|
||||
omittedEvents:
|
||||
[
|
||||
// "Vlogging", "Junior", "Community Service Video", "Digital Photography",
|
||||
// "STEM"
|
||||
// "Vlogging", "Junior", "Community Service Video", "Digital Photography",
|
||||
// "STEM"
|
||||
|
||||
//"Leadership",// "Electrical", //"Construction"
|
||||
// "Forensic",
|
||||
//"CAD"
|
||||
//"I&I Team 1", "I&I Team 2"//, "Website Design",
|
||||
//"Leadership",// "Electrical", //"Construction"
|
||||
// "Forensic",
|
||||
//"CAD"
|
||||
//"I&I Team 1", "I&I Team 2"//, "Website Design",
|
||||
],
|
||||
absentStudents:
|
||||
[
|
||||
@@ -237,14 +236,14 @@
|
||||
);
|
||||
|
||||
_teams
|
||||
= await Context.Teams
|
||||
.Include(e => e.Event)
|
||||
.Include(e => e.Students)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.ToArrayAsync();
|
||||
= await Context.Teams
|
||||
.Include(e => e.Event)
|
||||
.Include(e => e.Students)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.ToArrayAsync();
|
||||
|
||||
_students =
|
||||
_students =
|
||||
await Context.Students
|
||||
.Include(e => e.Teams)
|
||||
.ThenInclude(e => e.Captain)
|
||||
@@ -253,7 +252,7 @@
|
||||
.OrderBy(e => e.FirstName).ToArrayAsync();
|
||||
}
|
||||
|
||||
private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
|
||||
private async Task<TableData<TeamScheduleTimeSlot>> SolveSchedule(TableState arg1, CancellationToken arg2)
|
||||
{
|
||||
_isSolving = true;
|
||||
var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots);
|
||||
@@ -282,7 +281,7 @@
|
||||
await InvokeAsync(StateHasChanged); // let the UI know that the solution has been found
|
||||
|
||||
_isSolving = false;
|
||||
return new TableData<Team[]> { Items = _solution.TimeSlots};
|
||||
return new TableData<TeamScheduleTimeSlot> { Items = _solution.TimeSlots };
|
||||
}
|
||||
|
||||
private void Solve()
|
||||
@@ -295,9 +294,9 @@
|
||||
var sb = new StringBuilder();
|
||||
foreach (var timeslot in _solution.TimeSlots)
|
||||
{
|
||||
var overlaps
|
||||
= TeamSchedulerSolution.GetStudentTeamOverlaps(timeslot).Select(e => e.Item1).ToArray();
|
||||
foreach (var scheduledTeam in timeslot.OrderBy(e => e.ToString()))
|
||||
//var overlaps
|
||||
// = TeamSchedulerSolution.GetStudentTeamOverlaps(timeslot).Select(e => e.Item1).ToArray();
|
||||
foreach (var scheduledTeam in timeslot.Teams.OrderBy(e => e.ToString()))
|
||||
{
|
||||
var t = scheduledTeam.ToString();
|
||||
var s =
|
||||
@@ -305,7 +304,7 @@
|
||||
scheduledTeam.Students
|
||||
.OrderBy(e => e == scheduledTeam.Captain)
|
||||
.ThenBy(e => e.FirstName)
|
||||
.Select(e => e.FirstName + (overlaps.Contains(e) ? "*": "")));
|
||||
.Select(e => e.FirstName + (timeslot.StudentHasOverlaps(e) ? "*" : "")));
|
||||
|
||||
if (scheduledTeam.Event.EventFormat is EventFormat.Individual)
|
||||
sb.Append(t);
|
||||
@@ -313,13 +312,12 @@
|
||||
sb.Append($"{t} - {s}");
|
||||
sb.Append(Environment.NewLine);
|
||||
}
|
||||
var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(timeslot, _students);
|
||||
|
||||
if (unscheduled.Any())
|
||||
if (timeslot.UnscheduledStudents.Any())
|
||||
{
|
||||
sb.Append("--Unscheduled");
|
||||
sb.Append(Environment.NewLine);
|
||||
foreach (var student in unscheduled)
|
||||
foreach (var student in timeslot.UnscheduledStudents)
|
||||
{
|
||||
var s = student.FirstName;
|
||||
var unassignedTeams = _solution.StudentUnassignedTeams(student);
|
||||
@@ -342,4 +340,5 @@
|
||||
Console.WriteLine("Cannot write text to clipboard");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user