Skip to content

DLSV2-301 Adds back navigation to the add/edit assessment question flow #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 8, 2021
Merged

DLSV2-301 Adds back navigation to the add/edit assessment question flow #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d8693a
DLSV2-300 Imports searchable element and heading button css into fram…
kevwhitt-hee Sep 7, 2021
5033c4f
Merge branch 'master' into Develop/Features/CompetencyFrameworks
kevwhitt-hee Sep 7, 2021
dade4b0
DLSV2-299 Migration to fix broken FK constraint
kevwhitt-hee Sep 8, 2021
1c56762
DLSV2-301 Adds back button navigation to the assessment question flow
kevwhitt-hee Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/202109080846_FixCompetencyIDFKConstraint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202109080846)]
public class FixCompetencyIDFKConstraint : Migration
{
public override void Up()
{
Delete.ForeignKey("FK_CompetencyAssessmentQuestions_AssessmentQuestionID_Competencies_ID").OnTable("CompetencyAssessmentQuestions");
Alter.Column("AssessmentQuestionID").OnTable("CompetencyAssessmentQuestions").AsInt32().NotNullable().ForeignKey("AssessmentQuestions", "ID");
}
public override void Down()
{
Delete.ForeignKey("FK_CompetencyAssessmentQuestions_AssessmentQuestionID_AssessmentQuestionID_ID").OnTable("CompetencyAssessmentQuestions");
Alter.Column("AssessmentQuestionID").OnTable("CompetencyAssessmentQuestions").AsInt32().NotNullable().ForeignKey("Competencies", "ID");
}
}
}
3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "~nhsuk-frontend/packages/core/all";

@import "../shared/headingButtons";
@import "../shared/searchableElements/searchableElements";
$nhs-dark-grey: #425563;

