From b28b9a820ed4c480f6a85376f3a595474cfb27d5 Mon Sep 17 00:00:00 2001
From: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
Date: Mon, 30 Sep 2024 15:16:39 +0100
Subject: [PATCH 1/2] TD-4697-'Cancel' link redirected to proficiency page and
 implemented plural verbs in AddItional Competencies page text.

---
 .../AddOptionalCompetencies.cshtml            |  8 ++---
 .../ManageOptionalCompetencies.cshtml         | 30 +++++--------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/AddOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/AddOptionalCompetencies.cshtml
index fc9f2e351d..707af1039f 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/AddOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/AddOptionalCompetencies.cshtml
@@ -26,18 +26,18 @@
             <h1 id="page-heading" class="nhsuk-heading-xl">Add optional @Model.VocabPlural().ToLower() to your assessment?</h1>
         </div>
         <div class="nhsuk-grid-column-two-thirds">
-            <p class="nhsuk-u-padding-top-5">During your assessment you will need to add one or more optional proficiencies to your assessment to be certified within your role</p>
+            <p class="nhsuk-u-padding-top-5">During your assessment you will need to add one or more optional @Model.VocabPlural().ToLower() to your assessment to be certified within your role</p>
             <details class="nhsuk-details">
                 <summary class="nhsuk-details__summary nhsuk-u-padding-10">
                     <span class="nhsuk-u-margin-bottom-0">
-                        <span class="nhsuk-details__summary-text">What are optional proficiencies?</span>
+                        <span class="nhsuk-details__summary-text">What are optional @Model.VocabPlural().ToLower()?</span>
                     </span>
                 </summary>
                 <div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
-                    <p>Optional proficiencies refer to specific skills or competencies that are not part of the core requirements but may be added based on your role, specialisation, or the needs of your workplace.</p>
+                    <p>Optional @Model.VocabPlural().ToLower() refer to specific skills or competencies that are not part of the core requirements but may be added based on your role, specialisation, or the needs of your workplace.</p>
                 </div>
             </details>
-            <p class="nhsuk-u-padding-bottom-5">These proficiencies might be different depending on your role or organization so you may need to discuss this with your educator or manager</p>
+            <p class="nhsuk-u-padding-bottom-5">These @Model.VocabPlural().ToLower() might be different depending on your role or organization so you may need to discuss this with your educator or manager</p>
 
             <button class="nhsuk-button" type="submit">Add optional @Model.VocabPlural().ToLower() to assessment</button>
             <a class="nhsuk-button nhsuk-button--secondary trigger-loader" role="button" asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural()" asp-route-selfAssessmentId="@Model.SelfAssessment.Id">Remind me later</a>
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml
index 6a0e4cbe51..315c1ac11f 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml
@@ -124,28 +124,14 @@ else
 </form>
 
 <div class="nhsuk-back-link">
-    @if (ViewBag.FromAddOptionalPage != null)
-    {
-        <a class="nhsuk-back-link__link"
-           asp-action="AddOptionalCompetencies"
-           asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
-            <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
-            </svg>
-            Cancel
-        </a>
-    }
-    else
-    {
-        <a class="nhsuk-back-link__link"
-           asp-action="SelfAssessmentOverview"
-           asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
-            <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
-            </svg>
-            Cancel
-        </a>
-    }
+    <a class="nhsuk-back-link__link"
+       asp-action="SelfAssessmentOverview"
+       asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
+        <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+            <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
+        </svg>
+        Cancel
+    </a>
 </div>
 
 @section scripts {

From a60421eedc2bd7d3451c68d4652e0999a7e0b8d2 Mon Sep 17 00:00:00 2001
From: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
Date: Tue, 1 Oct 2024 11:59:53 +0100
Subject: [PATCH 2/2] Call to AddOptionalCompetencies for self assessments with
 LinearNavigation

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

diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
index d5c2dd92ca..346322f8e3 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
@@ -48,7 +48,7 @@ else
 
 @if (Model.LinearNavigation)
 {
-    <a role="button" class="nhsuk-button @(Model.UserBookmark != null || bookmarkIsRelevant ? "nhsuk-button--secondary" : "") trigger-loader" asp-action="SelfAssessmentOverview" asp-route-selfAssessmentId="@Model.Id" asp-route-vocabulary="@Model.VocabPlural">View @Model.VocabPlural</a>
+    <a role="button" class="nhsuk-button @(Model.UserBookmark != null || bookmarkIsRelevant ? "nhsuk-button--secondary" : "") trigger-loader" asp-action="AddOptionalCompetencies" asp-route-selfAssessmentId="@Model.Id" asp-route-vocabulary="@Model.VocabPlural">View @Model.VocabPlural</a>
     @if (Model.UserBookmark != null)
     {
         if (bookmarkIsRelevant)