TD-483 Wires up the choose framework post and begins to wire up the add competencies view

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -529,12 +529,11 @@ public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId)
         }
         [HttpPost]
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
-        public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkViewModel model)
+        public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkFormData model)
         {
             if (!ModelState.IsValid)
             {
                 var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(model.ID);
-                model.LinkedFrameworks = linkedFrameworks;
                 return View("AddCompetenciesSelectFramework", model);
             }
             else

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AddCompetenciesSelectFrameworkFormData.cs

@@ -0,0 +1,10 @@
+namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+{
+    using System.ComponentModel.DataAnnotations;
+    public class AddCompetenciesSelectFrameworkFormData
+    {
+        [Required]
+        public int ID { get; set; }
+        public int FrameworkId { get; set; }
+    }
+}

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AddCompetenciesSelectFrameworkViewModel.cs

@@ -5,7 +5,7 @@
     using DigitalLearningSolutions.Web.Helpers;
     using System.Collections.Generic;
 
-    public class AddCompetenciesSelectFrameworkViewModel
+    public class AddCompetenciesSelectFrameworkViewModel : AddCompetenciesSelectFrameworkFormData
     {
         public AddCompetenciesSelectFrameworkViewModel(
            CompetencyAssessmentBase competencyAssessmentBase,
@@ -19,12 +19,10 @@ IEnumerable<BaseFramework> linkedFrameworks
             VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);
             VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);
         }
-        public int ID { get; set; }
         public string? CompetencyAssessmentName { get; set; }
         public int UserRole { get; set; }
         public string VocabularySingular { get; set; }
         public string VocabularyPlural { get; set; }
-        public int FrameworkId { get; set; }
         public IEnumerable<BaseFramework> LinkedFrameworks { get; set; }
     }
 }

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AddCompetenciesViewModel.cs

@@ -1,10 +1,28 @@
 namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 {
+    using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
+    using DigitalLearningSolutions.Data.Models.Frameworks;
+    using DigitalLearningSolutions.Web.Helpers;
+    using System.Collections.Generic;
     public class AddCompetenciesViewModel
     {
-        public AddCompetenciesViewModel()
+        public AddCompetenciesViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<FrameworkCompetencyGroup> groupedCompetencies, IEnumerable<FrameworkCompetency> ungroupedCompetencies, int frameworkId)
         {
-
+            ID = competencyAssessmentBase.ID;
+            CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
+            UserRole = competencyAssessmentBase.UserRole;
+            VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);
+            VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);
+            GroupedCompetencies = groupedCompetencies;
+            UngroupedCompetencies = ungroupedCompetencies;
         }
+        public int ID { get; set; }
+        public string CompetencyAssessmentName { get; set; }
+        public int UserRole { get; set; }
+        public string VocabularySingular { get; set; }
+        public string VocabularyPlural { get; set; }
+        public IEnumerable<FrameworkCompetencyGroup> GroupedCompetencies { get; set; }
+        public IEnumerable<FrameworkCompetency> UngroupedCompetencies { get; set; }
+        public int FrameworkId { get; set; }
     }
 }

DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml

@@ -0,0 +1,25 @@
+@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+@model AddCompetenciesViewModel;
+@{
+    ViewData["Title"] = "Add Competencies to Self Assessment";
+    ViewData["Application"] = "Framework Service";
+}
+<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
+@section NavMenuItems {
+    <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
+}
+
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item">Select framework sources</li>
+            </ol>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+        </div>
+    </nav>
+}
+
+<h1>Add @Model.VocabularyPlural.ToLower() to @Model.CompetencyAssessmentName</h1>

DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml

@@ -22,7 +22,7 @@
     </nav>
 }
 <h1>Select Framework Source</h1>
-<form>
+<form method="post">
     <div class="nhsuk-form-group">
 
         <fieldset class="nhsuk-fieldset">
@@ -44,5 +44,6 @@
             </div>
         </fieldset>
     </div>
-        <button type="submit" class="nhsuk-button" asp-action="AddCompetenciesSelectCompetencies" asp-route-competencyAssessmentId="@Model.ID">Next</button>
+    <input type="hidden" asp-for="@Model.ID" />
+    <button type="submit" class="nhsuk-button">Next</button>
 </form>

DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml

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