working on rubric

This commit is contained in:
2023-07-25 09:08:09 -06:00
parent ffaf4e1164
commit a8221ccb5f
8 changed files with 204 additions and 35 deletions

View File

@@ -12,6 +12,7 @@
_selectedTermId = value; _selectedTermId = value;
if(selectedTerm != null && planner.LocalCourse != null) if(selectedTerm != null && planner.LocalCourse != null)
{ {
System.Console.WriteLine(JsonSerializer.Serialize(selectedTerm));
planner.LocalCourse = planner.LocalCourse with planner.LocalCourse = planner.LocalCourse with
{ {
StartDate=selectedTerm.StartAt ?? new DateTime(), StartDate=selectedTerm.StartAt ?? new DateTime(),

View File

@@ -6,10 +6,10 @@
@code { @code {
[Parameter] [Parameter]
[EditorRequired] [EditorRequired]
public LocalAssignment assignment { get; set; } = new(); public LocalAssignment Assignment { get; set; } = new();
[Parameter] [Parameter]
[EditorRequired] [EditorRequired]
public LocalModule module { get; set; } = new(); public LocalModule Module { get; set; } = new();
private bool showUpdateForm = false; private bool showUpdateForm = false;
protected override void OnInitialized() protected override void OnInitialized()
@@ -33,12 +33,12 @@
var newCourse = planner.LocalCourse with var newCourse = planner.LocalCourse with
{ {
Modules = planner.LocalCourse.Modules.Select(m => Modules = planner.LocalCourse.Modules.Select(m =>
m.Name != module.Name m.Name != Module.Name
? m ? m
: m with : m with
{ {
Assignments = module.Assignments.Select(a => Assignments = Module.Assignments.Select(a =>
a.id != assignment.id a.id != Assignment.id
? a ? a
: a with : a with
{ {
@@ -70,13 +70,13 @@
> >
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="card-title">@assignment.name</div> <div class="card-title">@Assignment.name</div>
<div class="card-text"> <div class="card-text">
@assignment.description @Assignment.description
<div>Due At: @assignment.due_at</div> <div>Due At: @Assignment.due_at</div>
<div>Lock At: @assignment.lock_at</div> <div>Lock At: @Assignment.lock_at</div>
<div>Points: @assignment.points_possible</div> <div>Points: @Assignment.points_possible</div>
@if(assignment.canvasId != null) @if(Assignment.canvasId != null)
{ {
<div>Synced with canvas</div> <div>Synced with canvas</div>
} }
@@ -84,7 +84,7 @@
{ {
<div>Not synced with canvas</div> <div>Not synced with canvas</div>
} }
<code>@JsonSerializer.Serialize(@assignment.rubric)</code> <code>@JsonSerializer.Serialize(Assignment.rubric)</code>
</div> </div>
</div> </div>
@@ -92,7 +92,8 @@
</div> </div>
<AssignmentForm <AssignmentForm
assignment="assignment" Assignment="Assignment"
Show="showUpdateForm" Show="showUpdateForm"
OnHide="@(() => showUpdateForm = false)" OnHide="@(() => showUpdateForm = false)"
Module="Module"
/> />

View File

@@ -1,9 +1,15 @@
@using Management.Web.Shared.Components @using Management.Web.Shared.Components
@inject CoursePlanner planner
@code { @code {
[Parameter] [Parameter]
[EditorRequired] [EditorRequired]
public LocalAssignment assignment public LocalModule Module { get; set; } = default!;
[Parameter]
[EditorRequired]
public LocalAssignment Assignment
{ {
get; get;
set; set;
@@ -15,9 +21,11 @@
[Parameter] [Parameter]
public Action OnHide { get; set; } = () => { }; public Action OnHide { get; set; } = () => { };
public Modal AssignmentModal { get; set; } public Modal AssignmentModal { get; set; } = default!;
private string description { get; set; } private string description { get; set; } = String.Empty;
private bool lockAtDueDate { get; set; }
private IEnumerable<RubricItem> rubric { get; set; } = Enumerable.Empty<RubricItem>();
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
@@ -25,30 +33,81 @@
{ {
AssignmentModal.Show(); AssignmentModal.Show();
} }
description = assignment.description; description = Assignment.description;
lockAtDueDate = Assignment.lock_at_due_date;
rubric = Assignment.rubric;
} }
private void submitHandler() private void submitHandler()
{ {
var newAssignment = Assignment with
{
description=description,
lock_at_due_date=lockAtDueDate,
rubric=rubric,
};
System.Console.WriteLine(JsonSerializer.Serialize(newAssignment));
if(planner.LocalCourse != null)
{
planner.LocalCourse = planner.LocalCourse with
{
Modules=planner.LocalCourse.Modules.Select(m =>
m.Name != Module.Name
? m
: Module with
{
Assignments=Module.Assignments.Select(a =>
a.id == newAssignment.id
? newAssignment
: a
)
}
)
};
}
AssignmentModal.Hide();
}
private void updateRubric(IEnumerable<RubricItem> newRubric)
{
rubric = newRubric;
StateHasChanged();
} }
} }
<Modal @ref="AssignmentModal" OnHide="@(() => OnHide())"> <Modal @ref="AssignmentModal" OnHide="@(() => OnHide())">
<Title>@assignment.name</Title> <Title>@Assignment.name</Title>
<Body> <Body>
<form @onsubmit:preventDefault="true" @onsubmit="submitHandler"> <form @onsubmit:preventDefault="true" @onsubmit="submitHandler">
<label <div class="m-1">
for="description" <label
class="form-label" for="description"
> class="form-label"
Description >
</label> Description
<textarea </label>
id="description" <textarea
class="form-control" id="description"
@bind="description" class="form-control"
/> @bind="description"
/>
</div>
<div class="form-check m-1">
<input
class="form-check-input"
id="lockAtDueDate"
type="checkbox"
/>
<label
class="form-check-label"
for="lockAtDueDate"
@bind="lockAtDueDate"
>
Lock At Due Date
</label>
</div>
<RubricEditor Rubric="rubric" SetRubric="updateRubric" />
</form> </form>
</Body> </Body>
<Footer> <Footer>

View File

@@ -0,0 +1,49 @@
@using Management.Web.Shared.Components
@inject CoursePlanner planner
@code
{
[Parameter, EditorRequired]
public IEnumerable<RubricItem> Rubric { get; set; } = default!;
[Parameter, EditorRequired]
public Action<IEnumerable<RubricItem>> SetRubric { get; set; } = default!;
private void addItem()
{
SetRubric(
Rubric.Append(new RubricItem
{
Id=Guid.NewGuid().ToString(),
Label="",
Points=0
})
);
StateHasChanged();
}
private void editItem(RubricItem newItem)
{
var newRubric = Rubric.Select(i => i.Id == newItem.Id ? newItem : i);
SetRubric(newRubric);
StateHasChanged();
}
}
<br>
<h5>Rubric</h5>
<ul class="list-group">
@foreach (var rubricItem in Rubric)
{
<RubricEditorItem RubricItem="rubricItem" OnUpdate="editItem" />
}
</ul>
<button
@onclick:preventDefault="true"
@onclick="addItem"
type="button"
class="btn btn-outline-primary"
>
+ rubric item
</button>

View File

@@ -0,0 +1,52 @@
@inject CoursePlanner planner
@code
{
[Parameter, EditorRequired]
public RubricItem RubricItem { get; set; } = default!;
[Parameter, EditorRequired]
public Action<RubricItem> OnUpdate { get; set; } = default!;
private void editItem(string label, int points)
{
var newRubricItem = RubricItem with
{
Label = label,
Points = points
};
OnUpdate(newRubricItem);
}
}
<li
class="list-group-item"
>
<div class="row">
<div class="col">
<label for="rubricLabel">Label</label>
<input
class="form-control"
id="rubricLabel"
name="rubricLabel"
@oninput="@(e => editItem(e.Value?.ToString() ?? "", RubricItem.Points))"
value="@RubricItem.Label"
/>
</div>
<div class="col">
<label for="rubricPoints">Points</label>
<input
class="form-control"
id="rubricPoints"
name="rubricPoints"
@oninput="@(e => editItem(
RubricItem.Label,
int.Parse(e.Value?.ToString() != "" ? e.Value?.ToString() ?? "0" : "0"))
)"
value="@RubricItem.Points"
type="number"
/>
</div>
</div>
</li>

View File

@@ -63,7 +63,7 @@
<div class="row"> <div class="row">
@foreach (var a in Module.Assignments) @foreach (var a in Module.Assignments)
{ {
<AssignmentDetails assignment="a" module="Module" /> <AssignmentDetails Assignment="a" Module="Module" />
} }
</div> </div>
</div> </div>

View File

@@ -49,12 +49,14 @@
{ {
DayOfWeek? weekDay = date?.DayOfWeek; DayOfWeek? weekDay = date?.DayOfWeek;
DayOfWeek notNullDay = weekDay ?? default; DayOfWeek notNullDay = weekDay ?? default;
var isClassDay = planner.LocalCourse?.DaysOfWeek.Contains(notNullDay) ?? false;
var dayInSemester = var dayInSemester =
planner.LocalCourse?.DaysOfWeek.Contains(notNullDay) ?? false isClassDay
&& date < planner.LocalCourse.EndDate && date < planner.LocalCourse.EndDate
&& date > planner.LocalCourse.StartDate; && date > planner.LocalCourse.StartDate;
var totalClasses = dayInSemester ? $"bg-light-subtle text-light {baseClasses}" : baseClasses; var totalClasses = dayInSemester ? $"bg-light-subtle text-light " + baseClasses : baseClasses;
return totalClasses; return totalClasses;
} }

View File

@@ -1,4 +1,9 @@
public record RubricItem(int Points, string Label); public record RubricItem
{
public string Id { get; set; } = "";
public string Label { get; set; } = "";
public int Points { get; set; } = 0;
}
public enum SubmissionType public enum SubmissionType
{ {