From 7760ca374811501c75a75ded1c9500d9858ace35 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Thu, 22 Jul 2021 11:12:59 +0100
Subject: [PATCH 1/3] DLSV2-275 Tweaks create framework flow for consistent
 navigation

---
 .../Views/Frameworks/Developer/Branding.cshtml                 | 2 +-
 .../Views/Frameworks/Developer/Description.cshtml              | 2 +-
 .../Views/Frameworks/Developer/Name.cshtml                     | 2 +-
 .../Views/Frameworks/Developer/Similar.cshtml                  | 2 +-
 .../Views/Frameworks/Developer/Summary.cshtml                  | 3 ---
 .../Views/Frameworks/Developer/Type.cshtml                     | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Branding.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Branding.cshtml
index cc714f4d98..34be4d81d8 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Branding.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Branding.cshtml
@@ -93,7 +93,7 @@ else
       Back
     </a>
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml
index 80f5542267..9ee834cfaf 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml
@@ -74,7 +74,7 @@ else
       Back
     </a>
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml
index 76061a02b4..64871d9fe3 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml
@@ -71,7 +71,7 @@ else
   @if ((string)ViewContext.RouteData.Values["actionname"] == "New")
   {
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml
index 300c8522c9..94c2656cb4 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml
@@ -66,7 +66,7 @@ else
     Back
   </a>
   <a class="nhsuk-button" asp-action="SaveNewFramework" asp-route-frameworkname="@Model.FrameworkName" asp-route-actionname="@(ViewContext.RouteData.Values["actionname"])">
-    Continue
+    Next
   </a>
   <div class="nhsuk-back-link">
     <a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml
index bf595b7877..1acb931a51 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml
@@ -70,9 +70,6 @@
     </dd>
   </div>
 </dl>
-<a class="nhsuk-button nhsuk-button--secondary" asp-action="SetNewFrameworkBrand" asp-route-actionname="New">
-  Back
-</a>
 <a class="nhsuk-button" asp-action="InsertFramework">
   Save and Continue
 </a>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml
index ef70cc507f..28b2617d3d 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml
@@ -78,7 +78,7 @@ else
       Back
     </a>
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">

From d90079c757ca2b953a7b6bd47869eb2f75a86f97 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Thu, 22 Jul 2021 11:15:28 +0100
Subject: [PATCH 2/3] DLSV2-275 Tweaks steps of create role profile flow for
 consistent navigation

---
 DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml     | 2 +-
 .../Views/RoleProfiles/ProfessionalGroup.cshtml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml b/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml
index e2bf79af75..5875af1be1 100644
--- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml
@@ -75,7 +75,7 @@ else
   @if ((string)ViewContext.RouteData.Values["actionname"] == "New")
   {
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">
diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml b/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml
index 5c8514cc37..aa6a374476 100644
--- a/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml
@@ -101,7 +101,7 @@ else
       Back
     </a>
     <button class="nhsuk-button" type="submit">
-      Continue
+      Next
     </button>
     <div class="nhsuk-back-link">
       <a class="nhsuk-back-link__link" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">

From 65fca247329d6eb3a0ab2e8a9ab597d321f48759 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Thu, 22 Jul 2021 14:33:34 +0100
Subject: [PATCH 3/3] DLSV2-276 Fixes bug with GetNthCompetency dapper query

---
 .../Services/SelfAssessmentService.cs                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
index 636edaeb3f..d3f97a5f3a 100644
--- a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
+++ b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
@@ -65,7 +65,7 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
                                 ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID
 
                           WHERE CandidateID = @candidateId
-                            AND SelfAssessmentID = @selfAssessmentId
+                            AND s.SelfAssessmentID = @selfAssessmentId
                          )";
         private const string SpecificAssessmentResults =
             @"LatestAssessmentResults AS
@@ -215,8 +215,8 @@ INNER JOIN Competencies AS C
                 $@"WITH CompetencyRowNumber AS
                      (SELECT ROW_NUMBER() OVER (ORDER BY Ordering) as RowNo,
                              CompetencyID
-                      FROM SelfAssessmentStructure
-                      WHERE SelfAssessmentID = @selfAssessmentId
+                      FROM SelfAssessmentStructure as sas
+                      WHERE sas.SelfAssessmentID = @selfAssessmentId
                      ),
                      {LatestAssessmentResults}
                     SELECT {CompetencyFields}