Skip to content

DLSV2-578 Competency tags missing on the Self Assessment Results page #1277

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 1 commit into from
Jul 11, 2022
Merged

DLSV2-578 Competency tags missing on the Self Assessment Results page #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ int resultId
var delegateSelfAssessment =
supervisorService.GetSelfAssessmentBaseByCandidateAssessmentId(candidateAssessmentId);
var assessmentQuestion = GetLevelDescriptorsForAssessmentQuestion(competency.AssessmentQuestions.First());
competency.CompetencyFlags = frameworkService.GetSelectedCompetencyFlagsByCompetecyId(competency.Id);
var model = new ReviewCompetencySelfAsessmentViewModel()
{
DelegateSelfAssessment = delegateSelfAssessment,
Expand Down
96 changes: 51 additions & 45 deletions DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,75 +58,81 @@
<dl class="nhsuk-summary-list">

<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.Competency.Vocabulary
</dt>
<dd class="nhsuk-summary-list__value">
@Model.Competency.Name
</dd>

<dt class="nhsuk-summary-list__key">
@Model.Competency.Vocabulary
</dt>
<dd class="nhsuk-summary-list__value">
@Model.Competency.Name
</dd>
</div>
@if (Model.Competency.Description != null)
@if (Model.Competency.CompetencyFlags.Any())
{
<div class="nhsuk-summary-list__row">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Description
Flags
</dt>
<dd class="nhsuk-summary-list__value">
@Html.Raw(Model.Competency.Description)
<partial name="_CompetencyFlags" model="Model.Competency.CompetencyFlags" />
</dd>
</div>
}
@if (Model.Competency.Description != null)
{
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Description
</dt>
<dd class="nhsuk-summary-list__value">
@Html.Raw(Model.Competency.Description)
</dd>
</div>
}
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Question
</dt>
<dd class="nhsuk-summary-list__value">
@Model.Competency.AssessmentQuestions.First().Question
</dd>

<dt class="nhsuk-summary-list__key">
Question
</dt>
<dd class="nhsuk-summary-list__value">
@Model.Competency.AssessmentQuestions.First().Question
</dd>
</div>

<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Learner response
</dt>
<dd class="nhsuk-summary-list__value">
<partial name="Shared/_AssessmentQuestionResponse" model="Model.Competency.AssessmentQuestions.First()" />
</dd>

<dt class="nhsuk-summary-list__key">
Learner response
</dt>
<dd class="nhsuk-summary-list__value">
<partial name="Shared/_AssessmentQuestionResponse" model="Model.Competency.AssessmentQuestions.First()" />
</dd>
</div>
@if (Model.Competency.AssessmentQuestions.First().ResultRAG > 0)
{
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Role expectations
</dt>
<dd class="nhsuk-summary-list__value">
@(Model.Competency.AssessmentQuestions.First().ResultRAG == 1 ? "Not meeting" : Model.Competency.AssessmentQuestions.First().ResultRAG == 2 ? "Partially meeting" : "Fully meeting" )
</dd>

<dt class="nhsuk-summary-list__key">
Role expectations
</dt>
<dd class="nhsuk-summary-list__value">
@(Model.Competency.AssessmentQuestions.First().ResultRAG == 1 ? "Not meeting" : Model.Competency.AssessmentQuestions.First().ResultRAG == 2 ? "Partially meeting" : "Fully meeting" )
</dd>
</div>
}
@if (Model.Competency.AssessmentQuestions.First().IncludeComments)
{
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Comments
</dt>
<dd class="nhsuk-summary-list__value">
@Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments)
</dd>
<dt class="nhsuk-summary-list__key">
Comments
</dt>
<dd class="nhsuk-summary-list__value">
@Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments)
</dd>
</div>
}
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Status
</dt>
<dd class="nhsuk-summary-list__value">
<partial name="Shared/_AssessmentQuestionStatusTag" model="Model.Competency.AssessmentQuestions.First()" />
</dd>

<dt class="nhsuk-summary-list__key">
Status
</dt>
<dd class="nhsuk-summary-list__value">
<partial name="Shared/_AssessmentQuestionStatusTag" model="Model.Competency.AssessmentQuestions.First()" />
</dd>
</div>
</dl>
@if (errorHasOccurred)
Expand Down