From b7fa7fcbe1fc37899262647da131997bd3aa4ffc Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Fri, 31 Oct 2025 13:29:43 -0400
Subject: [PATCH] Add recomendations for meeting scheduler

---
 Core/Calculation/TeamIdComparer.cs            |  16 +++
 Core/Calculation/TeamSchedulerSolution.cs     |   4 +-
 Core/Entities/Team.cs                         |  13 ++
 .../Pages/MeetingSchedulePages/Index.razor    | 121 +++++++++---------
 4 files changed, 93 insertions(+), 61 deletions(-)
 create mode 100644 Core/Calculation/TeamIdComparer.cs

diff --git a/Core/Calculation/TeamIdComparer.cs b/Core/Calculation/TeamIdComparer.cs
new file mode 100644
index 0000000..4a9fe3b
--- /dev/null
+++ b/Core/Calculation/TeamIdComparer.cs
@@ -0,0 +1,16 @@
+using Core.Entities;
+
+namespace Core.Calculation;
+
+public class TeamIdComparer : IEqualityComparer<Team>
+{
+    public bool Equals(Team? x, Team? y)
+    {
+        return x != null && y != null && x.Id == y.Id;
+    }
+
+    public int GetHashCode(Team obj)
+    {
+        return obj.Id.GetHashCode();
+    }
+}
\ No newline at end of file
diff --git a/Core/Calculation/TeamSchedulerSolution.cs b/Core/Calculation/TeamSchedulerSolution.cs
index f7a6d0b..5701fa4 100644
--- a/Core/Calculation/TeamSchedulerSolution.cs
+++ b/Core/Calculation/TeamSchedulerSolution.cs
@@ -11,7 +11,9 @@ public class TeamSchedulerSolution(
 
     public TeamScheduleTimeSlot[] TimeSlots { get; set; } 
         = timeSlots.Select( (teams,i) => 
-            new TeamScheduleTimeSlot{Name = i.ToString(), Teams = teams,
+            new TeamScheduleTimeSlot{
+                Name = "Time Slot " + (i + 1), 
+                Teams = teams,
                 StudentOverlaps = GetStudentTeamOverlaps(teams), 
                 UnscheduledStudents = GetStudentsNotInTimSlot(teams, students)
             }
diff --git a/Core/Entities/Team.cs b/Core/Entities/Team.cs
index 2424d19..f2d26e6 100644
--- a/Core/Entities/Team.cs
+++ b/Core/Entities/Team.cs
@@ -62,4 +62,17 @@ public class Team
 	{
 		return $"{Event.Name} {(Identifier != null ? $"({Identifier})" : "")}";
 	}
+
+    public string StudentsFirstNames
+    {
+        get
+        {
+            return
+                string.Join(", ", 
+                    Students.Select(e => 
+                        e.FirstName
+                        + (Captain != null && (Captain.Equals(e)) ? "(Cpt)" : ""))
+                    );
+        }
+    }
 }
\ No newline at end of file
diff --git a/WebApp/Components/Pages/MeetingSchedulePages/Index.razor b/WebApp/Components/Pages/MeetingSchedulePages/Index.razor
index 13a6351..67d7c5c 100644
--- a/WebApp/Components/Pages/MeetingSchedulePages/Index.razor
+++ b/WebApp/Components/Pages/MeetingSchedulePages/Index.razor
@@ -16,14 +16,16 @@
             <MudText Typo="Typo.h4">Time Slots</MudText>
             <MudPaper Class="pa-2 ma-2" Elevation="3">
                 <MudGrid>
-                    <MudItem xs="12" sm="6" lg="4">
+                    <MudItem xs="6" sm="3" lg="2">
                         <MudNumericField @bind-Value="_parameters.TimeSlots"
                                          Label="Time Slots" Min="1" Max="4">
                         </MudNumericField>
                     </MudItem>
                     <MudFlexBreak/>
                     <MudItem xs="12" sm="6" lg="4">
+                        <MudTooltip Text="Schedule teams with Level of Effort >= 3" Inline="false">
                         <MudButton Variant="Variant.Outlined" OnClick="() => AddHighLevelOfEffort()" FullWidth="true">Add High Effort</MudButton>
+                        </MudTooltip>
                     </MudItem>
                     <MudItem xs="12" sm="6" lg="4">
                         <MudButton Variant="Variant.Outlined" OnClick="() => AddRegionals()" FullWidth="true">Add Regionals</MudButton>
@@ -55,68 +57,74 @@
                 </HeaderContent>
                 <RowTemplate>
                     <MudTd>
-                        <MudGrid Class="d-flex justify-start align-start">
-                            @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"
-                                             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 = context.StudentHasOverlaps(student);
-                                            var color = overlap ? Color.Warning : Color.Default;
+                        <MudGrid Class="">
+                            <MudItem xs="12" lg="6">
+                                <MudStack>
+                                    <MudText Typo="Typo.h6">@context.Name</MudText>
+                                    @foreach (var team in context.Teams.OrderBy(e => e.ToString()))
+                                    {
+                                        var removed = !_scheduledTeams.Contains(team);
 
-                                            <MudText
-                                                Typo="Typo.body2"
-                                                Class="d-inline-block ml-3"
-                                                Color="color">
-                                                &nbsp;@student.FirstName@(overlap ? "*" : "")
-                                            </MudText>
-                                        }
-                                    </MudLink>
-                                </MudItem>
-                            }
-                        </MudGrid>
-                    </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>&nbsp;
-                                        @{
-                                            var pa = _possibleAdditions.ToArray();
-                                        }
+                                        <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 -
+                                            @{var first = true;}
+                                            @foreach (var student in team.Students)
+                                            {
+                                                var overlap = context.StudentHasOverlaps(student);
+                                                var color = overlap ? Color.Warning : Color.Default;
+
+                                                @if(!first) {<MudText>, </MudText>}
+                                                {first = false;}
+                                                <MudText
+                                                    Typo="Typo.body2"
+                                                    Color="color">
+                                                    &nbsp;@student.FirstName@(overlap ? "*" : "")
+                                                </MudText>
+                                            }
+                                        </MudLink>
+
+                                    }
+                                </MudStack>
+                            </MudItem>
+                            <MudItem xs="12" lg="6">
+                            @if (context.UnscheduledStudents.Any())
+                            {
+                                <MudText Typo="Typo.body1" HtmlTag="strong">Unscheduled</MudText>
+                                <MudStack>
+                                    @foreach (var student in context.UnscheduledStudents)
+                                    {
+                                        <MudItem>
+                                        <MudText Typo="Typo.body1" HtmlTag="i">@student.FirstName&nbsp;</MudText>
+                                        @{var first = true;}
                                         @foreach (var unassignedTeam in _solution.StudentUnassignedTeams(student))
                                         {
-                                            var color = pa.Contains(unassignedTeam) ? Color.Error : Color.Default;
+                                            var color = _possibleAdditions.Contains(unassignedTeam, new TeamIdComparer()) ? Color.Success : Color.Default;
                                             var added = _scheduledTeams.Contains(unassignedTeam);
+                                            @if(!first) {<span>, </span>}
+                                            {first = false;}
                                             <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
+                                                @unassignedTeam 
                                             </MudLink>
                                         }
-                                    </MudItem>
-                                }
-                            </MudGrid>
-                        }
+                                        </MudItem>
+                                    }
+                                 </MudStack>
+                            }
+                            </MudItem>
+                        </MudGrid>
                     </MudTd>
                 </RowTemplate>
             </MudTable>
