TD-5402 - Updated model with validation context for invalid ModelState

Author: Auldrin-Possa

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -712,11 +712,11 @@ public IActionResult CompetencyAssessmentSummary(CompetencyAssessmentFeaturesVie
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Make")]
         public IActionResult ConfirmMaKePrimaryFramework(int frameworkId, int competencyAssessmentId)
         {
-                var adminId = GetAdminID();
-                var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
-                var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
-                var model = new ConfirmMakePrimaryFrameworkViewModel(competencyAssessmentBase, framework);
-                return View("ConfirmMaKePrimaryFramework", model);
+            var adminId = GetAdminID();
+            var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
+            var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+            var model = new ConfirmMakePrimaryFrameworkViewModel(competencyAssessmentBase, framework);
+            return View("ConfirmMaKePrimaryFramework", model);
         }
         [HttpPost]
         [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Make")]
@@ -897,7 +897,6 @@ public IActionResult OptionsLabels(OptionsLabelsViewModel model)
             }
             else if (model.CurrentStep == (int)OptionLabel.QuestionLabels)
             {
-                data.QuestionLabel = model.QuestionLabel;
                 if (model.QuestionLabel)
                 {
                     var label = model.QuestionLabelText?.Trim();
@@ -908,17 +907,18 @@ public IActionResult OptionsLabels(OptionsLabelsViewModel model)
 
                     if (!ModelState.IsValid)
                     {
-                        SetOptionsLabelsData(data);
-                        model = new OptionsLabelsViewModel(data);
+                        var errModel = new OptionsLabelsViewModel(data);
+                        errModel.QuestionLabel = model.QuestionLabel;
+                        errModel.QuestionLabelText = model.QuestionLabelText;
                         model.Error = true;
-                        return View("CompetencyAssessmentOptions", model);
+                        return View("CompetencyAssessmentOptions", errModel);
                     }
                 }
+                data.QuestionLabel = model.QuestionLabel;
                 data.QuestionLabelText = model.QuestionLabel ? model.QuestionLabelText.Trim() : null;
             }
             else if (model.CurrentStep == (int)OptionLabel.CommentsLabel)
             {
-                data.ReviewerCommentsLabel = model.ReviewerCommentsLabel;
                 if (model.ReviewerCommentsLabel)
                 {
                     var label = model.ReviewerCommentsLabelText?.Trim();
@@ -929,12 +929,14 @@ public IActionResult OptionsLabels(OptionsLabelsViewModel model)
 
                     if (!ModelState.IsValid)
                     {
-                        SetOptionsLabelsData(data);
-                        model = new OptionsLabelsViewModel(data);
-                        model.Error = true;
-                        return View("CompetencyAssessmentOptions", model);
+                        var errModel = new OptionsLabelsViewModel(data);
+                        errModel.ReviewerCommentsLabel = model.ReviewerCommentsLabel;
+                        errModel.ReviewerCommentsLabelText = model.ReviewerCommentsLabelText;
+                        errModel.Error = true;
+                        return View("CompetencyAssessmentOptions", errModel);
                     }
                 }
+                data.ReviewerCommentsLabel = model.ReviewerCommentsLabel;
                 data.ReviewerCommentsLabelText = model.ReviewerCommentsLabel ? model.ReviewerCommentsLabelText.Trim() : null;
             }
             else if (model.CurrentStep == (int)OptionLabel.Summary)

DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml

@@ -134,7 +134,7 @@
                     </h1>
                 </legend>
                 <div id="example-hints-hint" class="nhsuk-hint">
-                    Do you want the learner to work through competencies using next and previous links? If not, the learner will navigate between @Model.VocabularyPlural.ToLower() using the @Model.VocabularySingular.ToLower() menu.
+                    Do you want the learner to work through @Model.VocabularyPlural.ToLower() using next and previous links? If not, the learner will navigate between @Model.VocabularyPlural.ToLower() using the @Model.VocabularySingular.ToLower() menu.
                 </div>
                 <div class="nhsuk-radios" id="LinearNavigation">
                     <div class="nhsuk-radios__item">