Begins to implement remove competency from assessment functionality

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -579,15 +579,20 @@ public IActionResult AddComptencies(AddCompetenciesFormData model, int competenc
         {
             if (!ModelState.IsValid)
             {
-
                 //reload model and view
             }
-            if (model.SelectedCompetencyIds.Count() > 0)
+            if (model.SelectedCompetencyIds != null)
             {
                 competencyAssessmentService.InsertCompetenciesIntoAssessmentFromFramework(model.SelectedCompetencyIds, frameworkId, competencyAssessmentId);
             }
             competencyAssessmentService.UpdateSelectCompetenciesTaskStatus(competencyAssessmentId, false, null);
             return RedirectToAction("ViewSelectedCompetencies", new { competencyAssessmentId });
         }
+        [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Delete/{competencyId}")]
+        public IActionResult DeleteCompetency(int competencyAssessmentId, int competencyId)
+        {
+            competencyAssessmentService.RemoveCompetencyFromAssessment(competencyAssessmentId, competencyId);
+            return RedirectToAction("ViewSelectedCompetencies", new { competencyAssessmentId });
+        }
     }
 }

DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs

@@ -54,6 +54,7 @@ public interface ICompetencyAssessmentService
 
         //DELETE DATA
         bool RemoveFrameworkCompetenciesFromAssessment(int competencyAssessmentId, int frameworkId);
+        bool RemoveCompetencyFromAssessment(int competencyAssessmentId, int competencyId);
         }
     public class CompetencyAssessmentService : ICompetencyAssessmentService
     {
@@ -240,5 +241,10 @@ public bool InsertCompetenciesIntoAssessmentFromFramework(int[] selectedCompeten
         {
             return competencyAssessmentDataService.InsertCompetenciesIntoAssessmentFromFramework(selectedCompetencyIds, frameworkId, competencyAssessmentId);
         }
+
+        public bool RemoveCompetencyFromAssessment(int competencyAssessmentId, int competencyId)
+        {
+            return competencyAssessmentDataService.RemoveCompetencyFromAssessment(competencyAssessmentId, competencyId);
+        }
     }
 }

DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml

@@ -67,7 +67,7 @@
             {
                 foreach (var competency in group)
                 {
-                    <div id="fc[email protected]" class="nhsuk-card nhsuk-u-margin-bottom-5 nhsuk-u-margin-left-3">
+                    <div id="competency[email protected]" class="nhsuk-card nhsuk-u-margin-bottom-5 nhsuk-u-margin-left-3">
                         <div class="nhsuk-card__content">
                             @* <partial name="_CompetencyFlags" model="Model.CompetencyFlags" /> *@
                             @if (competency.CompetencyDescription != null)
@@ -90,9 +90,9 @@
                                 <div class="nhsuk-grid-column-three-quarters">
                                     @if (Model.UserRole > 1)
                                     {
-                                        <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveCompetency" asp-route-competencyGroupId="@group.Key.GroupId" asp-route-step="true" asp-route-direction="UP" asp-route-selfAssessmentId="@(ViewContext.RouteData.Values["ID"])" asp-route-competencyId="@competency.CompetencyID">Move <span class="visually-hidden">@competency.CompetencyName</span>up </a>
-                                        <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveCompetency" asp-route-competencyGroupId="@group.Key.GroupId" asp-route-step="true" asp-route-direction="DOWN" asp-route-selfAssessmentId="@(ViewContext.RouteData.Values["ID"])" asp-route-competencyId="@competency.CompetencyID">Move <span class="visually-hidden">@competency.CompetencyName</span>down </a>
-                                        <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteCompetency" asp-route-competencyGroupId="@group.Key.GroupId" asp-route-selfAssessmentId="@(ViewContext.RouteData.Values["ID"])" asp-route-competencyId="@competency.CompetencyID">Remove <span class="visually-hidden">@competency.CompetencyName</span></a>
+                                        <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveCompetency" asp-route-competencyGroupId="@group.Key.GroupId" asp-route-step="true" asp-route-direction="UP" asp-route-competencyAssessmentId="@(ViewContext.RouteData.Values["competencyAssessmentId"])" asp-route-competencyId="@competency.CompetencyID">Move <span class="visually-hidden">@competency.CompetencyName</span>up </a>
+                                        <a class="nhsuk-button nhsuk-button--secondary small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="MoveCompetency" asp-route-competencyGroupId="@group.Key.GroupId" asp-route-step="true" asp-route-direction="DOWN" asp-route-competencyAssessmentId="@(ViewContext.RouteData.Values["competencyAssessmentId"])" asp-route-competencyId="@competency.CompetencyID">Move <span class="visually-hidden">@competency.CompetencyName</span>down </a>
+                                        <a class="nhsuk-button nhsuk-button--secondary delete-button small-edit-button nhsuk-u-margin-right-1" role="button" asp-action="DeleteCompetency" asp-route-competencyAssessmentId="@(ViewContext.RouteData.Values["competencyAssessmentId"])" asp-route-competencyId="@competency.CompetencyID">Remove <span class="visually-hidden">@competency.CompetencyName</span></a>
                                     }
                                 </div>
                             </div>

DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml

@@ -78,7 +78,7 @@ else
             <div class="nhsuk-card">
                 <div class="nhsuk-card__content">
                     <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-                        @Model.DashboardData.CompetencyAssessmentCount Competency Assessments
+                        @Model.DashboardData.CompetencyAssessmentCount Assessments
                     </p>
                     <ul class="nhsuk-contents-list__list">
                         @if (Model.IsWorkforceManager | Model.IsWorkforceContributor)