From 83129e511e68fe16d9ecacdaf6841807e60fe36e Mon Sep 17 00:00:00 2001
From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com>
Date: Mon, 13 Apr 2026 11:43:57 +0100
Subject: [PATCH] TD-6955 Role requirements page consistency fixes

---
 .../EditCompetencyRoleRequirements.cshtml     | 18 +++++++++----
 .../EditIncludeRequirementsFilters.cshtml     |  8 +++---
 ...ditQuestionResponseRoleRequirements.cshtml | 14 +++-------
 .../EnforceRoleRequirementsForSignOff.cshtml  |  6 +++--
 .../ManageCompetencyRoleRequirements.cshtml   | 26 ++++++++++---------
 .../_RoleRequirementQuestionCells.cshtml      |  2 +-
 6 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
index 0b40fa333f..10d8d428ce 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
@@ -22,9 +22,16 @@
         </div>
     </nav>
 }
-<h1>Edit @Model.VocabularySingular.ToLower() role requirements</h1>
-<p class="nhsuk-lede-text">
-    Manage role requirements @Model.CompetencyAssessmentName @Model.VocabularySingular.ToLower() self-assessment questions.
+<div class="nhsuk-form-group">
+    <h1 class="app-page-heading">
+        <span class="nhsuk-caption-xl">
+            @Model.CompetencyAssessmentName
+            <span class="nhsuk-u-visually-hidden"> – </span>
+        </span>
+        @Model.VocabularySingular role requirements
+    </h1>
+    <p>
+        Manage role requirements self-assessment questions.
 </p>
 @foreach (var group in Model.GroupedCompetencyWithAssessmentRoleRequirements)
 {
@@ -33,8 +40,8 @@
         <thead class="nhsuk-table__head">
             <tr class="nhsuk-table__row">
                 <th class="nhsuk-table__header" scope="col">@Model.VocabularySingular</th>
-                <th class="nhsuk-table__header" scope="col">Assessment Question </th>
-                <th>Role Requirements</th>
+                    <th class="nhsuk-table__header" scope="col">Assessment question </th>
+                    <th>Role requirements</th>
                 <th class="nhsuk-table__header" scope="col">Actions</th>
             </tr>
         </thead>
@@ -91,3 +98,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
index 599e529fac..88e0b9de28 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
@@ -22,6 +22,7 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
@@ -32,8 +33,8 @@
 <form method="post" asp-action="EditRoleRequirementsFlags">
     <nhs-form-group nhs-validation-for="IncludeRequirementsFilters">
         <fieldset class="nhsuk-fieldset" aria-describedby="role-requirements-filters-hint">
-            <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                <h2>Do you want to include role requirements filters in the @Model.CompetencyAssessmentName self-assessment?</h2>
+                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+                    Do you want to include role requirements filters in the self-assessment?
             </legend>
             <div id="role-requirements-filters-hint" class="nhsuk-hint">
                 This will allow the learner to filter self-assessment competencies based on whether they are meeting the role requirements set.
@@ -54,7 +55,7 @@
     <input type="hidden" asp-for="Id" />
     <input type="hidden" asp-for="EnforceRoleRequirementsForSignOff" />
     <input type="hidden" asp-for="TaskStatus" />
-    <button class="nhsuk-button nhsuk-button--primary" type="submit">Save changes</button>
+    <button class="nhsuk-button nhsuk-button--primary" type="submit">Save</button>
 </form>
 <div class="nhsuk-back-link">
     <a class="nhsuk-back-link__link" asp-action="ManageCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">
@@ -64,3 +65,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
index 5d4ae07461..5d99cb0c8a 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
@@ -23,22 +23,15 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
         <span class="nhsuk-u-visually-hidden"> – </span>
     </span>
-    @Model.VocabularySingular.ToLower() role requirements
+    @Model.VocabularySingular role requirements
 </h1>
 <dl class="nhsuk-summary-list">
-    <div class="nhsuk-summary-list__row">
-        <dt class="nhsuk-summary-list__key">
-            @Model.VocabularySingular Assessment
-        </dt>
-        <dd class="nhsuk-summary-list__value">
-            @Model.CompetencyAssessmentName
-        </dd>
-    </div>
     <div class="nhsuk-summary-list__row">
         <dt class="nhsuk-summary-list__key">
             @Model.VocabularySingular group
@@ -65,7 +58,7 @@
     </div>
     <div class="nhsuk-summary-list__row">
         <dt class="nhsuk-summary-list__key">
-            Assessment Question
+            Assessment question
         </dt>
         <dd class="nhsuk-summary-list__value">
             @Model.GroupedCompetencyWithAssessmentRoleRequirements.First().Competencies.First().Questions.First().Question
@@ -165,3 +158,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
index 26e3b41fff..2bd6b5516f 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
@@ -22,6 +22,7 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
@@ -32,8 +33,8 @@
 <form method="post" asp-action="EditRoleRequirementsFlags">
     <nhs-form-group nhs-validation-for="EnforceRoleRequirementsForSignOff">
         <fieldset class="nhsuk-fieldset" aria-describedby="enforce-role-requirements-hint">
-            <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                <h2>Do you want to enforce role requirements for the @Model.CompetencyAssessmentName self-assessment?</h2>
+                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+                    Do you want to enforce role requirements for the self-assessment?
             </legend>
             <div id="enforce-role-requirements-hint" class="nhsuk-hint">
                 When role requirements are enforced, learners can only request confirmation for self‑assessment results that meet the required competency criteria, even if no specific requirements are set.
@@ -64,3 +65,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
index 3d3d18febb..798a7563a3 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
@@ -21,30 +21,31 @@
         </div>
     </nav>
 }
