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

removed question id

Browse Source
This commit is contained in:
Alex Mickelson
2023-10-24 13:45:43 -06:00
parent 3223aef5f3
commit 2b4891c147
16 changed files with 539 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
Management.Web/Shared/Components/Quiz/QuizForm.razor
View File

@@ -1,189 +0,0 @@
@using Management.Web.Shared.Components
@inject QuizEditorContext quizContext
@code {
private Modal? modal { get; set; }
private string name { get; set; } = "";
private string description { get; set; } = "";
protected override void OnInitialized()
{
quizContext.StateHasChanged += reload;
}
private void reload()
{
if (quizContext.Quiz != null)
{
name = quizContext.Quiz.Name;
description = quizContext.Quiz.Description;
modal?.Show();
this.InvokeAsync(this.StateHasChanged);
}
}
public void Dispose()
{
quizContext.StateHasChanged -= reload;
}
private void deleteQuiz()
{
quizContext.DeleteQuiz();
modal?.Hide();
}
private void addQuestion()
{
if(quizContext.Quiz != null)
{
var newQuestion = new LocalQuizQuestion
{
Id = Guid.NewGuid().ToString(),
Points = 1,
};
var newQuiz = quizContext.Quiz with
{
Questions = quizContext.Quiz.Questions.Append(newQuestion).ToArray()
};
quizContext.SaveQuiz(newQuiz);
}
}
private void removeQuestion()
{
if(quizContext.Quiz != null)
{
var newQuestion = new LocalQuizQuestion();
var newQuiz = quizContext.Quiz with
{
Questions = quizContext.Quiz.Questions.Take(quizContext.Quiz.Questions.Count() - 1)
};
quizContext.SaveQuiz(newQuiz);
}
}
private void updateQuestion(LocalQuizQuestion updatedQuestion)
{
if(quizContext.Quiz != null)
{
var newQuestions = quizContext.Quiz.Questions.Select(q =>
q.Id == updatedQuestion.Id
? updatedQuestion
: q
);
var newQuiz = quizContext.Quiz with
{
Questions = newQuestions,
};
quizContext.SaveQuiz(newQuiz);
}
}
private void handleNewName(ChangeEventArgs e)
{
if(quizContext.Quiz != null)
{
var newQuiz = quizContext.Quiz with
{
Name = e.Value?.ToString() ?? ""
};
quizContext.SaveQuiz(newQuiz);
}
}
private void handleNewDescription(ChangeEventArgs e)
{
if(quizContext.Quiz != null)
{
var newQuiz = quizContext.Quiz with
{
Description = e.Value?.ToString() ?? ""
};
quizContext.SaveQuiz(newQuiz);
}
}
private async Task addToCanvas()
{
await quizContext.AddQuizToCanvas();
}
}
<Modal @ref="modal" OnHide="() => quizContext.Quiz = null" >
<Title>
<div class="row justify-content-between">
<div class="col-auto">
@quizContext.Quiz?.Name
</div>
<div class="col-auto me-3">
Points: @quizContext.Quiz?.Questions.Sum(q => q.Points)
</div>
</div>
</Title>
<Body>
@if(quizContext.Quiz != null)
{
<div class="m-1">
<label class="form-label">
Name
</label>
<input
class="form-control"
@bind="name"
@oninput="handleNewName"
/>
</div>
<div class="m-1">
<label class="form-label">
Description
</label>
<textarea
class="form-control"
@bind="description"
@oninput="handleNewDescription"
/>
</div>
<QuizSettings />
@foreach(var (question, i) in quizContext.Quiz.Questions.Select((q, i) => (q, i)))
{
<QuizQuestionForm
@key="@question.Id"
Index="i"
Question="question"
UpdateQuestion="updateQuestion"
/>
}
<button
class="btn btn-outline-danger"
@onclick="removeQuestion"
>
- question
</button>
<button
class="btn btn-outline-primary"
@onclick="addQuestion"
>
+ question
</button>
}
</Body>
<Footer>
<ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirm="deleteQuiz" />
<button
class="btn btn-outline-secondary"
@onclick="addToCanvas"
>
Add to Canvas
</button>
<button
class="btn btn-primary"
@onclick="() => modal?.Hide()"
>
Done
</button>
</Footer>
</Modal>

189
Management.Web/Shared/Components/Quiz/QuizQuestionForm.razor
View File

