added some details for editing assignment

This commit is contained in:
2023-10-30 13:47:05 -06:00
parent 246d64c2a0
commit 29de2880b9
6 changed files with 153 additions and 65 deletions

View File

@@ -41,14 +41,15 @@
if (assignmentContext.Assignment == null)
{
var assignment = planner
.LocalCourse?
.Modules
.SelectMany(m => m.Assignments)
.FirstOrDefault(a => a.Name == AssignmentName);
.LocalCourse?
.Modules
.SelectMany(m => m.Assignments)
.FirstOrDefault(a => a.Name == AssignmentName);
assignmentContext.Assignment = assignment;
logger.LogInformation($"set assignment to '{assignmentContext.Assignment?.Name}'");
}
await planner.LoadCanvasData();
base.OnInitialized();
StateHasChanged();
}

View File

@@ -144,6 +144,16 @@
await planner.LoadCanvasData();
addingAssignmentToCanvas = false;
}
private async Task updateInCanvas()
{
if(assignmentInCanvas != null)
{
addingAssignmentToCanvas = true;
await assignmentContext.UpdateInCanvas(assignmentInCanvas.Id);
await planner.LoadCanvasData();
addingAssignmentToCanvas = false;
}
}
private CanvasAssignment? assignmentInCanvas =>
planner.CanvasAssignments?.FirstOrDefault(a => a.Name == assignmentContext.Assignment?.Name);
@@ -153,16 +163,20 @@
private async Task deleteFromCanvas()
{
if (assignmentInCanvas == null || planner.LocalCourse.Settings.CanvasId == null || assignmentContext.Assignment == null)
if (assignmentInCanvas == null
|| planner.LocalCourse.Settings.CanvasId == null
|| assignmentContext.Assignment == null
)
return;
deletingAssignmentFromCanvas = true;
await canvas.Assignments.Delete(
(ulong)planner.LocalCourse.Settings.CanvasId,
assignmentInCanvas.Id,
assignmentContext.Assignment.Name);
await planner.LoadCanvasData();
StateHasChanged();
deletingAssignmentFromCanvas = false;
StateHasChanged();
}
}
@@ -224,6 +238,13 @@
>
View in Canvas
</a>
<button
class="btn btn-outline-secondary mx-3"
disabled="@(addingAssignmentToCanvas || deletingAssignmentFromCanvas)"
@onclick="updateInCanvas"
>
Update In Canvas
</button>
<ConfirmationModal
Disabled="@(addingAssignmentToCanvas || deletingAssignmentFromCanvas)"
Label="Delete from Canvas"

View File

@@ -5,10 +5,40 @@
@code
{
private IEnumerable<RubricItem> rubric { get; set; } = Array.Empty<RubricItem>();
private string rubricText = "";
private IEnumerable<RubricItem> displayRubric { get; set; } = new RubricItem[] {};
private string _rubricText = "";
private string rubricText
{
get => _rubricText;
set
{
_rubricText = value;
try
{
var parsedRubric = LocalAssignment.ParseRubricMarkdown(value);
displayRubric = parsedRubric;
error = null;
if (assignmentContext.Assignment != null)
{
var newAssignment = assignmentContext.Assignment with
{
Rubric = parsedRubric,
};
assignmentContext.SaveAssignment(newAssignment);
}
}
catch (RubricMarkdownParseException parseError)
{
error = parseError.Message;
}
StateHasChanged();
}
}
private int rubricReloadKey = 0;
private string? error { get; set; } = null;
protected override void OnInitialized()
{
@@ -19,55 +49,28 @@
{
if (assignmentContext.Assignment != null)
{
rubric = assignmentContext.Assignment.Rubric;
if(rubricText == string.Empty)
{
rubricText = assignmentContext.Assignment.RubricToMarkdown();
}
}
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 handleNewRubricText()
{
}
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();
private int requiredPoints => displayRubric.Where(r => !r.IsExtraCredit).Select(r => r.Points).Sum();
private int extraCreditPoints => displayRubric.Where(r => r.IsExtraCredit).Select(r => r.Points).Sum();
}
<br>
<div class="row">
<div class="col offset-3">
<h4 class="text-center">Rubric</h4>
</div>
</div>
<div class="row">
<div class="col">
<label for="description" class="form-label">
Rubric
</label>
</div>
<div class="col">
HTML Preview
</div>
</div>
<div class="row">
<div class="col-6">
<textarea
@@ -75,22 +78,37 @@
class="form-control h-100"
rows=12
@bind="rubricText"
@oninput="handleNewRubricText"
@bind:event="oninput"
/>
</div>
<div class="col-6">
preview here
@if (error != null)
{
<p class="text-danger text-truncate">Error: @error</p>
}
<div class="row border-bottom">
<div class="col-6 text-end">Label</div>
<div class="col-3 text-center">Points</div>
<div class="col-3 text-center">Extra Credit</div>
</div>
@foreach(var item in displayRubric)
{
<div class="row border-bottom">
<div class="col-6 text-end">@item.Label</div>
<div class="col-3 text-center">@item.Points</div>
<div class="col-3 text-center">@item.IsExtraCredit</div>
</div>
}
<div class="text-end">
<div>
Required Points: @requiredPoints
</div>
<div>
Extra Credit Points @extraCreditPoints
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div>
Requred Points: @requiredPoints
</div>
<div>
Extra Credit Points @extraCreditPoints
</div>
</div>
</div>