Merge pull request #3542 from TechnologyEnhancedLearning/Develop/Features/TD-6945-Removeduplicatedassessmentnamefrompagetitles

rshrirohit · web-flow · commit 322880bb9efe · 2026-04-22T12:48:52.000+01:00
TD-6945 Adding caption  to  self assessment pages that the caption is…
diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -875,6 +875,7 @@ public IActionResult AssessmentWorkingGroup(int competencyAssessmentId, string a
             var model = new WorkingGroupCollaboratorsViewModel()
             {
                 CompetencyAssessmentID = competencyAssessmentId,
+                CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName,
                 Collaborators = collaborators,
                 CompetencyAssessmentTaskStatus = taskStatus.WorkingGroupTaskStatus,
                 UserEmail = null,
@@ -996,6 +997,7 @@ public IActionResult OptionsLabels(int competencyAssessmentId, int step)
 
             data.CurrentStep = step;
             var model = new OptionsLabelsViewModel(data);
+            model.CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
 
             return View("CompetencyAssessmentOptions", model);
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/OptionsLabelsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/OptionsLabelsViewModel.cs
@@ -32,7 +32,7 @@ public OptionsLabelsViewModel(OptionsLabelsViewModel optionsLabels)
         public int FrameworkId { get; set; }
         public int CompetencyAssessmentID { get; set; }
         public int CurrentStep { get; set; } = 1;
-
+        public string CompetencyAssessmentName { get; set; } = string.Empty;
         public bool IncludeLearnerDeclarationPrompt { get; set; }
         public bool IncludesSignposting { get; set; }
         public bool LinearNavigation { get; set; }
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/WorkingGroupCollaboratorsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/WorkingGroupCollaboratorsViewModel.cs
@@ -6,13 +6,13 @@
     public class WorkingGroupCollaboratorsViewModel
     {
         public int CompetencyAssessmentID { get; set; }
+        public string CompetencyAssessmentName { get; set; } = string.Empty;
         public IEnumerable<CompetencyAssessmentCollaboratorDetail>? Collaborators { get; set; }
         public int AdminID { get; set; }
         public bool? CompetencyAssessmentTaskStatus { get; set; }
         public string? UserEmail { get; set; }
         public bool Error { get; set; }
         public string? ActionName { get; set; }
         public int UserRole { get; set; }
-
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
@@ -26,8 +26,12 @@
     <nhs-form-group nhs-validation-for="SelectedCompetencyIds">
         <fieldset class="nhsuk-fieldset">
             <legend class="nhsuk-fieldset__legend">
-                <h1>
-                    Add @Model.VocabularyPlural.ToLower() to assessment from @Model.FrameworkName
+                <h1 class="app-page-heading">
+                <span class="nhsuk-caption-xl">
+                    @Model.CompetencyAssessmentName
+                    <span class="nhsuk-u-visually-hidden"> – </span>
+                </span>
+                    Add @Model.VocabularyPlural.ToLower() to assessment
                 </h1>
             </legend>
 
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml
@@ -21,7 +21,12 @@
         </div>
     </nav>
 }
-<h1>Select framework source</h1>
+<h1 class="app-page-heading">
+    <span class="nhsuk-caption-xl">
+        @Model.CompetencyAssessmentName
+        <span class="nhsuk-u-visually-hidden"> – </span>
+    </span>Select framework source
+</h1>
 <form method="post">
     @if (!ViewData.ModelState.IsValid)
     {
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
@@ -82,7 +82,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Display learner declaration?
                     </h1>
                 </legend>
@@ -112,7 +116,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Include signposting?
                     </h1>
                 </legend>
@@ -142,7 +150,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Use linear navigation?
                     </h1>
                 </legend>
@@ -172,7 +184,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Use description expanders?
                     </h1>
                 </legend>
@@ -202,7 +218,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Custom question label
                     </h1>
                 </legend>
@@ -244,7 +264,11 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="nhsuk-fieldset__heading">
+                    <h1 class="app-page-heading">
+                        <span class="nhsuk-caption-xl">
+                            @Model.CompetencyAssessmentName
+                            <span class="nhsuk-u-visually-hidden"> – </span>
+                        </span>
                         Reviewer comments label
                     </h1>
                 </legend>
@@ -286,9 +310,13 @@
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-full">
 
-                <div class="nhsuk-u-margin-bottom-8">
-                    <h1 id="page-heading" class="nhsuk-heading-xl">Summary</h1>
-                </div>
+                <h1 class="app-page-heading">
+                    <span class="nhsuk-caption-xl">
+                        @Model.CompetencyAssessmentName
+                        <span class="nhsuk-u-visually-hidden"> – </span>
+                    </span>Summary
+                </h1>
+            
 
                 <dl class="nhsuk-summary-list word-break">
                     @if (Model.IsSupervisionSwitchedOn)
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
@@ -27,6 +27,13 @@
         </div>
     </nav>
 }
+<h1 class="app-page-heading">
+    <span class="nhsuk-caption-xl">
+        @Model.CompetencyAssessmentName
+        <span class="nhsuk-u-visually-hidden"> – </span>
+    </span>
+   Choose working group members</h1>
+=======
 <h1>Select working group members</h1>
 <div class="nhsuk-table__panel-with-heading-tab">
     <h2 class="nhsuk-table__heading-tab">Working group members</h2>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
@@ -22,6 +22,7 @@
         </div>
     </nav>
 }
+
 <div class="nhsuk-form-group">
     <h1 class="app-page-heading">
         <span class="nhsuk-caption-xl">

Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,7 @@ public IActionResult AssessmentWorkingGroup(int competencyAssessmentId, string a`
`875`	`875`	`var model = new WorkingGroupCollaboratorsViewModel()`
`876`	`876`	`{`
`877`	`877`	`CompetencyAssessmentID = competencyAssessmentId,`
	`878`	`+ CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName,`
`878`	`879`	`Collaborators = collaborators,`
`879`	`880`	`CompetencyAssessmentTaskStatus = taskStatus.WorkingGroupTaskStatus,`
`880`	`881`	`UserEmail = null,`
`@@ -996,6 +997,7 @@ public IActionResult OptionsLabels(int competencyAssessmentId, int step)`
`996`	`997`
`997`	`998`	`data.CurrentStep = step;`
`998`	`999`	`var model = new OptionsLabelsViewModel(data);`
	`1000`	`+ model.CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;`
`999`	`1001`
`1000`	`1002`	`return View("CompetencyAssessmentOptions", model);`
`1001`	`1003`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`public class WorkingGroupCollaboratorsViewModel`
`7`	`7`	`{`
`8`	`8`	`public int CompetencyAssessmentID { get; set; }`
	`9`	`+ public string CompetencyAssessmentName { get; set; } = string.Empty;`
`9`	`10`	`public IEnumerable<CompetencyAssessmentCollaboratorDetail>? Collaborators { get; set; }`
`10`	`11`	`public int AdminID { get; set; }`
`11`	`12`	`public bool? CompetencyAssessmentTaskStatus { get; set; }`
`12`	`13`	`public string? UserEmail { get; set; }`
`13`	`14`	`public bool Error { get; set; }`
`14`	`15`	`public string? ActionName { get; set; }`
`15`	`16`	`public int UserRole { get; set; }`
`16`		`-`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@`
`21`	`21`	`</div>`
`22`	`22`	`</nav>`
`23`	`23`	`}`
`24`		`-<h1>Select framework source</h1>`
	`24`	`+<h1 class="app-page-heading">`
	`25`	`+ <span class="nhsuk-caption-xl">`
	`26`	`+ @Model.CompetencyAssessmentName`
	`27`	`+ <span class="nhsuk-u-visually-hidden"> – </span>`
	`28`	`+ </span>Select framework source`
	`29`	`+</h1>`
`25`	`30`	`<form method="post">`
`26`	`31`	`@if (!ViewData.ModelState.IsValid)`
`27`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`</div>`
`23`	`23`	`</nav>`
`24`	`24`	`}`
	`25`	`+`
`25`	`26`	`<div class="nhsuk-form-group">`
`26`	`27`	`<h1 class="app-page-heading">`
`27`	`28`	`<span class="nhsuk-caption-xl">`