@@ -1,189 +0,0 @@
@inject QuizEditorContext quizContext
@code {
[Parameter, EditorRequired]
public LocalQuizQuestion Question { get; set; } = default!;
[Parameter, EditorRequired]
public int Index { get; set; } = default!;
[Parameter, EditorRequired]
public Action<LocalQuizQuestion> UpdateQuestion { get; set; } = (_) => {};
protected override void OnParametersSet()
{
if(questionType == string.Empty)
questionType = Question.QuestionType;
if(text == string.Empty)
text = Question.Text;
if(answers.Count() == 0)
answers = Question.Answers;
if (points == 0)
points = Question.Points;
base.OnParametersSet();
}
private string text { get; set; } = string.Empty;
private string questionType { get; set; } = string.Empty;
private int points { get; set; } = 1;
private IEnumerable<LocalQuizQuestionAnswer> answers { get; set; } = Enumerable.Empty<LocalQuizQuestionAnswer>();
private void handleTypeUpdate(string type)
{
if(quizContext.Quiz != null)
{
questionType = type;
var newQuestion = Question with
{
QuestionType = questionType
};
UpdateQuestion(newQuestion);
}
}
private void handlePointsInput(ChangeEventArgs e)
{
if (quizContext.Quiz != null)
{
var pointsString = e.Value?.ToString() ?? "0";
var newPoints = int.Parse(pointsString == string.Empty ? "0" : pointsString);
var newQuestion = Question with
{
Points = newPoints
};
UpdateQuestion(newQuestion);
}
}
private void addAnswer()
{
if(quizContext.Quiz != null)
{
var newAnswer = new LocalQuizQuestionAnswer();
answers = answers.Append(newAnswer);
UpdateQuestion(Question with { Answers = answers });
}
}
private void removeAnswer()
{
if(quizContext.Quiz != null)
{
answers = answers.Take(Question.Answers.Count() - 1);
UpdateQuestion(Question with { Answers = answers });
}
}
private void saveAnswer(LocalQuizQuestionAnswer newAnswer, int index)
{
if(questionType == QuestionType.MULTIPLE_CHOICE && newAnswer.Correct)
{
answers = answers.Select((a, i) =>
index == i
? newAnswer
: a with { Correct = false }
).ToArray();
}
else
{
answers = answers.Select((a, i) =>
index == i
? newAnswer
: a
).ToArray();
}
UpdateQuestion(Question with { Answers = answers });
}
private void handleTextUpdate(ChangeEventArgs e)
{
var newText = e.Value?.ToString() ?? "";
UpdateQuestion(Question with { Text = newText });
}
}
<div class="my-1 p-2 border border-3 rounded">
<div class="row">
<div class="col">
<label
for="question_text"
class="form-label"
>
Question Text
</label>
<textarea
class="form-control"
id="question_text"
name="question_text"
@bind="text"
@oninput="handleTextUpdate"
/>
</div>
<div class="col-auto">
</div>
</div>
@foreach (var typeOption in QuestionType.AllTypes)
{
<div class="form-check">
<input class="form-check-input" type="radio" name="@(Question.Id + "question_type")"
id="@(Question.Id + typeOption)" value="@typeOption" checked="@(typeOption == questionType)"
@onchange="() => handleTypeUpdate(typeOption)">
<label class="form-check-label" for="@(Question.Id + typeOption)">
@typeOption
</label>
</div>
}
<div class="mb-3 row">
<div class="col-auto">
<label
for="exampleInputEmail1"
class="form-label"
>
Points
</label>
<input
type="number"
class="form-control"
id="exampleInputEmail1"
@bind="points"
@oninput="handlePointsInput"
>
</div>
</div>
<div>Answers:</div>
@if(questionType == QuestionType.MULTIPLE_ANSWERS || questionType == QuestionType.MULTIPLE_CHOICE)
{
<button
class="btn btn-outline-danger"
@onclick="removeAnswer"
>
- Remove Answer
</button>
<button
class="btn btn-outline-primary"
@onclick="addAnswer"
>
+ Add Answer
</button>
@foreach(var (answer, i) in answers.Select((a, i) => (a, i)))
{
<EditableQuizAnswer
Answer="answer"
AnswerIndex="i"
QuestionIndex="Index"
SaveAnswer="saveAnswer"
Question="Question"
/>
}
}
<div>
</div>
</div>

69
Management.Web/Shared/Components/Quiz/QuizSettings.razor
View File

