alex/canvasManagement
1
0
Fork 0
mirror of https://github.com/alexmickelson/canvasManagement.git synced 2026-03-26 07:38:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

halfway through localcourse transition

Browse Source
This commit is contained in:
Alex Mickelson
2023-09-22 12:40:40 -06:00
parent c8ad67fd0b
commit e53222e35d
18 changed files with 152 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Management.Web/Pages/AssignmentFormPage.razor
View File

@@ -34,8 +34,8 @@
if(planner.LocalCourse == null)
{
var courses = await yamlManager.LoadSavedCourses();
planner.LocalCourse = courses.First(c => c.Name == CourseName);
logger.LogInformation($"set course to '{planner.LocalCourse?.Name}'");
planner.LocalCourse = courses.First(c => c.Settings.Name == CourseName);
logger.LogInformation($"set course to '{planner.LocalCourse?.Settings.Name}'");
}
if(assignmentContext.Assignment == null)

6
Management.Web/Pages/Course.razor
View File

@@ -25,7 +25,7 @@
if(planner.LocalCourse == null)
{
var courses = await yamlManager.LoadSavedCourses();
planner.LocalCourse = courses.First(c => c.Name == CourseName);
planner.LocalCourse = courses.First(c => c.Settings.Name == CourseName);
}
base.OnInitialized();
loading = false;
@@ -66,12 +66,12 @@
<a
class="btn btn-outline-secondary"
target="_blank"
href="@($"{Environment.GetEnvironmentVariable("CANVAS_URL")}/courses/{planner.LocalCourse.CanvasId}")"
href="@($"{Environment.GetEnvironmentVariable("CANVAS_URL")}/courses/{planner.LocalCourse.Settings.CanvasId}")"
>
View In Canvas
</a>
<div class="my-auto ms-2 d-inline">
@planner.LocalCourse.Name
@planner.LocalCourse.Settings.Name
</div>
</div>

2
Management.Web/Pages/Index.razor
View File

@@ -104,7 +104,7 @@
View In Canvas
</a>
<div class="my-auto ms-2 d-inline">
@planner.LocalCourse.Name
@planner.LocalCourse.Settings.Name
</div>
</div>

6
Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
View File

@@ -79,9 +79,9 @@
{
Modules = newModules
};
if (assignment.CanvasId != null && planner.LocalCourse.CanvasId != null)
if (assignment.CanvasId != null && planner.LocalCourse.Settings.CanvasId != null)
{
ulong courseId = planner.LocalCourse.CanvasId ?? throw new Exception("cannot delete if no course id");
ulong courseId = planner.LocalCourse.Settings.CanvasId ?? throw new Exception("cannot delete if no course id");
await canvas.Assignments.Delete(courseId, assignment);
}
}
@@ -190,7 +190,7 @@
class="btn btn-primary mx-2"
@onclick="@(() => {
assignmentContext.Assignment = null;
Navigation.NavigateTo("/course/" + planner.LocalCourse?.Name);
Navigation.NavigateTo("/course/" + planner.LocalCourse?.Settings.Name);
})"
>
Done

4
Management.Web/Shared/Course/CourseDetails.razor
View File

