resolved warnings

This commit is contained in:
2023-07-24 14:31:20 -06:00
parent 6232a7a94e
commit d1383fe1d4
17 changed files with 261 additions and 134 deletions

View File

@@ -1,25 +0,0 @@
@using CanvasModel.EnrollmentTerms
@using Management.Web.Shared.Module
@using Management.Web.Shared.Semester
@inject CoursePlanner planner
<br>
<div class="row">
<div class="col">
@if (planner.LocalCourse != null)
{
@foreach (var month in SemesterPlanner.GetMonthsBetweenDates(planner.LocalCourse.StartDate, planner.LocalCourse.EndDate))
{
<MonthDetail Month="month" />
<hr />
}
}
</div>
<div class="col">
<Modules />
</div>
</div>

View File

@@ -0,0 +1,48 @@
@using CanvasModel.EnrollmentTerms
@using Management.Web.Shared.Module
@using Management.Web.Shared.Semester
@inject CoursePlanner planner
@code
{
private bool showEditCourseSettings = false;
protected override void OnInitialized()
{
planner.StateHasChanged += () => this.InvokeAsync(this.StateHasChanged);
}
}
<br>
@if(!showEditCourseSettings)
{
<button class="btn btn-outline-secondary" @onclick="@(() => showEditCourseSettings = true)">Edit Course Settings</button>
}
else
{
<CourseSettings />
<button
class="btn btn-outline-secondary"
@onclick="@(() => showEditCourseSettings = false)"
>
Done Editing Course Settings
</button>
}
<div class="row">
<div class="col">
@if (planner.LocalCourse != null)
{
@foreach (var month in SemesterPlanner.GetMonthsBetweenDates(planner.LocalCourse.StartDate, planner.LocalCourse.EndDate))
{
<MonthDetail Month="month" />
<hr />
}
}
</div>
<div class="col">
<Modules />
</div>
</div>

View File

@@ -0,0 +1,99 @@
@inject CanvasService canvas
@inject CoursePlanner planner
@code
{
private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private ulong? _selectedTermId {get; set;}
private ulong? selectedTermId {
get => _selectedTermId;
set
{
_selectedTermId = value;
if(selectedTerm != null && planner.LocalCourse != null)
{
planner.LocalCourse = planner.LocalCourse with
{
StartDate=selectedTerm.StartAt ?? new DateTime(),
EndDate=selectedTerm.EndAt ?? new DateTime(),
};
}
}
}
private EnrollmentTermModel? selectedTerm
{
get => terms?.FirstOrDefault(t => t.Id == selectedTermId);
}
private bool loading = false;
protected override async Task OnInitializedAsync()
{
if(planner.LocalCourse != null && planner.LocalCourse.CanvasId != null)
{
loading = true;
ulong id = planner.LocalCourse?.CanvasId ?? throw new Exception("wtf how did i get here");
var canvasCourse = await canvas.GetCourse(id);
terms = await canvas.GetCurrentTermsFor(canvasCourse.StartAt);
loading = false;
}
}
}
<h5>Select Days Of Week</h5>
<div class="row m-3">
@foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek)))
{
<div class="col">
<button
class="@(
planner.LocalCourse?.DaysOfWeek.Contains(day) ?? false
? "btn btn-secondary"
: "btn btn-outline-secondary"
)"
@onclick="() =>
{
if(planner.LocalCourse?.DaysOfWeek.Contains(day) ?? false)
{
planner.LocalCourse = planner.LocalCourse with
{
DaysOfWeek = planner.LocalCourse.DaysOfWeek.Where((d) => d != day)
};
}
else
{
if (planner.LocalCourse != null)
{
planner.LocalCourse = planner.LocalCourse with
{
DaysOfWeek = planner.LocalCourse.DaysOfWeek.Append(day)
};
}
}
}"
>
@day
</button>
</div>
}
</div>
@if(loading)
{
<Spinner />
}
@if (terms != null)
{
<div class="row justify-content-center">
<div class="col-auto">
<form>
<lablel for="termselect">Select Term for Start and End Date:</lablel>
<select id="termselect" class="form-select" @bind="selectedTermId">
@foreach (var term in terms)
{
<option value="@term.Id">@term.Name</option>
}
</select>
</form>
</div>
</div>
}

