Skip to content

DLSV2-472 Adds verified result warning to self assessment questions #854

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 2 commits into from
Jan 12, 2022
Merged

DLSV2-472 Adds verified result warning to self assessment questions #854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a48003
DLSV2-472 Adds conditional warning to competency assessment question
kevwhitt-hee Jan 12, 2022
be0914f
DLSV2-472 Moves warning above comments
kevwhitt-hee Jan 12, 2022
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
209 changes: 111 additions & 98 deletions ...earningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,138 +1,151 @@
@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
@model SelfAssessmentCompetencyViewModel
@{
Layout = "SelfAssessments/_Layout";
ViewData["Title"] = "Self Assessment";
ViewData["SelfAssessmentTitle"] = @Model.Assessment.Name;
Layout = "SelfAssessments/_Layout";
ViewData["Title"] = "Self Assessment";
ViewData["SelfAssessmentTitle"] = @Model.Assessment.Name;
}
@section breadcrumbs {
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-action="SelfAssessment" asp-route-selfAssessmentId="@Model.Assessment.Id">@Model.Assessment.Name</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural()" asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">@Model.VocabPlural()</a></li>
<li class="nhsuk-breadcrumb__item">@Model.Competency.Vocabulary @Model.CompetencyNumber</li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-action="SelfAssessment" asp-route-selfAssessmentId="@Model.Assessment.Id">@Model.Assessment.Name</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural()" asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">@Model.VocabPlural()</a></li>
<li class="nhsuk-breadcrumb__item">@Model.Competency.Vocabulary @Model.CompetencyNumber</li>
}
@section mobilebacklink
{
<p class="nhsuk-breadcrumb__back">
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__backlink" asp-action="SelfAssessmentOverview"
asp-route-vocabulary="@Model.VocabPlural()"
asp-route-selfAssessmentId="@Model.Assessment.Id"
asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID"
asp-fragment="comp-@Model.CompetencyNumber">
Back to @Model.VocabPlural()
Back to @Model.VocabPlural()
</a>
</p>
</p>
}
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
<link rel="stylesheet" href="@Url.Content("~/css/shared/searchableElements/pagination.css")" asp-append-version="true">
<h1 class="competency-group-header nhsuk-u-font-size-32">@Model.Competency.CompetencyGroup</h1>
<div class=" nhsuk-u-margin-top-8 nhsuk-u-margin-bottom-8">
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
<link rel="stylesheet" href="@Url.Content("~/css/shared/searchableElements/pagination.css")" asp-append-version="true">
<h1 class="competency-group-header nhsuk-u-font-size-32">@Model.Competency.CompetencyGroup</h1>
<div class=" nhsuk-u-margin-top-8 nhsuk-u-margin-bottom-8">
@if (Model.Competency.Description != null && Model.Assessment.UseDescriptionExpanders && !Model.Competency.AlwaysShowDescription)
{
<details class="nhsuk-details">
<summary class="nhsuk-details__summary">
<h2 class="nhsuk-u-font-size-24 nhsuk-u-margin-bottom-0">
<span class="nhsuk-details__summary-text">
@Model.Competency.Name
</span>
</h2>
</summary>
<div class="nhsuk-details__text">
@(Html.Raw(@Model.Competency.Description))
</div>
</details>
<details class="nhsuk-details">
<summary class="nhsuk-details__summary">
<h2 class="nhsuk-u-font-size-24 nhsuk-u-margin-bottom-0">
<span class="nhsuk-details__summary-text">
@Model.Competency.Name
</span>
</h2>
</summary>
<div class="nhsuk-details__text">
@(Html.Raw(@Model.Competency.Description))
</div>
</details>
}
else
{
<h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
@Model.Competency.Name
</h2>
@if (Model.Competency.Description != null)
{
<p class="nhsuk-body-l">
@(Html.Raw(@Model.Competency.Description))
</p>
}
<h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
@Model.Competency.Name
</h2>
@if (Model.Competency.Description != null)
{
<p class="nhsuk-body-l">
@(Html.Raw(@Model.Competency.Description))
</p>
}
}
</div>
<form asp-action="SelfAssessmentCompetency" asp-route-competencyNumber="@Model.CompetencyNumber" asp-route-competencyId="@Model.Competency.Id" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID">
</div>
<form asp-action="SelfAssessmentCompetency" asp-route-competencyNumber="@Model.CompetencyNumber" asp-route-competencyId="@Model.Competency.Id" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID">
@foreach (var question in @Model.Competency.AssessmentQuestions.Select((value, i) => new { i, value }))
{
if (question.value.AssessmentQuestionInputTypeID == 2)
{
<partial name="SelfAssessments/_SliderQuestion" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
else
{
<partial name="SelfAssessments/_RadioQuestion" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
@if (question.value.IncludeComments)
{
<partial name="SelfAssessments/_CommentsInput" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
if (question.value.AssessmentQuestionInputTypeID == 2)
{
<partial name="SelfAssessments/_SliderQuestion" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
else
{
<partial name="SelfAssessments/_RadioQuestion" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
@if (question.value.SignedOff != null)
if ((bool)question.value.SignedOff)
{
<div class="nhsuk-warning-callout">
<h3 class="nhsuk-warning-callout__label">
<span role="text">
<span class="nhsuk-u-visually-hidden">Important: </span>
Response verified
</span>
</h3>
<p>Your self assessment response against this question has been verified. Changing your response will reset verification.</p>
</div>
}
@if (question.value.IncludeComments)
{
<partial name="SelfAssessments/_CommentsInput" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
}
}
<input type="hidden" name="competencyGroupId" value="@Model.Competency.CompetencyGroupID" />
<div class="nhsuk-u-margin-top-4">
Question @Model.CompetencyNumber of @Model.TotalNumberOfCompetencies
Question @Model.CompetencyNumber of @Model.TotalNumberOfCompetencies
</div>
<button class="nhsuk-button nhsuk-u-margin-top-1" type="submit">
@(Model.Assessment.LinearNavigation ? "Save and continue" : "Submit")
@(Model.Assessment.LinearNavigation ? "Save and continue" : "Submit")
</button>
</form>
<div class="nhsuk-grid-row">
</form>
<div class="nhsuk-grid-row">
@if (Model.Assessment.LinearNavigation)
{
<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
<div class="nhsuk-pagination__list">
<div class="pagination-button-container">
<div class="nhsuk-pagination-item--previous" )>
<a class="nhsuk-back-link__link"
asp-action=@(Model.CompetencyNumber == 1 ? "SelfAssessment" : "SelfAssessmentCompetency")
asp-route-selfAssessmentId="@Model.Assessment.Id"
asp-route-competencyNumber=@(Model.CompetencyNumber == 1 ? "" : (Model.CompetencyNumber - 1).ToString())>
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
@(@Model.CompetencyNumber == 1 ? "Go back" : "Previous " + Model.Competency.Vocabulary.ToLower() )
</a>
</div>
</div>
<div class="page-indicator-container">
<a class="nhsuk-back-link__link"
asp-action="SelfAssessmentOverview"
asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
Return to @Model.VocabPlural()
</a>
</div>
<div class="pagination-button-container">
<div class="nhsuk-pagination-item--next">
<a class="nhsuk-back-link__link skip-link"
asp-action="SelfAssessmentCompetency"
asp-route-selfAssessmentId="@Model.Assessment.Id"
asp-route-competencyNumber="@(Model.CompetencyNumber + 1)">
Skip
<svg class="nhsuk-icon nhsuk-icon__chevron-left" id="skip-arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
</svg>
</a>
<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
<div class="nhsuk-pagination__list">
<div class="pagination-button-container">
<div class="nhsuk-pagination-item--previous" )>
<a class="nhsuk-back-link__link"
asp-action=@(Model.CompetencyNumber == 1 ? "SelfAssessment" : "SelfAssessmentCompetency")
asp-route-selfAssessmentId="@Model.Assessment.Id"
asp-route-competencyNumber=@(Model.CompetencyNumber == 1 ? "" : (Model.CompetencyNumber - 1).ToString())>
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
@(@Model.CompetencyNumber == 1 ? "Go back" : "Previous " + Model.Competency.Vocabulary.ToLower() )
</a>
</div>
</div>
<div class="page-indicator-container">
<a class="nhsuk-back-link__link"
asp-action="SelfAssessmentOverview"
asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
Return to @Model.VocabPlural()
</a>
</div>
<div class="pagination-button-container">
<div class="nhsuk-pagination-item--next">
<a class="nhsuk-back-link__link skip-link"
asp-action="SelfAssessmentCompetency"
asp-route-selfAssessmentId="@Model.Assessment.Id"
asp-route-competencyNumber="@(Model.CompetencyNumber + 1)">
Skip
<svg class="nhsuk-icon nhsuk-icon__chevron-left" id="skip-arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
</svg>
</a>
</div>
</div>
</div>
</div>
</div>
</nav>
</nav>
}
else
{
<div class="nhsuk-back-link nhsuk-grid-column-full">
<a class="nhsuk-back-link__link"
<div class="nhsuk-back-link nhsuk-grid-column-full">
<a class="nhsuk-back-link__link"
asp-action="SelfAssessmentOverview"
asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>Return to @Model.VocabPlural()
</a>
</div>
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>Return to @Model.VocabPlural()
</a>
</div>
}
</div>
</div>

@section scripts {
<script src="@Url.Content("~/js/learningPortal/selfAssessment.js")" asp-append-version="true"></script>
@section scripts {
<script src="@Url.Content("~/js/learningPortal/selfAssessment.js")" asp-append-version="true"></script>
}