better class day highlighting

Management.Test/Features/ConfigurationTests.cs

@@ -5,7 +5,6 @@ public class ConfigurationTests
   [Test]
   public void TestCanCreateConfigFromTermAndDays()
   {
-
     DateTime startAt = new DateTime(2022, 1, 1);
     DateTime endAt = new DateTime(2022, 1, 2);
     var canvasTerm = new EnrollmentTermModel(
@@ -15,10 +14,13 @@ public class ConfigurationTests
       EndAt: endAt
     );
     var daysOfWeek = new DayOfWeek[] { DayOfWeek.Monday };
+    var management = new ConfigurationManagement();
+    management.SetConfiguration(canvasTerm, daysOfWeek);
+    var config = management.Configuration;
 
-    var config = ConfigurationManagement.CreateFromTerm(canvasTerm, daysOfWeek);
+    if(config == null) Assert.Fail();
-    config.StartDate.Should().Be(startAt);
+    config!.StartDate.Should().Be(startAt);
-    config.EndDate.Should().Be(endAt);
+    config!.EndDate.Should().Be(endAt);
-    config.Days.Should().BeEquivalentTo(daysOfWeek);
+    config!.Days.Should().BeEquivalentTo(daysOfWeek);
   }
 }

Management.Web/Data/WeatherForecast.cs

@@ -1,12 +0,0 @@
-namespace Management.Web.Data;
-
-public class WeatherForecast
-{
-    public DateOnly Date { get; set; }
-
-    public int TemperatureC { get; set; }
-
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-    public string? Summary { get; set; }
-}

Management.Web/Data/WeatherForecastService.cs

@@ -1,19 +0,0 @@
-namespace Management.Web.Data;
-
-public class WeatherForecastService
-{
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    public Task<WeatherForecast[]> GetForecastAsync(DateOnly startDate)
-    {
-        return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = startDate.AddDays(index),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        }).ToArray());
-    }
-}

Management.Web/Pages/Calendar.razor

@@ -1,15 +1,17 @@
+@page "/calendar"
 @using CanvasModel.EnrollmentTerms
+@using Management.Web.Shared.Semester
 
+@inject IConfigurationManagement configurationManagement
 
 @code
 {
-  [Parameter, EditorRequired]
-  public SemesterConfiguration Configuration { get; set; } = default!;
 
   private SemesterPlanner? semester { get; set; }
   protected override void OnParametersSet()
   {
-    semester = new SemesterPlanner(Configuration);
+    if (configurationManagement.Configuration != null)
+      semester = new SemesterPlanner(configurationManagement.Configuration);
   }
 
 }

Management.Web/Pages/Index.razor

@@ -1,25 +1,57 @@
 @page "/"
 @using CanvasModel.EnrollmentTerms
 @using Management.Web.Shared.Semester
+@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
+
 @inject ICanvasService canvasService
+@inject IConfigurationManagement configurationManagement
+@inject ProtectedSessionStorage ProtectedSessionStore
 
 @code
 {
   private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
-  private ulong? selectedTermId { get; set; } = null;
+  private ulong? selectedTermId { get; set; }
   private EnrollmentTermModel? selectedTerm
   {
     get => terms?.FirstOrDefault(t => t.Id == selectedTermId);
   }
   private List<DayOfWeek> days { get; set; } = new();
   private bool saved { get; set; } = false;
-  private SemesterConfiguration? configuration { get; set; }
 
   protected override async Task OnInitializedAsync()
   {
     terms = await canvasService.GetCurrentTermsFor();
+    readTermFromConfig();
+    readDaysFromConfig();
   }
 
+  private void readTermFromConfig()
+  {
+    if (terms == null || configurationManagement.Configuration == null) return;
+    foreach (var term in terms)
+    {
+      var termInConfiguration = configurationManagement.Configuration.StartDate == term.StartAt;
+      if (termInConfiguration)
+      {
+        selectedTermId = term.Id;
+      }
+    }
+  }
+
+  private void readDaysFromConfig()
+  {
+    if (terms == null || configurationManagement.Configuration == null) return;
+
+    days = configurationManagement.Configuration.Days.ToList();
+  }
+
+
+  public async void HandleSave()
+  {
+    saved = true;
+    configurationManagement.SetConfiguration(selectedTerm, days.ToArray());
+    await ProtectedSessionStore.SetAsync("configuration", configurationManagement.Configuration);
+  }
 }
 <PageTitle>Index</PageTitle>
 
@@ -60,22 +92,18 @@
           @day
         </button>
       </div>
-
     }
   </div>
   <div class="row justify-content-center">
     <div class="col-auto">
-      <button @onclick="() => {
+      <button @onclick="@HandleSave" class="btn btn-primary">
-          saved = true;
-          configuration = ConfigurationManagement.CreateFromTerm(selectedTerm, days.ToArray());
-        }" class="btn btn-primary" disabled="@saved">
         Save
       </button>
     </div>
   </div>
 }
 
-@if (configuration is not null)
+@if (configurationManagement.Configuration is not null)
 {
-  <SemesterDetail Configuration="configuration" />
+  <div>Config complete</div>
 }

Management.Web/Pages/Modules.razor

