Meeting schedule updates

including copy to clipboard

WebApp/ChapterSettings.cs

@@ -2,13 +2,22 @@
 
 namespace WebApp
 {
-    public class ChapterSettings
+    public class StateContainer
     {
-        public required string Name { get; set; }
+        private int[]? _scheduledTeams;
-        public required string ShortName { get; set; }
+
-        public required string RegionalId { get; set; }
+        public int[] UserId
-        public required string StateId { get; set; }
+        {
-        public required string NationalId { get; set; }
+            get => _scheduledTeams ?? [];
-        public required string CompetitionYear { get; set; }
+            set
+            {
+                _scheduledTeams = value;
+                NotifyStateChanged();
+            }
+        }
+
+        public event Action? OnChange;
+
+        private void NotifyStateChanged() => OnChange?.Invoke();
     }
 }

WebApp/ClipboardService.cs

@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using Microsoft.JSInterop;
+
+public sealed class ClipboardService
+{
+    private readonly IJSRuntime _jsRuntime;
+
+    public ClipboardService(IJSRuntime jsRuntime)
+    {
+        _jsRuntime = jsRuntime;
+    }
+
+    public ValueTask<string> ReadTextAsync()
+    {
+        return _jsRuntime.InvokeAsync<string>("navigator.clipboard.readText");
+    }
+
+    public ValueTask WriteTextAsync(string text)
+    {
+        return _jsRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);
+    }
+}

WebApp/Components/Pages/MeetingSchedulePages/Index.razor

@@ -1,8 +1,10 @@
-@using Core.Calculation
+@using System.Text
+@using Core.Calculation
 @using Microsoft.EntityFrameworkCore
 @page "/meeting-schedule"
 @inject IConfiguration Configuration
 @inject AppDbContext Context
+@inject ClipboardService ClipboardService
 
 <PageTitle>@Configuration["ChapterSettings:Shortname"] TSA Schedule @Configuration["ChapterSettings:CompetitionYear"]</PageTitle>
 
@@ -10,88 +12,127 @@
 
 
 <MudPaper Class="pa-4 mt-5">
-    @* <MudText>Include: @string.Join(", ", _requiredTeams) </MudText> *@
+    @* <MudText>Include: @string.Join(", ", _scheduledTeams) </MudText> *@
     <MudGrid>
+        <MudItem xs="6" lg="9">
+            <MudText Typo="Typo.h4">Time Slots</MudText>
+            <MudNumericField @bind-Value="_parameters.TimeSlots"
+                             Label="Time Slots" Min="1" Max="4"></MudNumericField>
+            <MudButton Class="ma-3" OnClick="Solve" Variant="Variant.Filled" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
+            <MudIconButton  OnClick="CopyToClipboard" Icon="@Icons.Material.Filled.ContentCopy">
+            </MudIconButton>
+                <MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
+                    <HeaderContent>
+
+                    </HeaderContent>
+                    <RowTemplate>
+                        <MudTd>
+
+                            @{
+                                var overlaps
+                                    = TeamSchedulerSolution.GetStudentTeamOverlaps(context).ToArray();
+                            }
+                            @foreach (var team in context.OrderBy(e => e.ToString()))
+                            {
+                                var removed = !_scheduledTeams.Contains(team);
+                                <MudItem>
+                                    <MudLink Typo="Typo.body1"
+                                         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 - 
+                                        @foreach (var student in team.Students)
+                                        {
+                                            var overlap = overlaps.Any(o => o.Item1.Equals(student));
+                                            var color = overlap ? Color.Warning : Color.Default;
+
+                                            <MudText
+                                                Typo="Typo.body2"
+                                                Class="d-inline-block ml-3"
+                                                Color="color">
+                                                &nbsp;@student.FirstName@(overlap ? "*" : "")
+                                            </MudText>
+                                        }
+                                    </MudLink>
+                                    
+
+                                </MudItem>
+                            }
+
+                            
+                           </MudTd>
+                        <MudTd>
+                        @{
+                            var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students);
+                        }
+                            @if (unscheduled.Any())
+                            {
+
+                                <MudItem>Unscheduled</MudItem>
+                                foreach (var student in unscheduled)
+                                {
+                                    <MudItem Class="">
+                                        <MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName </MudText>&nbsp;
+                                        @{
+                                            var pa = _possibleAdditions.ToArray();
+                                        }
+                                        @foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student))
+                                        {
+                                            var color = pa.Contains(unassignedTeam) ? Color.Error : Color.Default;
+                                            var added = _scheduledTeams.Contains(unassignedTeam);
+                                            <MudLink Typo="Typo.body2"
+                                                     Class="d-flex align-center ml-3"
+                                                     Color="@color"
+                                                     OnClick="@(() => ToggleRequiredTeam(unassignedTeam))">
+                                                <MudIcon Icon="@Icons.Material.Filled.Check"
+                                                         Size="Size.Small"
+                                                         Class="@(added ? "" : "d-none")"></MudIcon>
+                                                @unassignedTeam
+                                            </MudLink>
+                                        }
+                                    </MudItem>
+                                }
+                            }
+                        </MudTd>
+                    </RowTemplate>
+                </MudTable>
+        </MudItem>
         <MudItem xs="6" lg="3">
 
             <MudStack>
