Tidies accessibility issues and null prompt submission handling

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -1204,7 +1204,7 @@ public void UpdateMinimumOptionalCompetencies(int selfAssessmentId, int minimumO
                 new { selfAssessmentId, minimumOptionalCompetecies }
             );
         }
-        public void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string manageOptionalCompetenciesPrompt)
+        public void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string? manageOptionalCompetenciesPrompt)
         {
             connection.Execute(
                 @"UPDATE SelfAssessments

DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs

@@ -71,7 +71,7 @@ bool UpdateCompetencyAssessmentFeaturesTaskStatus(int id, bool descriptionStatus
         void UpdateSelfAssessmentFromFramework(int selfAssessmentId, int? frameworkId);
         bool UpdateOptionalCompetenciesInAssessment(int selfAssessmentId, int[] groupIds, int[] selectedStructureIds);
         void UpdateMinimumOptionalCompetencies(int selfAssessmentId, int minimumOptionalCompetecies);
-        void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string manageOptionalCompetenciesPrompt);
+        void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string? manageOptionalCompetenciesPrompt);
         bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId);
 
         //INSERT DATA
@@ -347,13 +347,14 @@ public void UpdateMinimumOptionalCompetencies(int selfAssessmentId, int minimumO
         {
             competencyAssessmentDataService.UpdateMinimumOptionalCompetencies(selfAssessmentId, minimumOptionalCompetecies);
         }
-        public void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string manageOptionalCompetenciesPrompt)
+        public void UpdateManageOptionalCompetenciesPrompt(int selfAssessmentId, string? manageOptionalCompetenciesPrompt)
         {
+            manageOptionalCompetenciesPrompt = SanitizerHelper.SanitizeHtmlData(manageOptionalCompetenciesPrompt);
             if (StringHelper.StripHtmlTags(manageOptionalCompetenciesPrompt) == "")
             {
                 manageOptionalCompetenciesPrompt = null;
             }
-            competencyAssessmentDataService.UpdateManageOptionalCompetenciesPrompt(selfAssessmentId, SanitizerHelper.SanitizeHtmlData(manageOptionalCompetenciesPrompt));
+            competencyAssessmentDataService.UpdateManageOptionalCompetenciesPrompt(selfAssessmentId, manageOptionalCompetenciesPrompt);
         }
         public IEnumerable<CompetencyAssessmentCollaboratorDetail> GetCollaboratorsForCompetencyAssessmentId(int competencyAssessmentId)
         {

DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml

@@ -27,6 +27,12 @@
     Optional competencies can be added to the assessment individually or as a group.
 </p>
 <form method="post" asp-action="SelectOptionalCompetencies">
+    <fieldset class="nhsuk-fieldset">
+        <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
+            <h2 class="nhsuk-fieldset__heading">
+                Which @Model.VocabularySingular.ToLower() groups and/or @Model.VocabularyPlural.ToLower() should be optional?
+            </h2>
+        </legend>
     @foreach (var competencyGroup in Model.CompetencyGroups)
     {
         @if (competencyGroup.Count() > 1)
@@ -65,6 +71,7 @@
         }
 
     }
+    </fieldset>
     <input type="hidden" asp-for="ID" />
     <input type="hidden" asp-for="MinimumOptionalCompetencies" />
     <input type="hidden" asp-for="ManageOptionalCompetenciesPrompt" />