@@ -0,0 +1,3 @@
+@page "/modules"
+
+<PageTitle>Weather forecast</PageTitle>

Management.Web/Pages/Testing.razor

@@ -1,47 +0,0 @@
-@page "/testing"
-@using Management.Web.Data
-@inject WeatherForecastService ForecastService
-
-<PageTitle>Weather forecast</PageTitle>
-
-<h1>Weather forecast</h1>
-
-<p>This component demonstrates fetching data from a service.</p>
-
-@if (forecasts == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Temp. (C)</th>
-                <th>Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-@code {
-    private WeatherForecast[]? forecasts;
-
-    protected override async Task OnInitializedAsync()
-    {
-        forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));
-    }
-}

Management.Web/Program.cs

@@ -3,7 +3,6 @@ global using System.Text.Json;
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-using Management.Web.Data;
 using dotenv.net;
 
 DotEnv.Load();
@@ -13,9 +12,9 @@ var builder = WebApplication.CreateBuilder(args);
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
-builder.Services.AddSingleton<WeatherForecastService>();
 builder.Services.AddSingleton<IWebRequestor, WebRequestor>();
 builder.Services.AddSingleton<ICanvasService, CanvasService>();
+builder.Services.AddSingleton<IConfigurationManagement, ConfigurationManagement>();
 
 var app = builder.Build();
 

Management.Web/Shared/NavMenu.razor

@@ -15,13 +15,13 @@
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
+            <NavLink class="nav-link" href="/modules">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
+                <span class="oi oi-list-rich" aria-hidden="true"></span> Module Management
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="/testing">
+            <NavLink class="nav-link" href="/calendar">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Testing Page
+                <span class="oi oi-plus" aria-hidden="true"></span> Calendar
             </NavLink>
         </div>
     </nav>

Management.Web/Shared/Semester/MonthDetail.razor

@@ -33,7 +33,8 @@
       if (weekDay != null)
       {
         DayOfWeek notNullDay = weekDay ?? default;
-        var totalClasses = Semester.Days.Contains(notNullDay) ? $"bg-light {baseClasses}" : baseClasses;
+        var dayInSemester = Semester.Days.Contains(notNullDay) && day < Semester.LastDay && day > Semester.FirstDay;
+        var totalClasses = dayInSemester ? $"bg-light {baseClasses}" : baseClasses;
         <div class="@totalClasses">@day?.Day</div>
       }
       else

Management/Features/Calendar/SemesterPlanner.cs

@@ -2,23 +2,26 @@ using CanvasModel.EnrollmentTerms;
 
 public class SemesterPlanner
 {
+  public DateTime FirstDay { get; }
+  public DateTime LastDay { get; }
+
   public IEnumerable<CalendarMonth> Months { get; }
   public IEnumerable<DayOfWeek> Days { get; }
   public SemesterPlanner(SemesterConfiguration configuration)
   {
-    var start = configuration.StartDate;
+    FirstDay = configuration.StartDate;
-    var end = configuration.EndDate;
+    LastDay = configuration.EndDate;
 
     var monthsInTerm =
-      1 + ((end.Year - start.Year) * 12)
+      1 + ((LastDay.Year - FirstDay.Year) * 12)
-        + end.Month - start.Month;
+        + LastDay.Month - FirstDay.Month;
 
     Months = Enumerable
       .Range(0, monthsInTerm)
       .Select(monthDiff =>
       {
-        var month = ((start.Month + monthDiff - 1) % 12) + 1;
+        var month = ((FirstDay.Month + monthDiff - 1) % 12) + 1;
-        var year = start.Year + ((start.Month + monthDiff - 1) / 12);
+        var year = FirstDay.Year + ((FirstDay.Month + monthDiff - 1) / 12);
         return new CalendarMonth(year, month);
       });
     Days = configuration.Days;

Management/Features/Configuration/ConfigrationManagement.cs

@@ -1,8 +1,8 @@
 using CanvasModel.EnrollmentTerms;
 
-public class ConfigurationManagement
+public class ConfigurationManagement : IConfigurationManagement
 {
-  public static SemesterConfiguration CreateFromTerm(
+  public void SetConfiguration(
     EnrollmentTermModel canvasTerm,
     DayOfWeek[] daysOfWeek
   )
@@ -10,10 +10,15 @@ public class ConfigurationManagement
     var start = canvasTerm.StartAt ?? throw new Exception($"Canvas Term must have a start date. Term: {canvasTerm.Name}");
     var end = canvasTerm.EndAt ?? throw new Exception($"Canvas Term must have a end date. Term: {canvasTerm.Name}");
 
-    return new SemesterConfiguration(
+    Configuration = new SemesterConfiguration(
       StartDate: start,
       EndDate: end,
       Days: daysOfWeek
     );
   }
+
+  public SemesterConfiguration? Configuration { get; private set; } = null;
+
+
+
 }

Management/Features/Configuration/IConfigurationManagement.cs

@@ -0,0 +1,8 @@
+using CanvasModel.EnrollmentTerms;
+
+public interface IConfigurationManagement
+{
+  SemesterConfiguration? Configuration { get; }
+
+  void SetConfiguration(EnrollmentTermModel canvasTerm, DayOfWeek[] daysOfWeek);
+}