From 5ca558d9dafe1af7d14efe7f163a8f92a46090fa Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Mon, 7 Nov 2022 18:08:51 +0000
Subject: [PATCH 1/2] Dynamic competency name/group name assigned to hidden
 span.

---
 .../Views/Frameworks/Developer/_MyFrameworks.cshtml  |  2 ++
 .../Views/Frameworks/Shared/_CompetencyCard.cshtml   | 10 +++++-----
 .../Frameworks/Shared/_CompetencyGroupCard.cshtml    | 12 ++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
index ba2f6e53b2..dfdf1420b6 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
@@ -71,12 +71,14 @@
                 {
                   <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
                     View/Edit
+                    <span class="visually-hidden">@framework.FrameworkName</span>
                   </a>
                 }
                 else if (framework.UserRole == 1)
                 {
                   <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
                     Review
+                    <span class="visually-hidden">@framework.FrameworkName</span>
                   </a>
                 }
               </td>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyCard.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyCard.cshtml
index e4afcd5b5e..5c010e6516 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyCard.cshtml
@@ -51,16 +51,16 @@ else
       <div class="nhsuk-grid-column-three-quarters">
         @if (Model.CanModify)
         {
-          <a class="nhsuk-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Edit <span class="visually-hidden">@ViewData["VocabSingular"].ToString().ToLower()</span></a>
-          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-step="true" asp-route-direction="UP" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Move up <span class="visually-hidden">@ViewData["VocabSingular"].ToString().ToLower()</span></a>
-          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-step="true" asp-route-direction="DOWN" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Move down <span class="visually-hidden">@ViewData["VocabSingular"].ToString().ToLower()</span></a>
-          <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Delete <span class="visually-hidden">@ViewData["VocabSingular"].ToString().ToLower()</span></a>
+          <a class="nhsuk-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Edit <span class="visually-hidden">@Model.FrameworkCompetency.Name</span></a>
+          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-step="true" asp-route-direction="UP" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Move up <span class="visually-hidden">@Model.FrameworkCompetency.Name</span></a>
+          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-step="true" asp-route-direction="DOWN" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Move down <span class="visually-hidden">@Model.FrameworkCompetency.Name</span></a>
+          <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteFrameworkCompetency" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Delete <span class="visually-hidden">@Model.FrameworkCompetency.Name</span></a>
         }
       </div>
       @if (Model.FrameworkCompetency.AssessmentQuestions > 0)
       {
         <div class="nhsuk-grid-column-one-quarter">
-          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="PreviewCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Preview <span class="visually-hidden">@ViewData["VocabSingular"].ToString().ToLower()</span></a>
+          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="PreviewCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetency.Id">Preview <span class="visually-hidden">@Model.FrameworkCompetency.Name</span></a>
         </div>
       }
     </div>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
index fd78607b0e..caa8f7166e 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
@@ -10,16 +10,16 @@
         {
             <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
                 <div class="nhsuk-grid-column-full">
-          <a class="nhsuk-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Edit <span class="visually-hidden"> competency group</span></a>
-          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetencyGroup" asp-route-step="true" asp-route-direction="UP" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Move <span class="visually-hidden"> competency group</span> up</a>
-          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetencyGroup" asp-route-step="true" asp-route-direction="DOWN" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Move <span class="visually-hidden"> competency group</span> down</a>
+          <a class="nhsuk-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Edit <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span></a>
+          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetencyGroup" asp-route-step="true" asp-route-direction="UP" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Move <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span> up</a>
+          <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveFrameworkCompetencyGroup" asp-route-step="true" asp-route-direction="DOWN" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Move <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span> down</a>
                     @if (Model.FrameworkCompetencyGroup.FrameworkCompetencies.Any())
                     {
-            <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="CompetencyGroupRemoveConfirm" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-competencyGroupId="@Model.FrameworkCompetencyGroup.CompetencyGroupID" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID" asp-route-competencyCount="@Model.FrameworkCompetencyGroup.FrameworkCompetencies.Count()">Delete <span class="visually-hidden"> competency group</span></a>
+            <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="CompetencyGroupRemoveConfirm" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-competencyGroupId="@Model.FrameworkCompetencyGroup.CompetencyGroupID" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID" asp-route-competencyCount="@Model.FrameworkCompetencyGroup.FrameworkCompetencies.Count()">Delete <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span></a>
                     }
                     else
                     {
-            <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-competencyGroupId="@Model.FrameworkCompetencyGroup.CompetencyGroupID" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Delete <span class="visually-hidden"> competency group</span></a>
+            <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-competencyGroupId="@Model.FrameworkCompetencyGroup.CompetencyGroupID" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Delete <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span></a>
                     }
                 </div>
             </div>
@@ -58,7 +58,7 @@
         {
             <div class="nhsuk-grid-row">
                 <div class="nhsuk-grid-column-full">
-            <a class="nhsuk-button nhsuk-u-margin-left-3" role="button" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Add @ViewData["VocabSingular"].ToString().ToLower()</a>
+            <a class="nhsuk-button nhsuk-u-margin-left-3" role="button" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroup.ID">Add @ViewData["VocabSingular"].ToString().ToLower() <span class="visually-hidden">@Model.FrameworkCompetencyGroup.Name</span></a>
                 </div>
             </div>
 

From 1c6f08f17ff1de2b6fb654a443785b4e9489f67b Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Mon, 7 Nov 2022 18:44:10 +0000
Subject: [PATCH 2/2] Hidden span added with dynamic framework name.

---
 .../Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
index 0903ff9fd1..85684608a6 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
@@ -64,12 +64,14 @@
             {
               <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
                 View/Edit
+                <span class="visually-hidden">@framework.FrameworkName</span>
               </a>
             }
             else
             {
               <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
                 View
+                <span class="visually-hidden">@framework.FrameworkName</span>
               </a>
             }
           </td>