@@ -1,69 +0,0 @@
@using Management.Web.Shared.Components
@using Management.Web.Shared.Components.Forms
@inject QuizEditorContext quizContext
@inject CoursePlanner planner
@code {
protected override void OnInitialized()
{
quizContext.StateHasChanged += reload;
}
private void reload()
{
if (quizContext.Quiz != null)
{
if (lockAt == null)
lockAt = quizContext.Quiz.LockAt;
if (!shuffleAnswers)
shuffleAnswers = quizContext.Quiz.ShuffleAnswers;
if (!oneQuestionAtATime)
oneQuestionAtATime = quizContext.Quiz.OneQuestionAtATime;
if (allowedAttempts == 0)
allowedAttempts = quizContext.Quiz.AllowedAttempts;
this.InvokeAsync(this.StateHasChanged);
}
}
public void Dispose()
{
quizContext.StateHasChanged -= reload;
}
private DateTime? lockAt { get; set; }
private bool shuffleAnswers { get; set; }
private bool oneQuestionAtATime { get; set; }
private int allowedAttempts { get; set; }
private void setAssignmentGroup(LocalAssignmentGroup? group)
{
if(quizContext.Quiz == null)
return;
var newQuiz = quizContext.Quiz with
{
LocalAssignmentGroupName = group?.Name
};
quizContext.SaveQuiz(newQuiz);
}
private LocalAssignmentGroup? selectedAssignmentGroup =>
planner
.LocalCourse?
.Settings
.AssignmentGroups
.FirstOrDefault(g => g.Name == quizContext.Quiz?.LocalAssignmentGroupName);
}
@if(planner.LocalCourse != null )
{
<div>
<ButtonSelect
Label="Assignment Group"
Options="planner.LocalCourse.Settings.AssignmentGroups"
GetName="(g) => g?.Name"
OnSelect="(g) => setAssignmentGroup(g)"
SelectedOption="selectedAssignmentGroup"
/>
</div>
}

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

@@ -1,6 +1,6 @@
@using LocalModels
@inject YamlManager yamlManager
@inject FileStorageManager fileStorageManager
@inject CoursePlanner planner
@inject NavigationManager Navigation
@inject ILogger<CurrentFiles> logger
@@ -12,7 +12,7 @@
public IEnumerable<LocalCourse>? localCourses { get; set; }
protected override async Task OnParametersSetAsync()
{
localCourses = await yamlManager.LoadSavedCourses();
localCourses = await fileStorageManager.LoadSavedCourses();
}
void handleClick(MouseEventArgs e, LocalCourse course)

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

@@ -6,7 +6,7 @@
@using LocalModels
@inject CanvasService canvas
@inject YamlManager yamlManager
@inject FileStorageManager fileStorageManager
@code {
@@ -15,18 +15,18 @@
private bool loadingTerms = false;
private bool loadingCourses = false;
public IEnumerable<LocalCourse>? localCourses { get; set; }
private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private IEnumerable<CourseModel>? courses { get; set;} = null;
private IEnumerable<EnrollmentTermModel>? terms { get; set; } = null;
private IEnumerable<CourseModel>? courses { get; set; } = null;
private ulong? _selectedTermId { get; set; }
private ulong? selectedTermId
{
private ulong? selectedTermId
{
get => _selectedTermId;
set
set
{
_selectedTermId = value;
this.InvokeAsync(updateCourses);
@* updateCourses(); *@
}
}
}
private EnrollmentTermModel? selectedTerm
{
@@ -34,16 +34,16 @@
}
private ulong? _selectedCourseId { get; set; }
private ulong? selectedCourseId
private ulong? selectedCourseId
{
get => _selectedCourseId;
set
set
{
_selectedCourseId = value;
}
}
private CourseModel? selectedCourse
private CourseModel? selectedCourse
{
get => courses?.First(c => c.Id == selectedCourseId);
}
@@ -56,32 +56,33 @@
}
private async Task YamlTrigger()
{
if(selectedCourse != null)
if (selectedCourse != null)
{
var course = new LocalCourse
{
Modules = new LocalModule[] {},
Settings = new LocalCourseSettings() {
Name = selectedCourse.Name,
CanvasId = selectedCourse.Id,
StartDate = selectedTerm?.StartAt ?? new DateTime(),
EndDate = selectedTerm?.EndAt ?? new DateTime(),
DaysOfWeek = days,
}
};
await yamlManager.SaveCourseAsync(course);
{
Modules = new LocalModule[] { },
Settings = new LocalCourseSettings()
{
Name = selectedCourse.Name,
CanvasId = selectedCourse.Id,
StartDate = selectedTerm?.StartAt ?? new DateTime(),
EndDate = selectedTerm?.EndAt ?? new DateTime(),
DaysOfWeek = days,
}
};
await fileStorageManager.SaveCourseAsync(course);
NewFileCreated();
}
await updateCourses();
}
private async Task updateCourses()
{
if(selectedTermId != null)
if (selectedTermId != null)
{
loadingCourses = true;
localCourses = await yamlManager.LoadSavedCourses();
localCourses = await fileStorageManager.LoadSavedCourses();
var storedCourseIds = localCourses.Select(c => c.Settings.CanvasId);
var allCourses = await canvas.GetCourses((ulong)selectedTermId);
courses = allCourses.Where(c => !storedCourseIds.Contains(c.Id));
@@ -94,7 +95,7 @@
}
}
@if(loadingTerms)
@if (loadingTerms)
{
<Spinner />
}
@@ -102,13 +103,13 @@
@if (terms != null)
{
<div class="row justify-content-center">
<div class="col-auto">
<label for="termselect">Select Term:</label>
<select id="termselect" class="form-select" @bind="selectedTermId">
@foreach (var term in terms)
{
<option value="@term.Id">@term.Name</option>
}
<div class="col-auto">
<label for="termselect">Select Term:</label>
<select id="termselect" class="form-select" @bind="selectedTermId">
@foreach (var term in terms)
{
<option value="@term.Id">@term.Name</option>
}
</select>
</div>
</div>
@@ -117,18 +118,18 @@
@if (selectedTerm is not null)
{
@if(loadingCourses)
@if (loadingCourses)
{
<Spinner />
}
@if(courses != null)
@if (courses != null)
{
<div class="row justify-content-center m-3">
<div class="col-auto">
<label for="courseselect">Select Course:</label>
<select id="courseselect" class="form-select" @bind="selectedCourseId">
@foreach (var course in courses)
<div class="col-auto">
<label for="courseselect">Select Course:</label>
<select id="courseselect" class="form-select" @bind="selectedCourseId">
@foreach (var course in courses)
{
<option value="@course.Id">@course.Name</option>
}
@@ -140,9 +141,9 @@
<h5 class="text-center mt-3">Select Days Of Week</h5>
<div class="row m-3">
@foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek)))
{
<div class="col">
<button class="@(
{
<div class="col">
<button class="@(
days.Contains(day)
? "btn btn-secondary"
: "btn btn-outline-secondary"
@@ -152,19 +153,16 @@
else
days.Add(day);
}">
@day
</button>
</div>
}
@day
</button>
</div>
}
</div>
<div class="text-center">
<button
@onclick="YamlTrigger"
class="btn btn-primary"
>
Save Yaml File
</button>
</div>
<div class="text-center">
<button @onclick="YamlTrigger" class="btn btn-primary">
Save Yaml File
</button>
</div>
}

