fixed height on assignment edit page

This commit is contained in:
2023-12-05 16:13:24 -07:00
parent 647423ff1a
commit 6e49c79cbd
4 changed files with 25 additions and 45 deletions

View File

@@ -55,14 +55,14 @@
} }
} }
<div style="height: 100vh;" class="m-0 p-1"> <div style="height: 100vh;" class="m-0 p-1 d-flex flex-row">
@if (loading) @if (loading)
{ {
<Spinner /> <Spinner />
} }
@if (planner.LocalCourse != null && assignmentContext.Assignment != null) @if (planner.LocalCourse != null && assignmentContext.Assignment != null)
{ {
<AssignmentForm /> <AssignmentForm />
} }
</div> </div>

View File

@@ -143,7 +143,7 @@
private async Task deleteFromCanvas() private async Task deleteFromCanvas()
{ {
if (assignmentInCanvas == null if (assignmentInCanvas == null
|| planner.LocalCourse.Settings.CanvasId == null || planner?.LocalCourse.Settings.CanvasId == null
|| assignmentContext.Assignment == null || assignmentContext.Assignment == null
) )
return; return;
@@ -160,30 +160,27 @@
} }
} }
<div class="d-flex flex-column h-100"> <div class="d-flex flex-column p-2 h-100" style="height: 100%;" >
<div> <div>
@assignmentContext.Assignment?.Name @assignmentContext.Assignment?.Name
</div> </div>
<div class="flex-grow-1 d-flex flex-column">
<section class="flex-1 p-1 border rounded-4 bg-dark-subtle" style="min-height: 0;">
@if (assignmentContext.Assignment != null) @if (assignmentContext.Assignment != null)
{ {
@* <ButtonSelect <AssignmentMarkdownEditor />
Label="Assignment Group"
Options="planner.LocalCourse?.Settings.AssignmentGroups"
GetName="(g) => g?.Name"
OnSelect="(g) => setAssignmentGroup(g)"
SelectedOption="selectedAssignmentGroup"
/> *@
<div class="m-1 flex-grow-1">
<AssignmentMarkdownEditor />
</div>
} }
</div> </section>
<div class="d-flex justify-content-end p-3"> <div class="d-flex justify-content-end p-3">
@if (addingAssignmentToCanvas || deletingAssignmentFromCanvas)
{
<div>
<Spinner />
</div>
}
<ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" /> <ConfirmationModal Label="Delete" Class="btn btn-danger" OnConfirmAsync="HandleDelete" />
<button <button
class="btn btn-outline-secondary mx-3" class="btn btn-outline-secondary mx-3"
disabled="@(addingAssignmentToCanvas || deletingAssignmentFromCanvas)" disabled="@(addingAssignmentToCanvas || deletingAssignmentFromCanvas)"
@@ -223,10 +220,5 @@
</button> </button>
</div> </div>
@if (addingAssignmentToCanvas || deletingAssignmentFromCanvas)
{
<div>
<Spinner />
</div>
}
</div> </div>

View File

@@ -67,17 +67,10 @@
{ {
<div class="row h-100"> <div class="row h-100">
<div class="col-6"> <div class="col-6">
@* <textarea
id="description"
class="form-control h-100"
rows=12
@bind="description"
@oninput="handleNewDescription"
/> *@
<MonacoTextArea Value="@rawText" OnChange="@handleChange" /> <MonacoTextArea Value=@rawText OnChange=@handleChange />
</div> </div>
<div class="col-6"> <div class="col-6 overflow-y-auto h-100" >
@if (error != null) @if (error != null)
{ {
<p class="text-danger text-truncate">Error: @error</p> <p class="text-danger text-truncate">Error: @error</p>
@@ -99,7 +92,7 @@
@(preview) @(preview)
</div> </div>
<hr> <hr>
<RubricDisplay /> <RubricDisplay />
</div> </div>
</div> </div>
} }

View File

@@ -57,11 +57,6 @@
<div class="d-flex flex-row h-100 p-2"> <div class="d-flex flex-row h-100 p-2">
<div class="row flex-grow-1"> <div class="row flex-grow-1">
<div class="col-6"> <div class="col-6">
@* <textarea
class="form-control h-100"
@bind="quizMarkdownInput"
@bind:event="oninput"
/> *@
<MonacoTextArea <MonacoTextArea
Value="@quizMarkdownInput" Value="@quizMarkdownInput"
OnChange="@((v) => quizMarkdownInput = v)" OnChange="@((v) => quizMarkdownInput = v)"