Skip to content

TD-6955 Role requirements page consistency fixes #3535

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

Merged
rshrirohit merged 2 commits into from
Apr 22, 2026
Merged

TD-6955 Role requirements page consistency fixes #3535

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
83129e5
TD-6955 Role requirements page consistency fixes
sherif-olaboye Apr 13, 2026
8a6a3ec
Merge branch 'DLS-Release-v1.3.1' into Develop/Features/TD-6955-Roler…
rshrirohit Apr 15, 2026
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: 11 additions & 3 deletions ...alLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,16 @@
</div>
</nav>
}
<h1>Edit @Model.VocabularySingular.ToLower() role requirements</h1>
<p class="nhsuk-lede-text">
Manage role requirements @Model.CompetencyAssessmentName @Model.VocabularySingular.ToLower() self-assessment questions.
<div class="nhsuk-form-group">
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
@Model.VocabularySingular role requirements
</h1>
<p>
Manage role requirements self-assessment questions.
</p>
@foreach (var group in Model.GroupedCompetencyWithAssessmentRoleRequirements)
{
Expand Down Expand Up @@ -91,3 +98,4 @@
Cancel
</a>
</div>
</div>
2 changes: 2 additions & 0 deletions ...alLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
</div>
</nav>
}
<div class="nhsuk-form-group">
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
Expand Down Expand Up @@ -64,3 +65,4 @@
Cancel
</a>
</div>
</div>
12 changes: 3 additions & 9 deletions ...ningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,15 @@
</div>
</nav>
}
<div class="nhsuk-form-group">
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
@Model.VocabularySingular.ToLower() role requirements
@Model.VocabularySingular role requirements
</h1>
<dl class="nhsuk-summary-list">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.VocabularySingular assessment
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CompetencyAssessmentName
</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.VocabularySingular group
Expand Down Expand Up @@ -165,3 +158,4 @@
Cancel
</a>
</div>
</div>
2 changes: 2 additions & 0 deletions ...earningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
</div>
</nav>
}
<div class="nhsuk-form-group">
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
Expand Down Expand Up @@ -64,3 +65,4 @@
Cancel
</a>
</div>
</div>
26 changes: 14 additions & 12 deletions ...LearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,31 @@
</div>
</nav>
}

<div class="nhsuk-form-group">
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
@Model.VocabularySingular.ToLower() role requirements</h1>
</span>
Self-assessment @Model.VocabularySingular.ToLower() role requirements
</h1>

<p class="nhsuk-lede-text">
Specify whether role requirements will be enforced for the @Model.CompetencyAssessmentName self-assessment. When requirements are set, they must be met by the learner before the self-assessment can be signed off.
</p>
<p>
Specify whether role requirements will be enforced for the self-assessment. When requirements are set, they must be met by the learner before the self-assessment can be signed off.
</p>
<dl class="nhsuk-summary-list">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Enforce role requirements for self-assessment
Enforce role requirements
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.EnforceRoleRequirementsForSignOff)
{
<text>Yes. Enforce role requirements.</text>
<text>Yes.</text>
}
else
{
<text>No. Do not enforce role requirements.</text>
<text>No.</text>
}
</dd>
@if (Model.UserRole > 1)
Expand All @@ -56,16 +57,16 @@
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Include requirement status filters
Role requirement filters
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.IncludeRequirementsFilters)
{
<text>Yes. Include filters.</text>
<text>Yes.</text>
}
else
{
<text>No. Do not include filters.</text>
<text>No.</text>
}
</dd>
@if (Model.UserRole > 1)
Expand Down Expand Up @@ -112,3 +113,4 @@
Cancel
</a>
</div>
</div>
2 changes: 1 addition & 1 deletion ...ningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@

<td class="nhsuk-table__cell">
<a class="nhsuk-link" asp-action="EditQuestionResponseRoleRequirements" asp-route-competencyAssessmentId="@Model.AssessmentID" asp-route-competencyId="@Model.CompetencyID" asp-route-assessmentQuestionId="@Model.AssessmentQuestionID">
Edit
Change
</a>
</td>
Loading