From d2fbb8acd1867f1c225427ff81161909b3b1e067 Mon Sep 17 00:00:00 2001
From: Daniel Manta <Daniel.Manta@hee.nhs.uk>
Date: Fri, 8 Jul 2022 16:26:18 +0100
Subject: [PATCH] DLSV2-578 Competency tags missing on the Self Assessment
 Results page

---
 .../SupervisorController/Supervisor.cs        |  1 +
 .../ReviewCompetencySelfAsessment.cshtml      | 96 ++++++++++---------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
index 3249387f20..af9bfadff6 100644
--- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
+++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
@@ -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,
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml
index 787415fe40..95c016e91c 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml
@@ -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)