pivoting to local yaml files for state

This commit is contained in:
2023-07-18 23:02:48 -06:00
parent d691f817b7
commit 04274bd6c5
15 changed files with 343 additions and 273 deletions

View File

@@ -3,196 +3,18 @@
@using Management.Web.Shared.Semester
@using CanvasModel.Courses
@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
@using LocalModels
@inject CanvasService canvas
@inject CoursePlanner planner
@inject ProtectedLocalStorage BrowserStorage
@inject YamlManager yamlManager
@code
{
private string semesterConfigurationKey = "semesterCalendarConfiguration";
private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private bool loadingCourses = false;
private IEnumerable<CourseModel>? courses {get; set;} = null;
private ulong? _selectedTermId { get; set; }
private ulong? selectedTermId {
get => _selectedTermId;
set
{
_selectedTermId = value;
updateCourses();
}
}
private EnrollmentTermModel? selectedTerm
{
get => terms?.FirstOrDefault(t => t.Id == selectedTermId);
}
private ulong? selectedCourseId {
get => planner.Course?.Id;
set
{
planner.Course = courses?.First(c => c.Id == value);
updateModules();
}
}
private List<DayOfWeek> days { get; set; } = new();
private bool saved { get; set; } = false;
protected override async Task OnInitializedAsync()
{
terms = await canvas.GetCurrentTermsFor();
readTermFromConfig();
readDaysFromConfig();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if(firstRender)
{
var storedConfiguration = await BrowserStorage.GetAsync<SemesterCalendarConfig>(semesterConfigurationKey);
if (storedConfiguration.Success)
{
planner.SemesterCalendar = storedConfiguration.Value;
}
else
{
Console.WriteLine("no stored configuration");
}
StateHasChanged();
}
}
private async Task updateCourses()
{
if(selectedTermId != null)
{
loadingCourses = true;
courses = await canvas.GetCourses((ulong)selectedTermId);
loadingCourses = false;
}
else
courses = null;
StateHasChanged();
}
private async Task updateModules()
{
if(planner.Course != null)
{
planner.Modules = await canvas.GetModules(planner.Course.Id);
}
StateHasChanged();
}
private void readTermFromConfig()
{
if (terms == null || planner.SemesterCalendar == null) return;
foreach (var term in terms)
{
var termInConfiguration = planner.SemesterCalendar.StartDate == term.StartAt;
if (termInConfiguration)
{
selectedTermId = term.Id;
}
}
}
private void readDaysFromConfig()
{
if (terms == null || planner.SemesterCalendar == null) return;
days = planner.SemesterCalendar.Days.ToList();
}
public async void HandleSave()
{
saved = true;
planner.SetConfiguration(
selectedTerm ?? throw new Exception("cannot save configuration without selecting term"),
days.ToArray()
);
await BrowserStorage.SetAsync(
semesterConfigurationKey,
planner.SemesterCalendar ?? throw new Exception("Semester Calendar configuration not properly configured")
);
}
}
<PageTitle>Index</PageTitle>
@if (terms != null)
{
<div class="row justify-content-center">
<div class="col-auto">
<label for="termselect">Select Term:</label>
<select id="termselect" class="form-select" @bind="selectedTermId">
@foreach (var term in terms)
{
<option value="@term.Id">@term.Name</option>
}
</select>
</div>
</div>
}
@if (selectedTerm is not null)
{
<h5 class="text-center mt-3">Select Days Of Week</h5>
<div class="row m-3">
@foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek)))
{
<div class="col">
<button class="@(
days.Contains(day)
? "btn btn-secondary"
: "btn btn-outline-secondary"
)" @onclick="() => {
if(days.Contains(day))
days.Remove(day);
else
days.Add(day);
}" disabled="@saved">
@day
</button>
</div>
}
@if(loadingCourses)
{
<Spinner />
}
</div>
<CurrentFiles />
@if(courses != null)
{
<div class="row justify-content-center m-3">
<div class="col-auto">
<label for="courseselect">Select Course:</label>
<select id="courseselect" class="form-select" @bind="selectedCourseId">
@foreach (var course in courses)
{
<option value="@course.Id">@course.Name</option>
}
</select>
</div>
</div>
}
<div class="row justify-content-center">
<div class="col-auto">
<button @onclick="@HandleSave" class="btn btn-primary">
Save
</button>
</div>
</div>
}
@if(planner.Modules != null)
{
<div>@JsonSerializer.Serialize(planner.Modules)</div>
}
@if (planner.SemesterCalendar is not null)
{
<div class="text-center">Config complete</div>
}
<InitializeYamlFromCanvas />

View File

@@ -20,7 +20,8 @@ builder.Services.AddSingleton<IWebRequestor, WebRequestor>();
builder.Services.AddSingleton<CanvasService, CanvasService>();
builder.Services.AddSingleton<CoursePlanner>();
builder.Services.AddSingleton<AssignmentDragContainer>();
builder.Services.AddScoped<StorageManagement>();
builder.Services.AddScoped<BrowserStorageManagement>();
builder.Services.AddScoped<YamlManager>();
var app = builder.Build();

View File

@@ -0,0 +1,21 @@
@using LocalModels
@inject YamlManager yamlManager
@code
{
public IEnumerable<LocalCourse> localCourses { get; set; }
protected override async Task OnInitializedAsync()
{
localCourses = await yamlManager.LoadSavedCourses();
}
}
@if(localCourses != null)
{
<h3>Stored Courses</h3>
@foreach (var course in localCourses)
{
<div>@course.Name</div>
}
}