@@ -21,7 +21,7 @@
if(
planner.CanvasAssignments == null
&& planner.LocalCourse != null
&& planner.LocalCourse.CanvasId != null
&& planner.LocalCourse.Settings.CanvasId != null
)
{
await planner.LoadCanvasData();
@@ -48,7 +48,7 @@
{
<div class="py-2">
@foreach (var month in SemesterPlanner.GetMonthsBetweenDates(planner.LocalCourse.StartDate, planner.LocalCourse.EndDate))
@foreach (var month in SemesterPlanner.GetMonthsBetweenDates(planner.LocalCourse.Settings.StartDate, planner.LocalCourse.Settings.EndDate))
{
<MonthDetail Month="month" />
<hr />

11
Management.Web/Shared/Course/CourseSettings.razor
View File

@@ -28,8 +28,11 @@
{
planner.LocalCourse = planner.LocalCourse with
{
StartDate=selectedTerm.StartAt ?? new DateTime(),
EndDate=selectedTerm.EndAt ?? new DateTime(),
Settings = planner.LocalCourse.Settings with
{
StartDate=selectedTerm.StartAt ?? new DateTime(),
EndDate=selectedTerm.EndAt ?? new DateTime(),
}
};
}
}
@@ -43,10 +46,10 @@
{
if (firstRender)
{
if(planner.LocalCourse != null && planner.LocalCourse.CanvasId != null)
if(planner.LocalCourse != null && planner.LocalCourse.Settings.CanvasId != null)
{
loading = true;
ulong id = planner.LocalCourse?.CanvasId ?? throw new Exception("wtf how did i get here");
ulong id = planner.LocalCourse?.Settings.CanvasId ?? throw new Exception("wtf how did i get here");
var canvasCourse = await canvas.GetCourse(id);
terms = await canvas.GetCurrentTermsFor(canvasCourse.StartAt);
loading = false;

6
Management.Web/Shared/CurrentFiles.razor
View File

@@ -19,7 +19,7 @@
{
@* logger.LogInformation("here"); *@
planner.LocalCourse = course;
Navigation.NavigateTo("/course/" + course.Name);
Navigation.NavigateTo("/course/" + course.Settings.Name);
Console.WriteLine("navigated to course detail");
}
}
@@ -30,10 +30,10 @@
<h3>Stored Courses</h3>
@foreach (var course in localCourses)
{
var location = "/course/" + course.Name;
var location = "/course/" + course.Settings.Name;
<div>
<h4 class="m-3 hover-underline-animation" @onclick="(e) => handleClick(e, course)" role='button'>
@course.Name
@course.Settings.Name
</h4>
</div>

12
Management.Web/Shared/InitializeYamlFromCanvas.razor
View File

@@ -61,11 +61,13 @@
var course = new LocalCourse
{
Modules = new LocalModule[] {},
Name = selectedCourse.Name,
CanvasId = selectedCourse.Id,
DaysOfWeek = days,
StartDate = selectedTerm?.StartAt ?? new DateTime(),
EndDate = selectedTerm?.EndAt ?? new DateTime(),
Settings = new LocalCourseSettings() {
Name = selectedCourse.Name,
CanvasId = selectedCourse.Id,
StartDate = selectedTerm?.StartAt ?? new DateTime(),
EndDate = selectedTerm?.EndAt ?? new DateTime(),
}
};
await yamlManager.SaveCourseAsync(course);
NewFileCreated();
@@ -80,7 +82,7 @@
loadingCourses = true;
localCourses = await yamlManager.LoadSavedCourses();
var storedCourseIds = localCourses.Select(c => c.CanvasId);
var storedCourseIds = localCourses.Select(c => c.Settings.CanvasId);
var allCourses = await canvas.GetCourses((ulong)selectedTermId);
courses = allCourses.Where(c => !storedCourseIds.Contains(c.Id));
loadingCourses = false;

4
Management.Web/Shared/Module/Assignment/AssignmentDetails.razor
View File

@@ -48,7 +48,7 @@
private void OnClick()
{
assignmentContext.Assignment = Assignment;
Navigation.NavigateTo("/course/" + planner.LocalCourse.Name + "/assignment/" + Assignment.Id);
Navigation.NavigateTo("/course/" + planner.LocalCourse?.Settings.Name + "/assignment/" + Assignment.Id);
}
}
@@ -73,7 +73,7 @@
@if(isSyncedWithCanvas)
{
@if(planner.LocalCourse != null
&& planner.LocalCourse.CanvasId != null
&& planner.LocalCourse.Settings.CanvasId != null
&& planner.CanvasAssignments != null
&& planner.CanvasModules != null
&& Assignment.NeedsUpdates(

2
Management.Web/Shared/Semester/Day/AssignmentInDay.razor
View File

@@ -37,7 +37,7 @@
if(planner.LocalCourse != null)
{
assignmentContext.Assignment = Assignment;
Navigation.NavigateTo("/course/" + planner.LocalCourse.Name + "/assignment/" + Assignment.Id);
Navigation.NavigateTo("/course/" + planner.LocalCourse.Settings.Name + "/assignment/" + Assignment.Id);
logger.LogInformation("navigating to assignment page");
}
}

4
Management.Web/Shared/Semester/Day/Day.razor
View File

@@ -70,8 +70,8 @@
var isClassDay = planner.LocalCourse?.DaysOfWeek.Contains(notNullDay) ?? false;
var dayInSemester =
isClassDay
&& date <= planner.LocalCourse?.EndDate
&& date >= planner.LocalCourse?.StartDate;
&& date <= planner.LocalCourse?.Settings.EndDate
&& date >= planner.LocalCourse?.Settings.StartDate;
var totalClasses = dayInSemester
? "bg-light-subtle text-light " + baseClasses