TD-4560 Removing the select all check box

Author: sherif-olaboye

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml

@@ -87,45 +87,48 @@ else
         @foreach (var competencyGroup in Model.CompetencyGroups)
         {
             <fieldset class="nhsuk-fieldset nhsuk-u-margin-bottom-4">
-                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <span class="nhsuk-fieldset__heading">
-                        @competencyGroup.Key
-                    </span>
-                </legend>
+
                 @if (competencyGroup.Count() > 1)
                 {
                     @if (competencyGroup.Any(x => x.GroupOptionalCompetencies))
                     {
-                        <div class="nhsuk-grid-row nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-1 js-only-block">
-                            <div class="nhsuk-grid-column-full">
 
-                                <div class="nhsuk-checkboxes__item">
-
-                                    <input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="result-check-@competencyGroup.Key" name="groupOptionalCompetenciesChecked" checked="@(competencyGroup.Any(x => x.IncludedInSelfAssessment == true) ? true : false)" type="checkbox" value="@competencyGroup.Key">
-                                    <label class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" for="[email protected]">
-                                        <h3>  Select all @Model.VocabPlural().ToLower()</h3>
-                                    </label>
-                                </div>
-
-                            </div>
+                        <div class="nhsuk-checkboxes__item">
+                            <input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="[email protected]" name="groupOptionalCompetenciesChecked" checked="@(competencyGroup.Any(x => x.IncludedInSelfAssessment == true) ? true : false)" type="checkbox" value="@competencyGroup.Key">
+                            <label class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" for="[email protected]">
+                                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
+                                    <span class="nhsuk-fieldset__heading">
+                                        @competencyGroup.Key
+                                    </span>
+                                </legend>
+                            </label>
                         </div>
                         <details class="nhsuk-details">
                             <summary class="nhsuk-details__summary nhsuk-u-padding-0">
                                 <h3 class="nhsuk-details__summary-text nhsuk-u-margin-bottom-0">
                                     <span class="nhsuk-u-margin-bottom-0">
-                                        <span class="nhsuk-details__summary-text"  id="@competencyGroup.Key">
-                                            What&rsquo;s included in the @competencyGroup.Key   </span>
+                                        <span class="nhsuk-details__summary-text" id="@competencyGroup.Key">
+                                            What&rsquo;s included in the @competencyGroup.Key
                                         </span>
-                                    
+                                    </span>
+
                                 </h3>
                             </summary>
 
                             <div class="nhsuk-details__text nhsuk-card">
                                 <dl class="nhsuk-summary-list">
 
-                                    @foreach (var competency in competencyGroup) 
+                                    @foreach (var competency in competencyGroup)
                                     {
                                         <div class="nhsuk-summary-list__row">
+                                            @foreach (var flag in competency.CompetencyFlags)
+                                            {
+                                                <span class="nhsuk-u-padding-right-2 @(ViewData["cssClass"]?.ToString())">
+                                                    <strong class="nhsuk-tag @flag.FlagTagClass">
+                                                        @flag.FlagName
+                                                    </strong>
+                                                </span>
+                                            }
                                             <dd class="nhsuk-summary-list__value">
                                                 @competency.Name
                                             </dd>
@@ -141,6 +144,11 @@ else
                     }
                     else
                     {
+                        <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
+                            <span class="nhsuk-fieldset__heading">
+                                @competencyGroup.Key
+                            </span>
+                        </legend>
                         <div class="nhsuk-grid-row nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-1 js-only-block">
                             <div class="nhsuk-grid-column-full">
                                 <a class="nhsuk-button select-all-button select-all status-tag  nhsuk-u-margin-bottom-1" role="button" data-group="@competencyGroup.Key" name="selectAll" value="true">Select all @Model.VocabPlural().ToLower()</a>
@@ -150,9 +158,6 @@ else
                         <div class="nhsuk-checkboxes">
                             @foreach (var competency in competencyGroup)
                             {
-
-
-
                                 <div class="nhsuk-checkboxes__item">
                                     <input class="nhsuk-checkboxes__input select-all-checkbox" data-group="@competencyGroup.Key" id="[email protected]" name="IncludedSelfAssessmentStructureIds" checked="@(Model.IncludedSelfAssessmentStructureIds != null ? Model.IncludedSelfAssessmentStructureIds.Contains((int)competency.SelfAssessmentStructureId) : false)" type="checkbox" value="@competency.SelfAssessmentStructureId">
                                     <label class="nhsuk-label nhsuk-checkboxes__label" for="[email protected]">