View File

@@ -5,14 +5,11 @@
@code
{
public IEnumerable<LocalCourse> localCourses { get; set; }
public IEnumerable<LocalCourse>? localCourses { get; set; }
protected override async Task OnInitializedAsync()
{
localCourses = await yamlManager.LoadSavedCourses();
}
}
@if(localCourses != null)

View File

@@ -10,7 +10,7 @@
@code {
private bool loadingCourses = false;
public IEnumerable<LocalCourse> localCourses { get; set; }
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; }
@@ -20,7 +20,10 @@
set
{
_selectedTermId = value;
updateCourses();
@* updateCourses(); *@
var task = Task.Run(async () => await updateCourses());
task.Wait();
StateHasChanged();
}
}
private EnrollmentTermModel? selectedTerm
@@ -58,7 +61,7 @@
CanvasId = selectedCourse.Id,
DaysOfWeek = days,
};
await yamlManager.SaveCourse(course);
await yamlManager.SaveCourseAsync(course);
}
await updateCourses();
}

View File

@@ -4,7 +4,7 @@
[Parameter]
[Required]
public LocalAssignment assignment { get; set; } = new();
private async Task HandleDragStart()
private void HandleDragStart()
{
dragContainer.AssignmentBeingDragged = assignment;
System.Console.WriteLine("assignment set");
@@ -13,7 +13,7 @@
<div
draggable="true"
ondragstart="@HandleDragStart"
@ondragstart="HandleDragStart"
class="col-2"
>
<div class="card">

View File

@@ -4,7 +4,7 @@
@code {
[Parameter, EditorRequired]
public string ModuleName { get; set; }
public string ModuleName { get; set; } = "";
[Parameter]
public EventCallback OnSubmit { get; set; }

View File

@@ -7,17 +7,7 @@
@inject BrowserStorageManagement storage
@code {
private bool showNewModule { get; set; } = false;
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if(firstRender)
{
await storage.LoadStoredConfig();
StateHasChanged();
}
}
private bool showNewModule { get; set; } = false;
}
@if (!showNewModule)
@@ -42,13 +32,3 @@ else
<ModuleDetail Module="module" />
}
}
<hr>
<div class="text-center">
<button
class="btn btn-primary"
@onclick="@(async () => await storage.Save())"
>
Save Modules
</button>
</div>

View File

@@ -26,9 +26,9 @@
DayOfWeek? weekDay = date?.DayOfWeek;
DayOfWeek notNullDay = weekDay ?? default;
var dayInSemester =
planner.LocalCourse.DaysOfWeek.Contains(notNullDay)
&& date < planner.LocalCourse.EndDate
&& date > planner.LocalCourse.StartDate;
planner.LocalCourse?.DaysOfWeek.Contains(notNullDay) ?? false
&& date < planner.LocalCourse.EndDate
&& date > planner.LocalCourse.StartDate;
var totalClasses = dayInSemester ? $"bg-light {baseClasses}" : baseClasses;
@@ -45,7 +45,7 @@
Console.WriteLine("on drag start");
}
async Task OnDrop()
void OnDrop()
{
Console.WriteLine("on drop");
dragging = false;
@@ -58,10 +58,10 @@
dragContainer.AssignmentBeingDragged = null;
}
async Task OnDragEnter() {
void OnDragEnter() {
dragging = true;
}
async Task OnDragLeave() {
void OnDragLeave() {
dragging = false;
}
}

View File

@@ -19,7 +19,14 @@
<div class="row text-center fw-bold">
@foreach (DayOfWeek day in WeekDaysList)
{
<div class="@(planner.LocalCourse.DaysOfWeek.Contains(day) ? "col" : "col text-secondary")">@day</div>
<div class="@(
planner.LocalCourse?.DaysOfWeek.Contains(day) ?? false
? "col"
: "col text-secondary"
)"
>
@day
</div>
}
</div>