From cc09d32bcf44157c16f2cc219aaa472f30820bb8 Mon Sep 17 00:00:00 2001
From: Alex Mickelson <alexmickelson96@gmail.com>
Date: Wed, 26 Jul 2023 13:39:49 -0600
Subject: [PATCH] maybe got default time selector less insane

---
 .../Shared/Components/TimePicker.razor        |  70 ++++---
 .../Shared/Course/CourseSettings.razor        |  12 ++
 .../Module/Assignment/AssignmentDetails.razor | 174 ++++++++++--------
 .../Shared/Semester/AssignmentInDay.razor     | 108 ++++++-----
 .../Features/Configuration/CoursePlanner.cs   |  25 ++-
 5 files changed, 226 insertions(+), 163 deletions(-)

diff --git a/Management.Web/Shared/Components/TimePicker.razor b/Management.Web/Shared/Components/TimePicker.razor
index ebf2250..e74fa62 100644
--- a/Management.Web/Shared/Components/TimePicker.razor
+++ b/Management.Web/Shared/Components/TimePicker.razor
@@ -1,4 +1,6 @@
 
+@inject CoursePlanner planner
+
 @code {
   [Parameter]
   [EditorRequired]
@@ -7,47 +9,51 @@
   [Parameter]
   [EditorRequired]
   public Action<SimpleTimeOnly> UpdateTime { get; set; }= default!;
+  protected override void OnInitialized()
+  {
+    planner.StateHasChanged += reload;
+  }
+  private void reload()
+  {
+    this.InvokeAsync(this.StateHasChanged);
+  }
+  public void Dispose()
+  {
+    planner.StateHasChanged -= reload;
+  }
 
   private string AmPm
   {
     get => Time.Hour < 12 ? "AM" : "PM";
   }
+
   private int AdjustedHour
   {
-    get => convert24to12Hour(Time.Hour);
-  }
-  private int convert24to12Hour(int hour)
-  {
-    if (hour == 0)
+    get 
     {
       // 12 AM
-      return 12;
-    }
-    else if (hour <= 12)
-    {
+      @* if (Time.Hour == 0)
+        return 12; *@
       // AM hours
-      return hour;
-    }
-    else
-    {
+      if (Time.Hour <= 11)
+        return Time.Hour;
       // PM hours
-      return hour - 12;
+      return Time.Hour + 1 - 12;
     }
   }
-  private int convert12To24Hour(int hour, string? amPm)
+
+  private int convertTo24Hour(int hour, string? amPm)
   {
-    if (amPm == null) return -1;
-    if (amPm.ToUpper() == "PM" && hour < 12)
+    if(amPm == "AM")
     {
-      return hour + 12;
+      return hour % 12;
     }
-    else if (amPm.ToUpper() == "AM" && hour == 12)
+    else 
     {
-      return 0;
-    }
-    else
-    {
-      return hour;
+      if (hour == 12)
+        return 12;
+      else 
+        return hour + 12;
     }
   }
 }
@@ -57,16 +63,22 @@
     UpdateTime(
       new SimpleTimeOnly
       {
-        Hour=convert24to12Hour(Convert.ToInt32(e.Value)),
+        Hour=convertTo24Hour(Convert.ToInt32(e.Value), AmPm),
         Minute=Time.Minute
       }
     )" 
   class="form-control w-auto d-inline"
 >
