Skip to content

TD-5307 Select competency framework source #3417

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
sherif-olaboye wants to merge 3 commits into
base: DLS-Release-v1.3.0
Choose a base branch
from
Open

TD-5307 Select competency framework source #3417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7775a12
TD-5307 Select competency framework source
sherif-olaboye Nov 5, 2025
470ffc6
TD-5307 Refactoring validation
sherif-olaboye Nov 26, 2025
327128a
TD-5307 Adding none for compentency with no framework linked
sherif-olaboye Nov 26, 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
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ FROM AdminUsers
SelfAssessmentFrameworks saf2
INNER JOIN Frameworks f ON f.ID = saf2.FrameworkId
WHERE
saf2.SelfAssessmentId = sa.ID
saf2.SelfAssessmentId = sa.ID AND saf2.RemovedDate IS NULL
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, ''
) AS LinkedFrameworks,
(SELECT ProfessionalGroup
Expand Down
7 changes: 5 additions & 2 deletions ...earningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,12 @@ public IActionResult SelectFrameworkSources(SelectFrameworkSourcesFormData model
{
var adminId = GetAdminID();
var competencyAssessmentId = model.CompetencyAssessmentId;
if (!ModelState.IsValid)
if (!ModelState.IsValid || (model.FrameworkId == 0 && model.ActionName == "AddFramework"))
{

if (model.FrameworkId == 0 && model.ActionName == "AddFramework")
Copy link
Collaborator

@rshrirohit rshrirohit Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of doing this, please do the validation in the Model (make the frameworkid nullable so that it can't accept zero as a value. you'll have to change in cshtml as well where a default value of zero is provided)

Copy link
Contributor Author

@sherif-olaboye sherif-olaboye Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

{
ModelState.AddModelError(nameof(model.FrameworkId), "You must select the framework sources you wish to add to the competency assessment");
}
var frameworks = frameworkService.GetAllFrameworks(adminId);
var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
if (competencyAssessmentBase == null)
Expand Down
10 changes: 10 additions & 0 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
@model SelectFrameworkSourcesViewModel;
@{
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Title"] = "Select Framework Sources";
ViewData["Application"] = "Framework Service";
}
Expand Down Expand Up @@ -29,6 +30,15 @@
}
</style>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.FrameworkId) })" />
}

</div>
</div>
<h1>Select framework sources for @Model.CompetencyAssessmentName</h1>
<dl class="nhsuk-summary-list">
@if (Model.PrimaryFramework != null)
Expand Down
Loading