WIP optional competencies MVC

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -83,7 +83,9 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService
                 sa.NRPProfessionalGroupID,
                  sa.NRPSubGroupID,
                  sa.NRPRoleID,
-                 sa.PublishStatusID, sa.Vocabulary, CASE WHEN sa.CreatedByAdminID = @adminId THEN 3 WHEN sac.CanModify = 1 THEN 2 WHEN sac.CanModify = 0 THEN 1 ELSE 0 END AS UserRole";
+                 sa.PublishStatusID, sa.Vocabulary, CASE WHEN sa.CreatedByAdminID = @adminId THEN 3 WHEN sac.CanModify = 1 THEN 2 WHEN sac.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
+                 sa.MinimumOptionalCompetencies,
+                 sa.ManageOptionalCompetenciesPrompt";
 
         private const string SelfAssessmentFields =
             @", sa.CategoryID, sa.CreatedDate,
@@ -646,7 +648,7 @@ public bool UpdateRoleRequirementsTaskStatus(int assessmentId, bool taskStatus,
         public IEnumerable<Competency> GetCompetenciesForCompetencyAssessment(int competencyAssessmentId)
         {
             return connection.Query<Competency>(
-               @"SELECT sas.ID AS StructureId, sas.CompetencyID, f.ID AS FrameworkId, f.FrameworkName, cg.ID AS GroupId, cg.Name AS GroupName, c.Name AS CompetencyName, c.Description AS CompetencyDescription, sas.Optional
+               @"SELECT sas.ID AS StructureId, sas.CompetencyID, f.ID AS FrameworkId, f.FrameworkName, cg.ID AS GroupId, cg.Name AS GroupName, c.Name AS CompetencyName, c.Description AS CompetencyDescription, sas.Optional, sas.GroupOptionalCompetencies
                     FROM   SelfAssessmentStructure AS sas INNER JOIN
                                 Competencies AS c ON sas.CompetencyID = c.ID INNER JOIN
                                 CompetencyGroups AS cg ON sas.CompetencyGroupID = cg.ID INNER JOIN

DigitalLearningSolutions.Data/Models/CompetencyAssessments/Competency.cs

@@ -11,5 +11,6 @@ public class Competency
         public string? CompetencyName { get; set; }
         public string? CompetencyDescription { get; set; }
         public bool Optional { get; set; }
+        public bool GroupOptionalCompetencies { get; set; }
     }
 }

DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs

@@ -20,7 +20,8 @@ public class CompetencyAssessmentBase
         public int PublishStatusID { get; set; }
         public int UserRole { get; set; }
         public string? Vocabulary { get; set; }
-
+        public int? MinimumOptionalCompetencies { get; set; }
+        public string? ManageOptionalCompetenciesPrompt { get; set; }
     }
 }
 

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectOptionalCompetenciesViewModel.cs

@@ -13,7 +13,7 @@ public SelectOptionalCompetenciesViewModel(CompetencyAssessmentBase competencyAs
             TaskStatus = taskStatus;
             CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
             UserRole = competencyAssessmentBase.UserRole;
-            Competencies = competencies;
+            Competencies = competencies.Where(c => c.Optional == true);
             VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);
             VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);
             SelectedCompetencyIds = competencies.Where(c => c.Optional == true).Select(c => c.CompetencyID).ToArray();

DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml

@@ -1,3 +1,44 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model SelectOptionalCompetenciesViewModel;
-<h1>Select optional competencies</h1>
+<h1>Manage optional competencies</h1>
+<p class="nhsuk-lede-text">
+    Manage optional competencies for the assessment @Model.CompetencyAssessmentName. Optional competencies can be selected for inclusion in a self assessment by a learner if required. Optional competencies can be configured to be added to the assessment individually or as a group.
+</p>
+@if(!Model.SelectedCompetencyIds.Any())
+{
+    <p>No competencies have been made optional for this self assessment.</p>
+    <a class="nhsuk-button" asp-action="SelectOptionalCompetencies"></a>
+}
+else
+{
+    <table class="nhsuk-table">
+        <caption class="nhsuk-table__caption nhsuk-table__caption--m">Optional competencies for @Model.CompetencyAssessmentName</caption>
+        <thead class="nhsuk-table__head">
+            <tr class="nhsuk-table__row">
+                <th scope="col" class="nhsuk-table__header">Competency group</th>
+                <th scope="col" class="nhsuk-table__header">Competency name</th>
+                <th scope="col" class="nhsuk-table__header">Actions</th>
+            </tr>
+        </thead>
+        <tbody class="nhsuk-table__body">
+            @foreach (var competency in Model.Competencies)
+            {
+                <tr class="nhsuk-table__row">
+                    <td class="nhsuk-table__cell">@competency.GroupName</td>
+                    <td class="nhsuk-table__cell">@competency.CompetencyName</td>
+                    
+                    <td class="nhsuk-table__cell">
+                        <a asp-action="RemoveOptionalCompetency" asp-route-competencyId="@competency.CompetencyID" class="nhsuk-link">Remove</a>
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    <p class="nhsuk-lede-text">
+        You can provide optional instruction text for learners explaining how to choose optional competencies for inclusion.
+    </p>
+    <p class="nhsuk-lede-text">
+        You can also, optionally define a minimum number of optional competencies that must be included in an assessment for it to be valid.
+    </p>
+}
+