@@ -124,7 +132,6 @@
         <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"
                                 @bind-Values="_scheduledTeams"
@@ -133,7 +140,7 @@
                     @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))">
+                            <MudTooltip Text="@team.StudentsFirstNames">
                                 <div class="d-flex align-center justify-space-between flex-wrap">
                                     <MudText Class="ellipsis">@team.ToString()</MudText>
                                     <EventAttributes EventDefinition="@team.Event"></EventAttributes>
@@ -150,7 +157,7 @@
 
 @code {
     private Team[]? _teams;
-    private Student[]? _students;
+    private Student[]? _students; // TODO: Add absent student functionality
     MudTable<TeamScheduleTimeSlot> _solutionData;
     private TeamSchedulerSolution _solution;
     private TeamSchedulerOptions _parameters;
@@ -255,14 +262,8 @@
     private async Task<TableData<TeamScheduleTimeSlot>> SolveSchedule(TableState arg1, CancellationToken arg2)
     {
         _isSolving = true;
+
         var teamScheduler = new TeamScheduler(_scheduledTeams, _parameters.TimeSlots);
-
-        // teamScheduler
-        //     .ScheduleSeparate(
-        //         _teams.First(e => e.Event.Name.Contains("Data Science")),
-        //         _teams.First(e => e.Event.Name.Contains("Microcontroller Design"))
-        //         );
-
         _solution = teamScheduler.Solve();
 
         var loe = new UnassignedStudentScheduler(_teams, _solution.TimeSlots).ScheduleStrategy(UnassignedScheduleStrategy.LevelOfEffort);