Skip to content

TD-482-Added validation for introductory text. #3434

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 1 commit into
base: DLS-Release-v1.3.0
Choose a base branch
from
Open

TD-482-Added validation for introductory text. #3434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions ...earningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ public IActionResult EditDescription(int competencyAssessmentId)
[Route("/CompetencyAssessments/{competencyAssessmentId}/Description/")]
public IActionResult SaveDescription(EditDescriptionViewModel model)
{
if (string.IsNullOrWhiteSpace(StringHelper.StripHtmlTags(model.Description)))
{
ModelState.AddModelError(nameof(EditDescriptionViewModel.Description), "Please enter introductory text");
}
if (!ModelState.IsValid)
{
return View("EditDescription", model);
Expand Down Expand Up @@ -712,11 +716,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
4 changes: 1 addition & 3 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@
populate-with-current-value="true"
spell-check="false" />
</nhs-form-group>
<nhs-form-group>
<vc:single-checkbox asp-for="@nameof(Model.TaskStatus)" label="Mark this task as complete" hint-text="You will still be able to make changes after marking this task as complete."></vc:single-checkbox>
</nhs-form-group>
<vc:single-checkbox asp-for="@nameof(Model.TaskStatus)" label="Mark this task as complete" hint-text="You will still be able to make changes after marking this task as complete."></vc:single-checkbox>
<input name="ID" type="hidden" asp-for="ID" />
<input name="CompetencyAssessmentName" type="hidden" asp-for="CompetencyAssessmentName" />
<input name="userRole" type="hidden" asp-for="UserRole" />
Expand Down
Loading