-                
+
                 <MudButton OnClick="() => AddHighLevelOfEffort()">Add High Effort</MudButton>
                 <MudButton OnClick="() => AddRegionals()">Add Regionals</MudButton>
 
                 <MudButton OnClick="() => RemoveIndividual()">Remove Individual</MudButton>
                 <MudButton OnClick="() => RemoveLowLevelOfEffort()">Remove Low Effort</MudButton>
                 <MudButton OnClick="() => Invert()">Invert</MudButton>
-                
+
                 <MudItem>@string.Join(", ", (_possibleAdditions ?? []).Select(e => e.ToString()))</MudItem>
 
                 <MudToggleGroup T="Team"
                                 SelectionMode="SelectionMode.MultiSelection"
-                                @bind-Values="_requiredTeams"
+                                @bind-Values="_scheduledTeams"
-                                Vertical="true" 
+                                Vertical="true"
                                 CheckMark>
                     @foreach (var team in _teams.OrderBy(e => e.Event.Name))
                     {
                         <MudToggleItem Value="@team" Style="font-size: .75rem;">
                             <MudTooltip Text="@string.Join(", ", team.Students.Select(s => s.FirstName))">
-                            <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>
-                            </div>
+                                </div>
                             </MudTooltip>
                         </MudToggleItem>
                     }
                 </MudToggleGroup>
             </MudStack>
         </MudItem>
-        <MudItem xs="6" lg="9">
-            <MudText Typo="Typo.h4">Time Slots</MudText>
-            <MudNumericField @bind-Value="_parameters.TimeSlots"
-                             Label="Time Slots" Min="1" Max="4"></MudNumericField>
-            <MudButton Class="ma-3" OnClick="Solve" Variant="Variant.Filled" Color="Color.Primary" Disabled="@_isSolving">Solve</MudButton>
-            <MudTable T="Team[]" ServerData="SolveSchedule" @ref="_solutionData">
-                <HeaderContent>
 
-                </HeaderContent>
-                <RowTemplate>
-                    <MudTd>
-                        
-                        @{
-                            var ol = TeamSchedulerSolution.GetStudentTeamOverlaps(context);
-                        }
-                        @foreach (var t in context)
-                        {
-                            <MudItem>
-                                @t.ToString() -
-                                @string.Join(", ", t.Students.Select(s => s.FirstName + (ol.Any(o => o.Item1.Equals(s)) ? "*" : "")))
-                            </MudItem>
-                        }
-                        @* @foreach (var overlap in ol)
-                {
-                    <MudItem>
-                        @string.Join(", ", overlap.Item1)
-                    </MudItem>
-                    </MudItem>
-                } *@
-
-                        @{ var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(context, _students); }
-                        @if (unscheduled.Any())
-                        {
-                            <MudItem>Unscheduled</MudItem>
-                            foreach (var student in unscheduled)
-                            {
-                                <MudItem>
-                                    <i>@student.FirstName</i>
-                                    @string.Join(", ", _solution.StudentUnassignedTeams(student).Select(e => e.ToString()))
-                                </MudItem>
-                            }
-                            
-                        }
-
-                    </MudTd>
-                </RowTemplate>
-            </MudTable>
-        </MudItem>
     </MudGrid>
 </MudPaper>
 
@@ -101,48 +142,51 @@
     MudTable<Team[]> _solutionData;
     private TeamSchedulerSolution _solution;
     private TeamSchedulerOptions _parameters;
