Merge pull request #2741 from TechnologyEnhancedLearning/Develop/feature/TD-4233-Display-competency-flags

TD-4233- Display competency flags in the Choose optional competencies screen

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -447,7 +447,8 @@ public IEnumerable<Competency> GetCandidateAssessmentOptionalCompetencies(int se
         {
             return connection.Query<Competency>(
                 @"SELECT
-                        SAS.ID AS Id,
+                        C.ID AS Id,
+                        SAS.ID AS SelfAssessmentStructureId,
                         ROW_NUMBER() OVER (ORDER BY SAS.Ordering) as RowNo,
                         C.Name AS Name,
                         C.Description AS Description,

DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs

@@ -27,6 +27,7 @@ public class Competency
         public int? CandidateAssessmentSupervisorId { get; set; }
         public string? SupervisorName { get; set; }
         public string? CentreName { get; set; }
+        public int? SelfAssessmentStructureId { get; set; }
         public List<AssessmentQuestion> AssessmentQuestions { get; set; } = new List<AssessmentQuestion>();
         public IEnumerable<CompetencyFlag> CompetencyFlags { get; set; } = new List<CompetencyFlag>();
     }

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1420,6 +1420,12 @@ public IActionResult ManageOptionalCompetencies(int selfAssessmentId)
             var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
             var optionalCompetencies =
                 selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
+            var competencyIds = optionalCompetencies.Select(c => c.Id).ToArray();
+            var competencyFlags = frameworkService.GetSelectedCompetencyFlagsByCompetecyIds(competencyIds);
+
+            foreach (var competency in optionalCompetencies)
+                competency.CompetencyFlags = competencyFlags.Where(f => f.CompetencyId == competency.Id);
+
             var includedSelfAssessmentStructureIds =
                 selfAssessmentService.GetCandidateAssessmentIncludedSelfAssessmentStructureIds(
                     selfAssessmentId,

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

@@ -73,8 +73,17 @@
                     @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.Id) : false)" type="checkbox" value="@competency.Id">
-                            <label class="nhsuk-label nhsuk-checkboxes__label" for="[email protected]">
+                            <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>