19
Management.Web/Shared/Module/NewAssignment.razor
View File

@@ -1,4 +1,5 @@
@using Management.Web.Shared.Components
@using Management.Web.Shared.Components.Forms
@inject CoursePlanner planner
@@ -28,7 +29,8 @@
LockAt = null,
DueAt = DateTime.Now,
PointsPossible = 10,
SubmissionTypes = new string[] { SubmissionType.ONLINE_TEXT_ENTRY }
SubmissionTypes = new string[] { SubmissionType.ONLINE_TEXT_ENTRY },
LocalAssignmentGroupId = selectedAssignmentGroup?.Id,
};
if(planner.LocalCourse != null)
@@ -49,7 +51,14 @@
Name = "";
modal?.Hide();
}
private void setAssignmentGroup(LocalAssignmentGroup? group)
{
selectedAssignmentGroup = group;
}
private LocalAssignmentGroup? selectedAssignmentGroup { get; set; }
}
<button
class="btn btn-outline-secondary"
@onclick="() => modal?.Show()"
@@ -64,6 +73,14 @@
<label for="Assignment Name">Name</label>
<input id="moduleName" class="form-control" @bind="Name" />
</form>
<br>
<label class="form-label">Assignment Group</label>
<ButtonSelect
Label="Assignment Group"
Options="planner.LocalCourse.Settings.AssignmentGroups"
GetName="(g) => g?.Name"
OnSelect="(g) => setAssignmentGroup(g)"
/>
</Body>
<Footer>
<button

5
Management.Web/Shared/Module/NewQuiz.razor
View File

@@ -48,7 +48,6 @@
modal?.Hide();
}
private void setAssignmentGroup(LocalAssignmentGroup? group)
{
selectedAssignmentGroup = group;
@@ -69,9 +68,9 @@
<form @onsubmit:preventDefault="true" @onsubmit="submitHandler">
<label for="Assignment Name">Name</label>
<input id="moduleName" class="form-control" @bind="Name" />
<br>
<label class="form-label">Assignment Group</label>
</form>
<br>
<label class="form-label">Assignment Group</label>
<ButtonSelect
Label="Assignment Group"
Options="planner.LocalCourse.Settings.AssignmentGroups"