-    bool _isSolving = false;
+    bool _isSolving;
-    private IEnumerable<Team> _requiredTeams = [];
+    private IEnumerable<Team> _scheduledTeams = [];
-
+    private IEnumerable<Team> _possibleAdditions = [];
-    private Team[]? _possibleAdditions;
-    //private Team[] _requiredTeams = [];
-
-    private async Task OnSelectedValuesChanged(IEnumerable<Team> obj)
-    {
-        await _solutionData.ReloadServerData();
-    }
 
     private async Task AddRegionals()
     {
-        _requiredTeams 
+        _scheduledTeams 
-            = _teams.Where(e => e.Event.RegionalEvent).Concat(_requiredTeams).Distinct();
+            = _teams.Where(e => e.Event.RegionalEvent).Concat(_scheduledTeams).Distinct();
     }
 
     private async Task AddHighLevelOfEffort()
     {
-        _requiredTeams 
+        _scheduledTeams 
-            = _teams.Where(e => e.Event.LevelOfEffort >= 3).Concat(_requiredTeams).Distinct();
+            = _teams.Where(e => e.Event.LevelOfEffort >= 3).Concat(_scheduledTeams).Distinct();
     }
 
     private async Task RemoveIndividual()
     {
-        _requiredTeams
+        _scheduledTeams
-            = _requiredTeams.Where(t => t.Event.EventFormat != EventFormat.Individual);
+            = _scheduledTeams.Where(t => t.Event.EventFormat != EventFormat.Individual);
     }
 
     private async Task RemoveLowLevelOfEffort()
     {
-        _requiredTeams
+        _scheduledTeams
-            = _requiredTeams.Where(t => t.Event.LevelOfEffort > 1);
+            = _scheduledTeams.Where(t => t.Event.LevelOfEffort > 1);
     }
 
     private async Task Invert()
     {
-        var rt = _requiredTeams.ToArray();
+        var rt = _scheduledTeams.ToArray();
-        _requiredTeams
+        _scheduledTeams
             = _teams.Where(t => !rt.Contains(t));
     }
 
+    private void ToggleRequiredTeam(Team unassignedTeam)
+    {
+        if (_scheduledTeams.Contains(unassignedTeam))
+            _scheduledTeams = _scheduledTeams.Where(t => t != unassignedTeam);
+        else
+        {
+            _scheduledTeams = _scheduledTeams.Concat(new[] { unassignedTeam });
+        }
+    }
+
     protected override async Task OnInitializedAsync()
     {
         _parameters =
@@ -194,7 +238,7 @@
     private async Task<TableData<Team[]>> SolveSchedule(TableState arg1, CancellationToken arg2)
     {
         _isSolving = true;
-        var teamScheduler = new TeamScheduler(_requiredTeams, _parameters.TimeSlots);
+        var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots);
 
         // teamScheduler
         //     .ScheduleSeparate(
@@ -210,12 +254,11 @@
         var anyNotMeetingAlready = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.AnyNotMeetingAlready);
 
         _possibleAdditions = loe;
-        if (_possibleAdditions.Length == 0)
+        if (!_possibleAdditions.Any())
             _possibleAdditions = biggest;
-        if (_possibleAdditions.Length == 0)
+        if (!_possibleAdditions.Any())
             _possibleAdditions = anyNotMeetingAlready;
-
+        if (!_possibleAdditions.Any())
-        if (_possibleAdditions.Length == 0)
             _possibleAdditions = individual;
 
         await InvokeAsync(StateHasChanged); // let the UI know that the solution has been found
@@ -228,4 +271,57 @@
     {
         _solutionData.ReloadServerData();
     }
+
+    async Task CopyToClipboard()
+    {
+        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 t = scheduledTeam.ToString();
+                var s =
+                    string.Join(", ",
+                        scheduledTeam.Students
+                            .OrderBy(e => e == scheduledTeam.Captain)
+                            .ThenBy(e => e.FirstName)
+                            .Select(e => e.FirstName + (overlaps.Contains(e) ? "*": "")));
+
+                if (scheduledTeam.Event.EventFormat is EventFormat.Individual)
+                    sb.Append(t);
+                else
+                    sb.Append($"{t} - {s}");
+                sb.Append(Environment.NewLine);
+            }
+            var unscheduled = TeamSchedulerSolution.GetStudentsNotInTimSlot(timeslot, _students);
+
+            if (unscheduled.Any())
+            {
+                sb.Append("--Unscheduled");
+                sb.Append(Environment.NewLine);
+                foreach (var student in unscheduled)
+                {
+                    var s = student.FirstName;
+                    var unassignedTeams = _solution.StudentUnassignedTeams(student);
+                    var t = string.Join(", ", unassignedTeams.Select(e => e.ToString()));
+
+                    sb.Append($"{s} - {t}");
+                    sb.Append(Environment.NewLine);
+                }
+            }
+
+            sb.Append(Environment.NewLine);
+        }
+
+        try
+        {
+            await ClipboardService.WriteTextAsync(sb.ToString());
+        }
+        catch
+        {
+            Console.WriteLine("Cannot write text to clipboard");
+        }
+    }
 }

WebApp/Program.cs

@@ -1,6 +1,7 @@
 using Data;
 using Microsoft.EntityFrameworkCore;
 using MudBlazor.Services;
+using WebApp;
 using WebApp.Components;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -19,6 +20,11 @@ builder.Services.AddQuickGridEntityFrameworkAdapter();
 
 builder.Services.AddDatabaseDeveloperPageExceptionFilter();
 
+builder.Services.AddScoped<ClipboardService>();
+
+builder.Services.AddScoped<StateContainer>(); // Server- side
+builder.Services.AddSingleton<StateContainer>();//Client-side 
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.