View File

@@ -0,0 +1,153 @@
@using CanvasModel.EnrollmentTerms
@using Management.Web.Shared.Semester
@using CanvasModel.Courses
@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
@using LocalModels
@inject CanvasService canvas
@inject YamlManager yamlManager
@code {
private bool loadingCourses = false;
public IEnumerable<LocalCourse> localCourses { get; set; }
private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private IEnumerable<CourseModel>? courses { get; set;} = null;
private ulong? _selectedTermId { get; set; }
private ulong? selectedTermId
{
get => _selectedTermId;
set
{
_selectedTermId = value;
updateCourses();
}
}
private EnrollmentTermModel? selectedTerm
{
get => terms?.FirstOrDefault(t => t.Id == selectedTermId);
}
private ulong? _selectedCourseId { get; set; }
private ulong? selectedCourseId
{
get => _selectedCourseId;
set
{
_selectedCourseId = value;
}
}
private CourseModel? selectedCourse
{
get => courses?.First(c => c.Id == selectedCourseId);
}
private List<DayOfWeek> days { get; set; } = new();
protected override async Task OnInitializedAsync()
{
terms = await canvas.GetCurrentTermsFor();
}
private async Task YamlTrigger()
{
if(selectedCourse != null)
{
var course = new LocalCourse
{
Modules= new LocalModule[] {},
Name = selectedCourse.Name,
CanvasId = selectedCourse.Id,
DaysOfWeek = days,
};
await yamlManager.SaveCourse(course);
}
await updateCourses();
}
private async Task updateCourses()
{
if(selectedTermId != null)
{
loadingCourses = true;
localCourses = await yamlManager.LoadSavedCourses();
var storedCourseIds = localCourses.Select(c => c.CanvasId);
var allCourses = await canvas.GetCourses((ulong)selectedTermId);
courses = allCourses.Where(c => !storedCourseIds.Contains(c.Id));
loadingCourses = false;
}
else
courses = null;
StateHasChanged();
}
}
@if (terms != null)
{
<div class="row justify-content-center">
<div class="col-auto">
<label for="termselect">Select Term:</label>
<select id="termselect" class="form-select" @bind="selectedTermId">
@foreach (var term in terms)
{
<option value="@term.Id">@term.Name</option>
}
</select>
</div>
</div>
}
@if (selectedTerm is not null)
{
@if(loadingCourses)
{
<Spinner />
}
@if(courses != null)
{
<div class="row justify-content-center m-3">
<div class="col-auto">
<label for="courseselect">Select Course:</label>
<select id="courseselect" class="form-select" @bind="selectedCourseId">
@foreach (var course in courses)
{
<option value="@course.Id">@course.Name</option>
}
</select>
</div>
</div>
}
<h5 class="text-center mt-3">Select Days Of Week</h5>
<div class="row m-3">
@foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek)))
{
<div class="col">
<button class="@(
days.Contains(day)
? "btn btn-secondary"
: "btn btn-outline-secondary"
)" @onclick="() => {
if(days.Contains(day))
days.Remove(day);
else
days.Add(day);
}">
@day
</button>
</div>
}
</div>
<div class="text-center">
<button
@onclick="YamlTrigger"
class="btn btn-primary"
>
Save Yaml File
</button>
</div>
}

View File

@@ -4,7 +4,7 @@
@code {
[Parameter, EditorRequired]
public int ModuleIndex { get; set; }
public ulong ModuleId { get; set; }
[Parameter]
public EventCallback OnSubmit { get; set; }
@@ -33,8 +33,16 @@
}
}
<form @onsubmit:preventDefault="true" @onsubmit="submitHandler">
<label for="Assignment Name">Name</label>
<input id="moduleName" class="form-control" @bind="Name" />
<button class="btn btn-primary">Save</button>
</form>
<div class="modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<form @onsubmit:preventDefault="true" @onsubmit="submitHandler">
<label for="Assignment Name">Name</label>
<input id="moduleName" class="form-control" @bind="Name" />
<button class="btn btn-primary">Save</button>
</form>
</div>
</div>
</div>
</div>

View File

@@ -11,14 +11,16 @@
<h3 class="text-center">@Module.Name</h3>
<button class="btn btn-primary" @onclick="() => showAddAssignment = true">Add Assignment</button>
<button
class="btn btn-primary"
@onclick="() => showAddAssignment = true"
>
Add Assignment
</button>
@if (showAddAssignment)
{
@* <div class="ms-5 ">
<div class="bg-light border rounded m-3 p-3">
<NewAssignment ModuleIndex="ModuleIndex" OnSubmit="() => showAddAssignment = false" />
</div>
</div> *@
<NewAssignment ModuleId="Module.Id" OnSubmit="() => showAddAssignment = false" />
}
<h5>Assignments</h5>

View File

@@ -4,7 +4,7 @@
@inject CoursePlanner configurationManagement
@inject ProtectedLocalStorage BrowserStorage
@inject StorageManagement storage
@inject BrowserStorageManagement storage
@code {
private bool showNewModule { get; set; } = false;

View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
public class StorageManagement
public class BrowserStorageManagement
{
private string moduleStorageKey = "module storage key";
private string assignmentStorageKey = "assignment storage key";
@@ -10,7 +10,7 @@ public class StorageManagement
private ProtectedLocalStorage storage { get; }
private CanvasService canvas { get; }
public StorageManagement(
public BrowserStorageManagement(
CoursePlanner configurationManagement,
ProtectedLocalStorage BrowserStorage,
CanvasService canvasService