TD-483 Begins to implement add competencies MVC view

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -482,11 +482,11 @@ public IActionResult RemoveFramework(ConfirmRemoveFrameworkSourceViewModel model
             return RedirectToAction("SelectFrameworkSources", new { model.CompetencyAssessmentId, actionName = "Summary" });
         }
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies")]
-        public IActionResult SelectCompetencies(int competencyAssessmentId)
+        public IActionResult ViewSelectedCompetencies(int competencyAssessmentId)
         {
-            
+
             var competencies = competencyAssessmentService.GetCompetenciesForCompetencyAssessment(competencyAssessmentId);
-            if(!competencies.Any())
+            if (!competencies.Any())
             {
                 return RedirectToAction("AddCompetenciesSelectFramework", new { competencyAssessmentId });
             }
@@ -501,7 +501,7 @@ public IActionResult SelectCompetencies(int competencyAssessmentId)
             {
                 return StatusCode(403);
             }
-            var model = new SelectCompetenciesViewModel(competencyAssessmentBase, competencies);
+            var model = new ViewSelectedCompetenciesViewModel(competencyAssessmentBase, competencies);
             return View(model);
         }
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
@@ -527,5 +527,39 @@ public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId)
             var model = new AddCompetenciesSelectFrameworkViewModel(competencyAssessmentBase, linkedFrameworks);
             return View(model);
         }
+        [HttpPost]
+        [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
+        public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkViewModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(model.ID);
+                model.LinkedFrameworks = linkedFrameworks;
+                return View("AddCompetenciesSelectFramework", model);
+            }
+            else
+            {
+                return RedirectToAction("AddCompetencies", new { competencyAssessmentId = model.ID, frameworkId = model.FrameworkId });
+            }
+        }
+        [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/{frameworkId}")]
+        public IActionResult AddCompetencies(int competencyAssessmentId, int frameworkId)
+        {
+            var adminId = GetAdminID();
+            var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
+            if (competencyAssessmentBase == null)
+            {
+                logger.LogWarning($"Failed to load Competencies page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}");
+                return StatusCode(500);
+            }
+            if (competencyAssessmentBase.UserRole < 2)
+            {
+                return StatusCode(403);
+            }
+            var groupedCompetencies = frameworkService.GetFrameworkCompetencyGroups(frameworkId);
+            var ungroupedCompetencies = frameworkService.GetFrameworkCompetenciesUngrouped(frameworkId);
+            var model = new AddCompetenciesViewModel(competencyAssessmentBase, groupedCompetencies, ungroupedCompetencies, frameworkId);
+            return View(model);
+        }
     }
 }

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AddCompetenciesViewModel.cs

@@ -0,0 +1,10 @@
+namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+{
+    public class AddCompetenciesViewModel
+    {
+        public AddCompetenciesViewModel()
+        {
+
+        }
+    }
+}

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectCompetenciesViewModel.cs renamed to DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ViewSelectedCompetenciesViewModel.cs

@@ -4,10 +4,10 @@
 
 namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 {
-    public class SelectCompetenciesViewModel
+    public class ViewSelectedCompetenciesViewModel
     {
-        public SelectCompetenciesViewModel() { }
-        public SelectCompetenciesViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<Competency> competencies)
+        public ViewSelectedCompetenciesViewModel() { }
+        public ViewSelectedCompetenciesViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<Competency> competencies)
         {
             ID = competencyAssessmentBase.ID;
             CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;

DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml

@@ -129,7 +129,7 @@
             else
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
-                    <a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
+                    <a class="nhsuk-link nhsuk-task-list__link" asp-action="ViewSelectedCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
                         Select @Model.VocabularyPlural.ToLower() to assess
                     </a>
                 </div>

DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectCompetencies.cshtml renamed to DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml

@@ -1,5 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
-@model SelectCompetenciesViewModel;
+@model ViewSelectedCompetencies;
 @{
     ViewData["Title"] = "Select Competencies";
     ViewData["Application"] = "Framework Service";