maybe got default time selector less insane

This commit is contained in:
2023-07-26 13:39:49 -06:00
parent 900cf9b074
commit cc09d32bcf
5 changed files with 226 additions and 163 deletions

View File

@@ -1,4 +1,6 @@
@inject CoursePlanner planner
@code { @code {
[Parameter] [Parameter]
[EditorRequired] [EditorRequired]
@@ -7,47 +9,51 @@
[Parameter] [Parameter]
[EditorRequired] [EditorRequired]
public Action<SimpleTimeOnly> UpdateTime { get; set; }= default!; 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 private string AmPm
{ {
get => Time.Hour < 12 ? "AM" : "PM"; get => Time.Hour < 12 ? "AM" : "PM";
} }
private int AdjustedHour private int AdjustedHour
{ {
get => convert24to12Hour(Time.Hour); get
}
private int convert24to12Hour(int hour)
{
if (hour == 0)
{ {
// 12 AM // 12 AM
return 12; @* if (Time.Hour == 0)
} return 12; *@
else if (hour <= 12)
{
// AM hours // AM hours
return hour; if (Time.Hour <= 11)
} return Time.Hour;
else
{
// PM hours // 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 == "AM")
if (amPm.ToUpper() == "PM" && hour < 12)
{ {
return hour + 12; return hour % 12;
}
else if (amPm.ToUpper() == "AM" && hour == 12)
{
return 0;
} }
else else
{ {
return hour; if (hour == 12)
return 12;
else
return hour + 12;
} }
} }
} }
@@ -57,13 +63,19 @@
UpdateTime( UpdateTime(
new SimpleTimeOnly new SimpleTimeOnly
{ {
Hour=convert24to12Hour(Convert.ToInt32(e.Value)), Hour=convertTo24Hour(Convert.ToInt32(e.Value), AmPm),
Minute=Time.Minute Minute=Time.Minute
} }
)" )"
class="form-control w-auto d-inline" 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 <option
value="@hour" value="@hour"
@@ -79,7 +91,7 @@
UpdateTime( UpdateTime(
new SimpleTimeOnly new SimpleTimeOnly
{ {
Hour=AdjustedHour, Hour=Time.Hour,
Minute=Convert.ToInt32(e.Value) Minute=Convert.ToInt32(e.Value)
} }
)" )"
@@ -101,7 +113,7 @@
UpdateTime( UpdateTime(
new SimpleTimeOnly new SimpleTimeOnly
{ {
Hour=convert12To24Hour(Time.Hour, e.Value?.ToString()), Hour=convertTo24Hour(Time.Hour, e.Value?.ToString()),
Minute=Time.Minute Minute=Time.Minute
} }
)" )"

View File

@@ -4,6 +4,18 @@
@code @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 IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private ulong? _selectedTermId {get; set;} private ulong? _selectedTermId {get; set;}
private ulong? selectedTermId { private ulong? selectedTermId {

View File

@@ -26,12 +26,9 @@
} }
private Modal? assignmentEditorModal {get; set;} private Modal? assignmentEditorModal {get; set;}
private void DropCallback (DateTime? dropDate, LocalModule? module) private void dropOnDate(DateTime dropDate)
{ {
@* only supports changing date or module, not both *@
if (planner.LocalCourse == null) return; if (planner.LocalCourse == null) return;
if (module == null)
{
var currentModule = planner var currentModule = planner
.LocalCourse .LocalCourse
.Modules .Modules
@@ -47,7 +44,7 @@
? a ? a
: a with : a with
{ {
due_at=dropDate ?? Assignment.due_at due_at=dropDate
} }
) )
}; };
@@ -63,8 +60,9 @@
}; };
planner.LocalCourse = newCourse; planner.LocalCourse = newCourse;
} }
else private void dropOnModule(LocalModule module)
{ {
if (planner.LocalCourse == null) return;
var newModules = planner.LocalCourse.Modules.Select(m => var newModules = planner.LocalCourse.Modules.Select(m =>
m.Name != module.Name m.Name != module.Name
? m with ? m with
@@ -83,6 +81,17 @@
}; };
planner.LocalCourse = newCourse; planner.LocalCourse = newCourse;
} }
private void DropCallback (DateTime? dropDate, LocalModule? module)
{
if (module == null)
{
dropOnDate(dropDate ?? Assignment.due_at);
}
else
{
dropOnModule(module);
}
} }
private void HandleDragStart() private void HandleDragStart()
{ {
@@ -106,12 +115,21 @@
> >
<div class="card"> <div class="card">
<div class="card-body"> <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"> <div class="card-text">
<div class="row">
<div class="col">
@Assignment.description @Assignment.description
</div>
<div class="col-auto">
<div>Points: @Assignment.points_possible</div>
<div>Due At: @Assignment.due_at</div> <div>Due At: @Assignment.due_at</div>
<div>Lock At: @Assignment.lock_at</div> <div>Lock At: @Assignment.lock_at</div>
<div>Points: @Assignment.points_possible</div>
@if(Assignment.canvasId != null) @if(Assignment.canvasId != null)
{ {
<div>Synced with canvas</div> <div>Synced with canvas</div>
@@ -120,15 +138,8 @@
{ {
<div>Not synced with canvas</div> <div>Not synced with canvas</div>
} }
<div class="ms-3"> <div>
Rubric:
<div class="row p-1">
<div class="col border-end my-auto text-end">
Label
</div>
<div class="col my-auto">
Points
</div>
</div> </div>
@foreach(var rubricItem in Assignment.rubric) @foreach(var rubricItem in Assignment.rubric)
{ {
@@ -136,13 +147,14 @@
<div class="col border-end my-auto text-end"> <div class="col border-end my-auto text-end">
@rubricItem.Label @rubricItem.Label
</div> </div>
<div class="col my-auto"> <div class="col-2 my-auto">
@rubricItem.Points @rubricItem.Points
</div> </div>
</div> </div>
} }
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

View File

@@ -7,12 +7,10 @@
[EditorRequired] [EditorRequired]
public LocalAssignment Assignment { get; set; } = new(); public LocalAssignment Assignment { get; set; } = new();
private void DropCallback (DateTime? dropDate, LocalModule? module) private void dropOnDate(DateTime dropDate)
{ {
@* only supports changing date or module, not both *@
if (planner.LocalCourse == null) return; if (planner.LocalCourse == null) return;
if (module == null)
{
var currentModule = planner var currentModule = planner
.LocalCourse .LocalCourse
.Modules .Modules
@@ -28,7 +26,7 @@
? a ? a
: a with : a with
{ {
due_at=dropDate ?? Assignment.due_at due_at=dropDate
} }
) )
}; };
@@ -44,17 +42,18 @@
}; };
planner.LocalCourse = newCourse; planner.LocalCourse = newCourse;
} }
else private void dropOnModule(LocalModule module)
{ {
if (planner.LocalCourse == null) return;
var newModules = planner.LocalCourse.Modules.Select(m => var newModules = planner.LocalCourse.Modules.Select(m =>
m.Name != module.Name m.Name != module.Name
? m with ? m with
{ {
Assignments = m.Assignments.Where(a => a.id != Assignment.id).DistinctBy(a => a.id) Assignments = m.Assignments.Where(a => a.id != Assignment.id)
} }
: m with : m with
{ {
Assignments = m.Assignments.Append(Assignment).DistinctBy(a => a.id) Assignments = m.Assignments.Append(Assignment)
} }
); );
@@ -64,6 +63,17 @@
}; };
planner.LocalCourse = newCourse; planner.LocalCourse = newCourse;
} }
private void DropCallback (DateTime? dropDate, LocalModule? module)
{
if (module == null)
{
dropOnDate(dropDate ?? Assignment.due_at);
}
else
{
dropOnModule(module);
}
} }
private void HandleDragStart() private void HandleDragStart()
{ {

View File

@@ -18,14 +18,31 @@ public class CoursePlanner
get => _localCourse; get => _localCourse;
set set
{ {
// ignore initial load of course if (value == null)
if (_localCourse != null && 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(); StateHasChanged?.Invoke();
} }
} }
public event Action? StateHasChanged; 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 };
}
} }