From e8e16b77bcdfea253faf0f825cc7fbe00dc23104 Mon Sep 17 00:00:00 2001
From: martinfoster-hee <martin.foster2@hee.nhs.uk>
Date: Tue, 22 Nov 2022 12:29:37 +0000
Subject: [PATCH 1/4] Fixed errant filter mechanism for
 Self-Assessed(Confirmation Not Requested).

---
 DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs b/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
index 97d03173be..c496ddd843 100644
--- a/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
+++ b/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
@@ -44,8 +44,7 @@ private static void ApplyResponseStatusFilters(ref IEnumerable<Competency> compe
                                        let searchTextMatchesCompetencyName = wordsInSearchText.Any(w => c.Name?.Contains(w, StringComparison.CurrentCultureIgnoreCase) ?? false)
                                        let responseStatusFilterMatchesAnyQuestion =
                                           (filters.Contains((int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment) && c.AssessmentQuestions.Any(q => q.ResultId == null))
-                                       || (filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) && c.AssessmentQuestions.Any(q => q.ResultId != null && q.ResultRAG > 1 &&
-                                              !(q.Verified == null && q.Requested != null) && !(q.Verified.HasValue && q.SignedOff != null)))
+                                       || (filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) && c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null))
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRequested) && c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null))
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true))
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.Verified) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff == true))

From 205e9bd048b189c539ea32edef828acae384ae68 Mon Sep 17 00:00:00 2001
From: martinfoster-hee <martin.foster2@hee.nhs.uk>
Date: Tue, 22 Nov 2022 12:30:24 +0000
Subject: [PATCH 2/4] Fixed ui typo issue.

---
 .../SelfAssessments/ReviewConfirmationRequests.cshtml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml
index e2aad2be2b..117c4bb159 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml
@@ -58,7 +58,7 @@
       {
       <tr role="row" class="nhsuk-table__row">
         <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Comptenecy </span>
+          <span class="nhsuk-table-responsive__heading">Competency </span>
           @competency.Name
         </td>
         <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">

From c0f2dc6db1fa27c1fafa32a397a9bd46da87d34c Mon Sep 17 00:00:00 2001
From: martinfoster-hee <martin.foster2@hee.nhs.uk>
Date: Tue, 22 Nov 2022 14:29:09 +0000
Subject: [PATCH 3/4] Fixed mobile v desktop text consistency.

---
 .../SelfAssessments/VerificationPickResults.cshtml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/VerificationPickResults.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/VerificationPickResults.cshtml
index 1d0a5581d8..cfa73e056f 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/VerificationPickResults.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/VerificationPickResults.cshtml
@@ -89,11 +89,11 @@
                     </div>
                   </td>
                   <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-                    <span class="nhsuk-table-responsive__heading">Questions </span>
+                    <span class="nhsuk-table-responsive__heading">Question </span>
                     @question.Question
                   </td>
                   <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-                    <span class="nhsuk-table-responsive__heading">Responses </span>
+                    <span class="nhsuk-table-responsive__heading">Response </span>
                     <partial name="../../Supervisor/Shared/_AssessmentQuestionResponse" model="question" />
                   </td>
 

From fc6a6f198b889c8b11d0795e768614a400ea0949 Mon Sep 17 00:00:00 2001
From: martinfoster-hee <martin.foster2@hee.nhs.uk>
Date: Tue, 22 Nov 2022 16:40:36 +0000
Subject: [PATCH 4/4] Fixed inconsistent mobile v desktop table header caption.

---
 .../Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml
index 0a6d9f3d30..44664fada1 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml
@@ -14,7 +14,7 @@
 @if ((bool)(ViewData["isSupervisorResultsReviewed"] ?? true))
 {
   <td class="nhsuk-table__cell nhsuk-u-font-size-16">
-    <span class="nhsuk-table-responsive__heading">Questions </span>
+    <span class="nhsuk-table-responsive__heading">Confirmation status </span>
     <partial name="Shared/_AssessmentQuestionStatusTag" model="Model" />
   </td>
 }