Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Auldrin-Possa wants to merge 2 commits into
base: DLS-Release-v1.3.0
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f243509
TD-5402 - Updated model with validation context for invalid ModelState
Auldrin-Possa Dec 5, 2025
cba31ce
Model object name updated.
Auldrin-Possa Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions ...earningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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();
Expand All @@ -908,17 +907,18 @@ 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.QuestionLabel = model.QuestionLabel;
errModel.QuestionLabelText = model.QuestionLabelText;
errModel.Error = true;
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();
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading