Merge pull request #2863 from TechnologyEnhancedLearning/Develop/Features/TD-4560-ChangetheManageoptionalcompetenciesviewtoallowselectionofcompetenciesbygroup

TD-4560 Change the Manage optional competencies view to allow selection of competencies by group

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -456,7 +456,8 @@ public IEnumerable<Competency> GetCandidateAssessmentOptionalCompetencies(int se
                         CG.ID AS CompetencyGroupID,
                         'Capability' AS Vocabulary,
                         SAS.Optional,
-                        COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment
+                        COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment,
+                        SAS.GroupOptionalCompetencies 
                     FROM Competencies AS C
                     INNER JOIN CandidateAssessments AS CA
                         ON CA.SelfAssessmentID = @selfAssessmentId AND CA.DelegateUserID = @delegateUserId AND CA.RemovedDate IS NULL

DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs

@@ -16,6 +16,7 @@ public class Competency
         public string CompetencyGroupDescription { get; set; } = string.Empty;
         public string? Vocabulary { get; set; }
         public bool Optional { get; set; }
+        public bool GroupOptionalCompetencies { get; set; }
         public bool AlwaysShowDescription { get; set; }
         public bool IncludedInSelfAssessment { get; set; }
         public DateTime? Verified { get; set; }

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

@@ -100,21 +100,47 @@ 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]">
-                                @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>
+                        @if (competency.GroupOptionalCompetencies)
+                        {
+                            <div class="nhsuk-checkboxes__item">
+
+                                <input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="[email protected]" name="resultChecked" type="checkbox" value="@competency.SelfAssessmentStructureId">
+                                <label class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" for="[email protected]">
+                                    <h3 class="nhsuk-details__summary-text nhsuk-u-margin-bottom-0">  @competencyGroup.Key</h3>
+                                </label>
+                            </div>
+
+                            <details class="nhsuk-details">
+                                <summary class="nhsuk-details__summary nhsuk-u-padding-0">
+                                    <span class="nhsuk-u-margin-bottom-0">
+                                        <span class="nhsuk-details__summary-text"> &nbsp;&nbsp; What&rsquo;s included in the @competency.CompetencyGroup   </span>
                                     </span>
-                                }
+                                </summary>
 
-                                @competency.Name
-                            </label>
-                        </div>
+                                <div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
+                                    @(Html.Raw(@competency.Name))
+                                </div>
+                            </details>
+                            <br />
+                        }
+                        else
+                        {
+                            <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]">
+                                    @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>
+                                    }
+
+                                    @competency.Name
+                                </label>
+                            </div>
+                        }
                     }
                 </div>
             </fieldset>