-
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
         <span class="nhsuk-u-visually-hidden"> – </span>
-    </span>
-@Model.VocabularySingular.ToLower() role requirements</h1>
+        </span>
+        Self-assessment @Model.VocabularySingular.ToLower() role requirements
+    </h1>
 
-<p class="nhsuk-lede-text">
-    Specify whether role requirements will be enforced for the @Model.CompetencyAssessmentName self-assessment. When requirements are set, they must be met by the learner before the self-assessment can be signed off.
-</p>
+    <p>
+        Specify whether role requirements will be enforced for the self-assessment. When requirements are set, they must be met by the learner before the self-assessment can be signed off.
+    </p>
 <dl class="nhsuk-summary-list">
     <div class="nhsuk-summary-list__row">
         <dt class="nhsuk-summary-list__key">
-            Enforce role requirements for self-assessment
+            Enforce role requirements
         </dt>
         <dd class="nhsuk-summary-list__value">
             @if (Model.EnforceRoleRequirementsForSignOff)
             {
-                <text>Yes. Enforce role requirements.</text>
+                <text>Yes.</text>
             }
             else
             {
-                <text>No. Do not enforce role requirements.</text>
+                <text>No.</text>
             }
         </dd>
         @if (Model.UserRole > 1)
@@ -56,16 +57,16 @@
     </div>
     <div class="nhsuk-summary-list__row">
         <dt class="nhsuk-summary-list__key">
-            Include requirement status filters
+           Role requirement filters
         </dt>
         <dd class="nhsuk-summary-list__value">
             @if (Model.IncludeRequirementsFilters)
             {
-                <text>Yes. Include filters.</text>
+                <text>Yes.</text>
             }
             else
             {
-                <text>No. Do not include filters.</text>
+                <text>No.</text>
             }
         </dd>
         @if (Model.UserRole > 1)
@@ -112,3 +113,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
index b53c16b884..4af54e1d65 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
@@ -29,6 +29,6 @@
 
 <td class="nhsuk-table__cell">
     <a class="nhsuk-link" asp-action="EditQuestionResponseRoleRequirements" asp-route-competencyAssessmentId="@Model.AssessmentID" asp-route-competencyId="@Model.CompetencyID" asp-route-assessmentQuestionId="@Model.AssessmentQuestionID">
-        Edit
+        Change
     </a>
 </td>