Scheduler improvements

WebApp/Components/Pages/MeetingSchedulePages/Scheduler.razor

@@ -1,5 +1,6 @@
 @using Core.Calculation
 @using Microsoft.EntityFrameworkCore
+@using NuGet.Packaging
 @page "/meeting-schedule/scheduler"
 @inject IConfiguration Configuration
 @inject AppDbContext Context
@@ -10,21 +11,34 @@
 
 
 <MudPaper Class="pa-4 mt-5">
+    <MudText>Include: @string.Join(", ", _requiredTeams) </MudText>
     <MudGrid>
-        <MudItem Style="width:160px;">
+        <MudItem Style="width:250px;">
             <MudNumericField @bind-Value="_parameters.TimeSlots"
                              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>
-        <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>
-
+        @* <TeamSelector Teams="@_teams" SelectedTeams="@_requiredTeams" Label="Required"></TeamSelector> *@
 
         <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>
 
@@ -32,7 +46,8 @@
                 <RowTemplate>
                     <MudTd>
                         @{
-                    var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);}
+                            var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);
+                        }
                         @foreach (var t in context)
                         {
                             <MudItem>
@@ -48,7 +63,8 @@
                 } *@
 
                         @{ var notInTimeSLot = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
-                @if (notInTimeSLot.Any()) {
+                        @if (notInTimeSLot.Any())
+                        {
                             <MudItem>
                                 <i>
                                     Not scheduled: @string.Join(", ", notInTimeSLot.Select(s => s.FirstName))
@@ -60,6 +76,12 @@
                 </RowTemplate>
             </MudTable>
         </MudItem>
+    </MudGrid>
+
+
+</MudPaper>
+
+
 
 @code {
     private Team[]? _teams;
@@ -68,14 +90,24 @@
     private TeamSchedulerSolution _solution;
     private TeamSchedulerOptions _parameters;
     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.Add(team);
+        _requiredTeams = obj.ToList();
     }
+
+    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()
@@ -129,10 +161,6 @@
 
     private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
     {
-        //_isSolving = true;
-
-       
-
         var requiredTeams = _teams;
 
         var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots);
@@ -155,4 +183,5 @@
     {
         _solutionData.ReloadServerData();
     }
+
 }