-
- Required Points: @requiredPoints
+ @foreach (var item in assignmentContext?.Assignment?.Rubric ?? [])
+ {
+
+
@item.Label
+
@item.Points
+
@item.IsExtraCredit
+
+ }
+
+
+ Required Points: @requiredPoints
+
+
+ Extra Credit Points @extraCreditPoints
+
-
- Extra Credit Points @extraCreditPoints
-
-
-
-
+}
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
deleted file mode 100644
index 5557704..0000000
--- a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor
+++ /dev/null
@@ -1,173 +0,0 @@
-@using Management.Web.Shared.Components
-
-@inject CoursePlanner planner
-@inject AssignmentEditorContext assignmentContext
-
-@code
-{
- private IEnumerable
rubric { get; set; } = Array.Empty();
- private int rubricReloadKey = 0;
-
- protected override void OnInitialized()
- {
- assignmentContext.StateHasChanged += reload;
- reload();
- }
- private void reload()
- {
- if (assignmentContext.Assignment != null)
- {
- rubric = assignmentContext.Assignment.Rubric;
- }
- this.InvokeAsync(this.StateHasChanged);
- }
- public void Dispose()
- {
- assignmentContext.StateHasChanged -= reload;
- }
-
- private void save()
- {
- if (assignmentContext.Assignment != null)
- {
- var newAssignment = assignmentContext.Assignment with
- {
- Rubric = rubric,
- };
- assignmentContext.SaveAssignment(newAssignment);
- StateHasChanged();
- }
- }
- private void addItem()
- {
- if (assignmentContext.Assignment != null)
- {
- rubric = rubric.Append(new RubricItem
- {
- Label = "",
- Points = 0
- });
- }
- }
- private void removeItem()
- {
- if (assignmentContext.Assignment != null)
- {
- rubric = rubric.Take(rubric.Count() - 1);
- save();
- }
- }
- private void editItem(RubricItem newItem, int index)
- {
- if (assignmentContext.Assignment != null)
- {
- rubric = rubric.Select((r, i) => i == index ? newItem : r);
- save();
- }
- }
- private void MoveUp(RubricItem item)
- {
- if (assignmentContext.Assignment != null)
- {
- var rubricList = rubric.ToList();
- var index = rubricList.IndexOf(item);
-
- if (index > 0)
- {
- var previous = rubricList[index - 1];
- rubricList[index - 1] = item;
- rubricList[index] = previous;
- rubric = rubricList;
- save();
- }
- rubricReloadKey++;
- StateHasChanged();
- }
- }
- private void MoveDown(RubricItem item)
- {
- if (assignmentContext.Assignment != null)
- {
- var rubricList = rubric.ToList();
- var index = rubricList.IndexOf(item);
-
- if (index < rubricList.Count())
- {
- var next = rubricList[index + 1];
- rubricList[index + 1] = item;
- rubricList[index] = next;
- rubric = rubricList;
- save();
- }
- rubricReloadKey++;
- StateHasChanged();
- }
- }
-
- private int requiredPoints => rubric.Where(r => !r.IsExtraCredit).Select(r => r.Points).Sum();
- private int extraCreditPoints => rubric.Where(r => r.IsExtraCredit).Select(r => r.Points).Sum();
-}
-
-
-
-
-
-
Rubric
-
-
-
-
-
-
-
-
-@foreach (var (rubricItem, index) in rubric.Select((r, i) => (r, i)))
- {
-
- }
-
-
-
-
-
-
- Requred Points: @requiredPoints
-
-
- Extra Credit Points @extraCreditPoints
-
-
-
-
-
-
-
-
-
diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor
deleted file mode 100644
index b8aefd2..0000000
--- a/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor
+++ /dev/null
@@ -1,137 +0,0 @@
-
-@inject CoursePlanner planner
-
-@code
-{
- [Parameter, EditorRequired]
- public RubricItem RubricItem { get; set; } = default!;
-
- [Parameter, EditorRequired]
- public Action OnUpdate { get; set; } = default!;
- [Parameter, EditorRequired]
- public Action MoveUp { get; set; } = default!;
- [Parameter, EditorRequired]
- public Action MoveDown { get; set; } = default!;
-
- private int points { get; set; }
- private string label { get; set; }
- private bool firstLoad = true;
- protected override void OnParametersSet()
- {
- if(firstLoad)
- {
- firstLoad = false;
- points = RubricItem.Points;
- label = RubricItem.Label;
- }
- }
-
-
- private void editItem(string label, int points)
- {
- var newRubricItem = RubricItem with
- {
- Label = label,
- Points = points
- };
- OnUpdate(newRubricItem);
- }
-}
-
-
-
-
-
- editItem(e.Value?.ToString() ?? "", RubricItem.Points))"
- @bind="label"
- />
-
-
-
- editItem(
- RubricItem.Label,
- int.Parse(e.Value?.ToString() != "" ? e.Value?.ToString() ?? "0" : "0"))
- )"
- @bind="points"
- type="number"
- />
-
-
-
-
- {
- bool value = (bool) (e.Value ?? false);
- var newLabel = value
- ? RubricItem.extraCredit + RubricItem.Label
- : RubricItem.Label.Replace(RubricItem.extraCredit, "");
- editItem(newLabel, RubricItem.Points);
- })"
- id="extraCredit"
- name="extraCredit"
- role="switch"
- >
-
-
-
-
-
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/ConfirmationModal.razor b/Management.Web/Shared/Components/ConfirmationModal.razor
index 87fce84..f58721f 100644
--- a/Management.Web/Shared/Components/ConfirmationModal.razor
+++ b/Management.Web/Shared/Components/ConfirmationModal.razor
@@ -79,7 +79,7 @@
\ No newline at end of file
diff --git a/Management.Web/Shared/Components/Forms/FormSelect.razor b/Management.Web/Shared/Components/Forms/FormSelect.razor
index 782234a..d36ca24 100644
--- a/Management.Web/Shared/Components/Forms/FormSelect.razor
+++ b/Management.Web/Shared/Components/Forms/FormSelect.razor
@@ -18,8 +18,6 @@
private string htmlLabel => Label.Replace("-", "");
- private string selectedItemId { get; set; }
-
private void onSelect(ChangeEventArgs e)
{
var newId = e.Value?.ToString();
@@ -33,7 +31,6 @@
diff --git a/Management.Web/Shared/InitializeNewCourse.razor b/Management.Web/Shared/InitializeNewCourse.razor
index 15585b1..231dbee 100644
--- a/Management.Web/Shared/InitializeNewCourse.razor
+++ b/Management.Web/Shared/InitializeNewCourse.razor
@@ -56,7 +56,7 @@
loadingTerms = true;
terms = await canvas.GetCurrentTermsFor();
loadingTerms = false;
- directoriesNotUsed = await fileStorageManager.GetEmptyDirectories();
+ directoriesNotUsed = fileStorageManager.GetEmptyDirectories();
}
private async Task SaveNewCourse()
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor b/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor
index 73b30bd..4864c95 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor
+++ b/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor
@@ -3,7 +3,6 @@
@using CanvasModel.Assignments;
@inject DragContainer dragContainer
-@inject CoursePlanner planner
@inject NavigationManager Navigation
@inject AssignmentEditorContext assignmentContext
@@ -13,8 +12,6 @@
[Parameter]
[EditorRequired]
public LocalModule Module { get; set; } = new();
- private bool showUpdateForm = false;
-
protected override void OnInitialized()
{
planner.StateHasChanged += reload;
@@ -78,8 +75,9 @@
&& planner.LocalCourse.Settings.CanvasId != null
&& planner.CanvasAssignments != null
&& planner.CanvasModules != null
+ && assignmentInCanvas != null
&& Assignment.NeedsUpdates(
- assignmentInCanvas,
+ (CanvasAssignment)assignmentInCanvas,
Assignment.GetCanvasAssignmentGroupId(planner.LocalCourse.Settings.AssignmentGroups)
)
)
diff --git a/Management.Web/Shared/Module/NewAssignment.razor b/Management.Web/Shared/Module/NewAssignment.razor
index 28e4d7e..81da632 100644
--- a/Management.Web/Shared/Module/NewAssignment.razor
+++ b/Management.Web/Shared/Module/NewAssignment.razor
@@ -73,12 +73,15 @@