TD-483 Adds select linked framework source form validation

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -529,16 +529,21 @@ public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId)
         }
         [HttpPost]
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
-        public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkFormData model)
+        public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkFormData formdata)
         {
             if (!ModelState.IsValid)
             {
-                var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(model.ID);
+                var competencyAssessmentId = formdata.ID;
+                var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(competencyAssessmentId);
+                var adminId = GetAdminID();
+                var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
+                var model = new AddCompetenciesSelectFrameworkViewModel(competencyAssessmentBase, linkedFrameworks);
+                model.FrameworkId = formdata.FrameworkId;
                 return View("AddCompetenciesSelectFramework", model);
             }
             else
             {
-                return RedirectToAction("AddCompetencies", new { competencyAssessmentId = model.ID, frameworkId = model.FrameworkId });
+                return RedirectToAction("AddCompetencies", new { competencyAssessmentId = formdata.ID, frameworkId = formdata.FrameworkId });
             }
         }
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/{frameworkId}")]

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AddCompetenciesSelectFrameworkFormData.cs

@@ -3,8 +3,8 @@
     using System.ComponentModel.DataAnnotations;
     public class AddCompetenciesSelectFrameworkFormData
     {
-        [Required]
         public int ID { get; set; }
-        public int FrameworkId { get; set; }
+        [Required(ErrorMessage = "Select a linked framework")]
+        public int? FrameworkId { get; set; }
     }
 }

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectFrameworkSourcesFormData.cs

@@ -3,7 +3,7 @@
     using System.ComponentModel.DataAnnotations;
     public class SelectFrameworkSourcesFormData
     {
-        [Required]
+        [Required(ErrorMessage = "Select a framework")]
         public int FrameworkId { get; set; }
         public int CompetencyAssessmentId { get; set; }
         public bool? TaskStatus { get; set; }

DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml

@@ -23,6 +23,10 @@
 }
 <h1>Select Framework Source</h1>
 <form method="post">
+    @if (!ViewData.ModelState.IsValid)
+    {
+        <partial name="_ErrorSummary" />
+    }
     <div class="nhsuk-form-group">
 
         <fieldset class="nhsuk-fieldset">
@@ -43,6 +47,7 @@
                 }
             </div>
         </fieldset>
+        <span nhs-validation-for="FrameworkId"></span>
     </div>
     <input type="hidden" asp-for="@Model.ID" />
     <button type="submit" class="nhsuk-button">Next</button>