.tags {
Expand Down
3 changes: 3 additions & 0 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionConfirm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
<div class="nhsuk-card nhsuk-u-padding-4">
<partial name="../Shared/_AssessmentQuestionPreview.cshtml" model="Model.AssessmentQuestion" />
</div>
<a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionOptions" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
@if (Model.FrameworkCompetencyId == 0 && Model.AssessmentQuestion.Id == 0)
{
@if (Model.DetailFramework.PublishStatusID == 3)
Expand Down
33 changes: 21 additions & 12 deletions ...LearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionLevelDescriptor.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,14 @@
</div>
</nav>
}
<h1>@Model.AssessmentQuestionDetail.Question</h1>
<form method="post">
@if (!ViewData.ModelState.IsValid)
{
<partial name="_ErrorSummary" />
}
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
<p class="nhsuk-fieldset__heading">
@Model.AssessmentQuestionDetail.Question
</p>
<p class="nhsuk-fieldset__heading">
@if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 3)
{
Expand Down Expand Up @@ -77,11 +75,11 @@
{

if (Model.LevelDescriptor.LevelValue == 0)
{
{
<text>No or false option label
</text>
}
else
else
{
<text>Yes or true option label
</text>
Expand All @@ -95,10 +93,9 @@
<div class="nhsuk-hint" id="tb-levelLabel-@Model.LevelDescriptor.LevelValue-hint">
How will this radio button option be labelled?
</div>
<span nhs-validation-for="LevelDescriptor.LevelLabel"></span>
<input class="nhsuk-input" id="tb-levelLabel-@Model.LevelDescriptor.LevelValue" asp-for="@Model.LevelDescriptor.LevelLabel" error-class-toggle="nhsuk-input--error" name="LevelLabel" type="text">
</nhs-form-group>
<div class="nhsuk-form-group">
<nhs-form-group nhs-validation-for="LevelDescriptor.LevelDescription">
<label class="nhsuk-label" for="tb-levelDescription-@Model.LevelDescriptor.LevelValue">
@if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 3)
{
Expand All @@ -123,11 +120,23 @@
What additional description (if any) should be provided for this radio button option?
</div>
<textarea class="nhsuk-input text-area-edit-90" placeholder="Optional" id="tb-levelDescription-@Model.LevelDescriptor.LevelValue" asp-for="@Model.LevelDescriptor.LevelDescription" name="LevelDescription" type="text"></textarea>
</div>
<input name="ID" type="hidden" asp-for="@Model.LevelDescriptor.ID" />
<input name="LevelValue" type="hidden" asp-for="@Model.LevelDescriptor.LevelValue" />
<input name="UpdatedByAdminID" type="hidden" asp-for="@Model.LevelDescriptor.UpdatedByAdminID" />
</fieldset>
</nhs-form-group>
<input name="ID" type="hidden" asp-for="@Model.LevelDescriptor.ID" />
<input name="LevelValue" type="hidden" asp-for="@Model.LevelDescriptor.LevelValue" />
<input name="UpdatedByAdminID" type="hidden" asp-for="@Model.LevelDescriptor.UpdatedByAdminID" />
</fieldset>
@if (Model.LevelDescriptor.LevelValue > Model.AssessmentQuestionDetail.MinValue)
{
<a class="nhsuk-button nhsuk-button--secondary" asp-action="AssessmentQuestionLevelDescriptor" asp-route-level="@((int)Model.LevelDescriptor.LevelValue-1)" asp-route-frameworkId="@Model.FrameworkId" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
}
else
{
<a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionScoring" asp-route-frameworkId="@Model.FrameworkId" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
}
<button class="nhsuk-button" type="submit">
Next
</button>
Expand Down
22 changes: 17 additions & 5 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionOptions.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@
</div>
</nav>
}
<h1>@Model.AssessmentQuestionDetail.Question</h1>
<form method="post">
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
<h1 class="nhsuk-fieldset__heading">
@Model.AssessmentQuestionDetail.Question - Options
</h1>
<span class="nhsuk-fieldset__heading">
Assessment Question Options
</span>
</legend>
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="tb-scoringInstructions">
Expand Down Expand Up @@ -79,8 +80,6 @@
</div>
</div>
</div>
@*<input name="IncludeComments" type="hidden" asp-for="AssessmentQuestionDetail.IncludeComments" />
<input name="ScoringInstructions" type="hidden" asp-for="AssessmentQuestionDetail.ScoringInstructions" />*@
<input name="ID" type="hidden" asp-for="AssessmentQuestionDetail.ID" />
<input name="MinValue" type="hidden" asp-for="AssessmentQuestionDetail.MinValue" />
<input name="MaxValue" type="hidden" asp-for="AssessmentQuestionDetail.MaxValue" />
Expand All @@ -92,6 +91,19 @@
<input name="AddedByAdminId" type="hidden" asp-for="AssessmentQuestionDetail.AddedByAdminId" />
<input name="UserIsOwner" type="hidden" asp-for="AssessmentQuestionDetail.UserIsOwner" />
</fieldset>
@if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID != 2)
{
<a class="nhsuk-button nhsuk-button--secondary" asp-action="AssessmentQuestionLevelDescriptor" asp-route-level="@Model.AssessmentQuestionDetail.MaxValue" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
}
else
{
<a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionScoring" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
}

<button class="nhsuk-button" type="submit">
Next
</button>
Expand Down
18 changes: 10 additions & 8 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionScoring.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
</div>
</nav>
}

<h1>@Model.AssessmentQuestionDetail.Question</h1>
<form method="post">
<fieldset class="nhsuk-fieldset">
@if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 2)
{
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
<h1 class="nhsuk-fieldset__heading">
@Model.AssessmentQuestionDetail.Question - @Model.AssessmentQuestionDetail.Question - Scoring range
</h1>
<span class="nhsuk-fieldset__heading">
Scoring range
</span>
</legend>
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="tb-minValue">
Expand Down Expand Up @@ -90,9 +90,9 @@
else
{
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
<h1 class="nhsuk-fieldset__heading">
@Model.AssessmentQuestionDetail.Question - Radio button options
</h1>
<span class="nhsuk-fieldset__heading">
Radio button options
</span>
</legend>
<input name="MinValue" type="hidden" asp-for="AssessmentQuestionDetail.MinValue" value="1" />
<input name="MinValueDescription" type="hidden" asp-for="AssessmentQuestionDetail.MinValueDescription" />
Expand All @@ -113,7 +113,9 @@
<input name="IncludeComments" type="hidden" asp-for="AssessmentQuestionDetail.IncludeComments" />
<input name="ScoringInstructions" type="hidden" asp-for="AssessmentQuestionDetail.ScoringInstructions" />
</fieldset>

<a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestion" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
Back
</a>
<button class="nhsuk-button" type="submit">
Next
</button>
Expand Down