removed assignment id from assignment page

This commit is contained in:
2023-10-24 14:38:18 -06:00
parent 8342e9cdd3
commit 97bbd3b2ed
4 changed files with 6 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
@page "/course/{CourseName}/assignment/{AssignmentId}" @page "/course/{CourseName}/assignment/{AssignmentName}"
@using CanvasModel.EnrollmentTerms @using CanvasModel.EnrollmentTerms
@using Management.Web.Shared.Components.AssignmentForm @using Management.Web.Shared.Components.AssignmentForm
@@ -21,7 +21,7 @@
[Parameter] [Parameter]
public string? CourseName { get; set; } = default!; public string? CourseName { get; set; } = default!;
[Parameter] [Parameter]
public string? AssignmentId { get; set; } = default!; public string? AssignmentName { get; set; } = default!;
private bool loading { get; set; } = true; private bool loading { get; set; } = true;
@@ -30,7 +30,7 @@
if (loading) if (loading)
{ {
loading = false; loading = false;
logger.LogInformation($"loading assignment {CourseName} {AssignmentId}"); logger.LogInformation($"loading assignment {CourseName} {AssignmentName}");
if (planner.LocalCourse == null) if (planner.LocalCourse == null)
{ {
var courses = await fileStorageManager.LoadSavedCourses(); var courses = await fileStorageManager.LoadSavedCourses();
@@ -44,7 +44,7 @@
.LocalCourse? .LocalCourse?
.Modules .Modules
.SelectMany(m => m.Assignments) .SelectMany(m => m.Assignments)
.FirstOrDefault(a => a.Id == AssignmentId); .FirstOrDefault(a => a.Name == AssignmentName);
assignmentContext.Assignment = assignment; assignmentContext.Assignment = assignment;
logger.LogInformation($"set assignment to '{assignmentContext.Assignment?.Name}'"); logger.LogInformation($"set assignment to '{assignmentContext.Assignment?.Name}'");

View File

@@ -48,9 +48,8 @@
private void OnClick() private void OnClick()
{ {
assignmentContext.Assignment = Assignment; assignmentContext.Assignment = Assignment;
Navigation.NavigateTo("/course/" + planner.LocalCourse?.Settings.Name + "/assignment/" + Assignment.Id); Navigation.NavigateTo("/course/" + planner.LocalCourse?.Settings.Name + "/assignment/" + Assignment.Name);
} }
} }
<div <div

View File

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

View File

@@ -16,7 +16,6 @@ public static class CoursePlannerExtensions
{ {
Assignments = module.Assignments Assignments = module.Assignments
.OrderBy(a => a.DueAt) .OrderBy(a => a.DueAt)
.DistinctBy(a => a.Id)
.Select(a => a.validateSubmissionTypes()) .Select(a => a.validateSubmissionTypes())
.Select(a => a.validateDates()) .Select(a => a.validateDates())
.ToArray() .ToArray()