-  @foreach (var hour in Enumerable.Range(1, 12))
+  <option 
+    value="12" 
+    selected="@(12 == Time.Hour)"
+  >
+    12
+  </option>
+  @foreach (var hour in Enumerable.Range(1, 11))
   {
     <option 
-      value="@hour" 
+      value="@hour"
       selected="@(hour == Time.Hour)"
     >
       @hour.ToString("00")
@@ -79,7 +91,7 @@
     UpdateTime(
       new SimpleTimeOnly
       {
-        Hour=AdjustedHour,
+        Hour=Time.Hour,
         Minute=Convert.ToInt32(e.Value)
       }
     )"
@@ -101,7 +113,7 @@
     UpdateTime(
       new SimpleTimeOnly
       {
-        Hour=convert12To24Hour(Time.Hour, e.Value?.ToString()),
+        Hour=convertTo24Hour(Time.Hour, e.Value?.ToString()),
         Minute=Time.Minute
       }
     )"
diff --git a/Management.Web/Shared/Course/CourseSettings.razor b/Management.Web/Shared/Course/CourseSettings.razor
index 8288eb0..5786657 100644
--- a/Management.Web/Shared/Course/CourseSettings.razor
+++ b/Management.Web/Shared/Course/CourseSettings.razor
@@ -4,6 +4,18 @@
 
 @code
 {
+  protected override void OnInitialized()
+  {
+    planner.StateHasChanged += reload;
+  }
+  private void reload()
+  {
+    this.InvokeAsync(this.StateHasChanged);
+  }
+  public void Dispose()
+  {
+    planner.StateHasChanged -= reload;
+  }
   private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
   private ulong? _selectedTermId {get; set;}
   private ulong? selectedTermId { 
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
index 125b34f..7a82c86 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
+++ b/Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
@@ -26,62 +26,71 @@
   }
   private Modal? assignmentEditorModal {get; set;}
 
+    private void dropOnDate(DateTime dropDate)
+  {
+    if (planner.LocalCourse == null) return;
+    var currentModule = planner
+      .LocalCourse
+      .Modules
+      .First(m => 
+        m.Assignments
+          .Select(a => a.id)
+          .Contains(Assignment.id)
+      ) ?? throw new Exception("in day callback, could not find module");
+    var moduleWithUpdatedAssignment = currentModule with 
+    {
+      Assignments = currentModule.Assignments.Select(a => 
+        a.id != Assignment.id
+        ? a
+        : a with 
+        {
+          due_at=dropDate
+        }
+      )
+    };
+    var updatedModules = planner.LocalCourse.Modules
+      .Select(m => 
+        m.Name == moduleWithUpdatedAssignment.Name 
+          ? moduleWithUpdatedAssignment 
+          : m
+      );
+    var newCourse = planner.LocalCourse with 
+    {
+      Modules = updatedModules
+    };
+    planner.LocalCourse = newCourse;
+  }
+  private void dropOnModule(LocalModule module)
+  {
+    if (planner.LocalCourse == null) return;
+    var newModules = planner.LocalCourse.Modules.Select(m => 
+      m.Name != module.Name
+        ? m with 
+        {
+          Assignments = m.Assignments.Where(a => a.id != Assignment.id).DistinctBy(a => a.id)
+        }
+        : m with 
+        {
+          Assignments = m.Assignments.Append(Assignment).DistinctBy(a => a.id)
+        }
+    );
+
+    var newCourse = planner.LocalCourse with 
+    {
+      Modules = newModules
+    };
+    planner.LocalCourse = newCourse;
+  }
+
   private void DropCallback (DateTime? dropDate, LocalModule? module) 
   {
-    @* only supports changing date or module, not both *@
-    if (planner.LocalCourse == null) return;
     if (module == null)
     {
-      var currentModule = planner
-        .LocalCourse
-        .Modules
-        .First(m => 
-          m.Assignments
-            .Select(a => a.id)
-            .Contains(Assignment.id)
-        ) ?? throw new Exception("in day callback, could not find module");
-      var moduleWithUpdatedAssignment = currentModule with 
-      {
-        Assignments = currentModule.Assignments.Select(a => 
-          a.id != Assignment.id
-          ? a
-          : a with 
-          {
-            due_at=dropDate ?? Assignment.due_at
-          }
-        )
-      };
-      var updatedModules = planner.LocalCourse.Modules
-        .Select(m => 
-          m.Name == moduleWithUpdatedAssignment.Name 
-            ? moduleWithUpdatedAssignment 
-            : m
-        );
-      var newCourse = planner.LocalCourse with 
-      {
-        Modules = updatedModules
-      };
-      planner.LocalCourse = newCourse;
+      dropOnDate(dropDate ?? Assignment.due_at);
     } 
     else
     {
-      var newModules = planner.LocalCourse.Modules.Select(m => 
-        m.Name != module.Name
-          ? m with 
-          {
-            Assignments = m.Assignments.Where(a => a.id != Assignment.id).DistinctBy(a => a.id)
-          }
-          : m with 
-          {
-            Assignments = m.Assignments.Append(Assignment).DistinctBy(a => a.id)
-          }
-      );
-
-      var newCourse = planner.LocalCourse with 
-      {
-        Modules = newModules
-      };
-      planner.LocalCourse = newCourse;
+      dropOnModule(module);
     }
   }
   private void HandleDragStart()
@@ -106,41 +115,44 @@
 >
   <div class="card">
     <div class="card-body">
-      <div class="card-title">@Assignment.name</div>
+      <div class="card-title">
+        <h4 class="text-center">
+          @Assignment.name
+        </h4>
+      </div>
       <div class="card-text">
-        @Assignment.description
-        <div>Due At: @Assignment.due_at</div>
-        <div>Lock At: @Assignment.lock_at</div>
-        <div>Points: @Assignment.points_possible</div>
-        @if(Assignment.canvasId != null)
-        {
-          <div>Synced with canvas</div>
-        }
-        else
-        {
-          <div>Not synced with canvas</div>
-        }
-        <div class="ms-3">
-
-          <div class="row  p-1">
-            <div class="col border-end my-auto text-end">
-              Label
-            </div>
-            <div class="col my-auto">
-              Points
-            </div>
+        <div class="row">
+          <div class="col">
+            @Assignment.description
+            
           </div>
-          @foreach(var rubricItem in Assignment.rubric)
-          {
-            <div class="row  p-1">
-              <div class="col border-end my-auto text-end">
-                @rubricItem.Label
-              </div>
-              <div class="col my-auto">
-                @rubricItem.Points
-              </div>
+          <div class="col-auto">
+            <div>Points: @Assignment.points_possible</div>
+            <div>Due At: @Assignment.due_at</div>
+            <div>Lock At: @Assignment.lock_at</div>
+            @if(Assignment.canvasId != null)
+            {
+              <div>Synced with canvas</div>
+            }
+            else
+            {
+              <div>Not synced with canvas</div>
+            }
+            <div>
+              Rubric:
             </div>
-          }
+            @foreach(var rubricItem in Assignment.rubric)
+            {
+              <div class="row  p-1">
+                <div class="col border-end my-auto text-end">
+                  @rubricItem.Label
+                </div>
+                <div class="col-2 my-auto">
+                  @rubricItem.Points
+                </div>
+              </div>
+            }
+          </div>
         </div>
       </div>
 
diff --git a/Management.Web/Shared/Semester/AssignmentInDay.razor b/Management.Web/Shared/Semester/AssignmentInDay.razor
index 3b87986..bc3e0c0 100644
--- a/Management.Web/Shared/Semester/AssignmentInDay.razor
+++ b/Management.Web/Shared/Semester/AssignmentInDay.razor
@@ -7,62 +7,72 @@
   [EditorRequired]
   public LocalAssignment Assignment { get; set; } = new();
 
+  private void dropOnDate(DateTime dropDate)
+  {
+
+    if (planner.LocalCourse == null) return;
+    var currentModule = planner
+      .LocalCourse
+      .Modules
+      .First(m => 
+        m.Assignments
+          .Select(a => a.id)
+          .Contains(Assignment.id)
+      ) ?? throw new Exception("in day callback, could not find module");
+    var moduleWithUpdatedAssignment = currentModule with 
+    {
+      Assignments = currentModule.Assignments.Select(a => 
+        a.id != Assignment.id
+        ? a
+        : a with 
+        {
+          due_at=dropDate
+        }
+      )
+    };
+    var updatedModules = planner.LocalCourse.Modules
+      .Select(m => 
+        m.Name == moduleWithUpdatedAssignment.Name 
+          ? moduleWithUpdatedAssignment 
+          : m
+      );
+    var newCourse = planner.LocalCourse with 
+    {
+      Modules = updatedModules
+    };
+    planner.LocalCourse = newCourse;
+  }
+  private void dropOnModule(LocalModule module)
+  {
+    if (planner.LocalCourse == null) return;
+    var newModules = planner.LocalCourse.Modules.Select(m => 
+      m.Name != module.Name
+        ? m with 
+        {
+          Assignments = m.Assignments.Where(a => a.id != Assignment.id)
+        }
+        : m with 
+        {
+          Assignments = m.Assignments.Append(Assignment)
+        }
+    );
+
+    var newCourse = planner.LocalCourse with 
+    {
+      Modules = newModules
+    };
+    planner.LocalCourse = newCourse;
+  }
+
   private void DropCallback (DateTime? dropDate, LocalModule? module) 
   {
-    @* only supports changing date or module, not both *@
-    if (planner.LocalCourse == null) return;
     if (module == null)
     {
-      var currentModule = planner
-        .LocalCourse
-        .Modules
-        .First(m => 
-          m.Assignments
-            .Select(a => a.id)
-            .Contains(Assignment.id)
-        ) ?? throw new Exception("in day callback, could not find module");
-      var moduleWithUpdatedAssignment = currentModule with 
-      {
-        Assignments = currentModule.Assignments.Select(a => 
-          a.id != Assignment.id
-          ? a
-          : a with 
-          {
-            due_at=dropDate ?? Assignment.due_at
-          }
-        )
-      };
-      var updatedModules = planner.LocalCourse.Modules
-        .Select(m => 
-          m.Name == moduleWithUpdatedAssignment.Name 
-            ? moduleWithUpdatedAssignment 
-            : m
-        );
-      var newCourse = planner.LocalCourse with 
-      {
-        Modules = updatedModules
-      };
-      planner.LocalCourse = newCourse;
+      dropOnDate(dropDate ?? Assignment.due_at);
     } 
     else
     {
-      var newModules = planner.LocalCourse.Modules.Select(m => 
-        m.Name != module.Name
-          ? m with 
-          {
-            Assignments = m.Assignments.Where(a => a.id != Assignment.id).DistinctBy(a => a.id)
-          }
-          : m with 
-          {
-            Assignments = m.Assignments.Append(Assignment).DistinctBy(a => a.id)
-          }
-      );
-
-      var newCourse = planner.LocalCourse with 
-      {
-        Modules = newModules
-      };
-      planner.LocalCourse = newCourse;
+      dropOnModule(module);
     }
   }
   private void HandleDragStart()
diff --git a/Management/Features/Configuration/CoursePlanner.cs b/Management/Features/Configuration/CoursePlanner.cs
index 0334d9c..432865c 100644
--- a/Management/Features/Configuration/CoursePlanner.cs
+++ b/Management/Features/Configuration/CoursePlanner.cs
@@ -18,14 +18,31 @@ public class CoursePlanner
     get => _localCourse;
     set
     {
-      // ignore initial load of course
-      if (_localCourse != null && value != null)
+      if (value == null)
       {
-        yamlManager.SaveCourse(value);
+        _localCourse = null;
+        StateHasChanged?.Invoke();
+        return;
       }
-      _localCourse = value;
+
+      var verifiedCourse = verifyCourse(value);
+      // ignore initial load of course
+      if (_localCourse != null)
+      {
+        yamlManager.SaveCourse(verifiedCourse);
+      }
+      _localCourse = verifiedCourse;
       StateHasChanged?.Invoke();
     }
   }
   public event Action? StateHasChanged;
+
+  private LocalCourse verifyCourse(LocalCourse incomingCourse)
+  {
+    var modulesWithUniqueAssignments = incomingCourse.Modules.Select(
+      module => module with { Assignments = module.Assignments.DistinctBy(a => a.id) }
+    );
+    
+    return incomingCourse with { Modules = modulesWithUniqueAssignments };
+  }
 }