Skip to content

TD-7229-Hidden the 'Mark this task as complete' checkbox for the viewer role #3626

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.2
Choose a base branch
from
Open

TD-7229-Hidden the 'Mark this task as complete' checkbox for the viewer role #3626

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
a93186b
TD-7229-Hidden 'Mark this task as complete' checkbox for the viewer role
Auldrin-Possa Jun 16, 2026
44b60ff
Code optimized.
Auldrin-Possa Jun 16, 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
7 changes: 5 additions & 2 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
<span class="nhsuk-u-visually-hidden"> – </span>
</span>Summary
</h1>


<dl class="nhsuk-summary-list word-break">
@if (Model.IsSupervisionSwitchedOn)
Expand Down Expand Up @@ -429,7 +429,10 @@
</dl>
</div>
</div>
<vc:single-checkbox asp-for="@nameof(Model.SelfAssessmentOptionsTaskStatus)" 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>
@if (Model.UserRole > 1)
{
<vc:single-checkbox asp-for="@nameof(Model.SelfAssessmentOptionsTaskStatus)" 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>
}
}
@if (index > 0 && Model.CurrentStep < (int)OptionLabel.Summary)
{
Expand Down
105 changes: 53 additions & 52 deletions ...LearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
Select working group members</h1>
Select working group members
</h1>
<form method="post">
@if (Model.UserRole > 1)
{
Expand All @@ -45,61 +46,61 @@ Select working group members</h1>
<li>Reviewer</li>
</ul>
<label class="nhsuk-label nhsuk-u-margin-top-6">
<p>to help create your competency assessment</p>
<p>to help create your competency assessment</p>
</label>
<div class="nhsuk-table__panel-with-heading-tab">
<h2 class="nhsuk-table__heading-tab">Working group members</h2>
<table role="presentation" class="nhsuk-table-responsive">
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
User
</th>
<th role="columnheader" class="" scope="col">
Role
</th>
@if (Model.Collaborators.Count() > 1 && Model.UserRole > 1)
{
<th role="columnheader" class="" scope="col">
Actions
</th>
}
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var collaborator in Model.Collaborators)
{
<tr role="row" class="nhsuk-table__row collaborator-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">User </span>
<span class="framework-collaborator-user">
@collaborator.UserEmail @(collaborator.UserActive == true ? "" : "(inactive)")
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Role </span>
<span class="framework-collaborator-role">
<partial name="Shared/_RoleTag" model="collaborator" />
</span>
</td>
@if (Model.Collaborators.Count() > 1 && Model.UserRole > 1)
<h2 class="nhsuk-table__heading-tab">Working group members</h2>
<table role="presentation" class="nhsuk-table-responsive">
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
User
</th>
<th role="columnheader" class="" scope="col">
Role
</th>
@if (Model.Collaborators.Count() > 1 && Model.UserRole > 1)
{
<th role="columnheader" class="" scope="col">
Actions
</th>
}
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var collaborator in Model.Collaborators)
{
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (collaborator.CompetencyAssessmentRole != "Owner")
<tr role="row" class="nhsuk-table__row collaborator-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">User </span>
<span class="framework-collaborator-user">
@collaborator.UserEmail @(collaborator.UserActive == true ? "" : "(inactive)")
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Role </span>
<span class="framework-collaborator-role">
<partial name="Shared/_RoleTag" model="collaborator" />
</span>
</td>
@if (Model.Collaborators.Count() > 1 && Model.UserRole > 1)
{
<a asp-action="RemoveCollaborator" asp-route-actionName="Collaborators" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID" asp-route-id="@collaborator.ID" )">
Remove
</a>
}
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (collaborator.CompetencyAssessmentRole != "Owner")
{
<a asp-action="RemoveCollaborator" asp-route-actionName="Collaborators" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID" asp-route-id="@collaborator.ID" )">
Remove
</a>
}

</td>
</td>
}
</tr>
}
</tr>
}
</tbody>
</table>
</div>
</tbody>
</table>
</div>
<div class="@(Model.Error ? "nhsuk-form-group nhsuk-form-group--error" : "nhsuk-form-group")">
<div class=" sort-select-container">
<label class="nhsuk-label" for="UserEmail">
Expand All @@ -126,10 +127,10 @@ Select working group members</h1>
Add as reviewer
</button>
}
<vc:single-checkbox asp-for="@nameof(Model.CompetencyAssessmentTaskStatus)" 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>

@if (Model.UserRole > 1)
{
<vc:single-checkbox asp-for="@nameof(Model.CompetencyAssessmentTaskStatus)" 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>

<div class=" nhsuk-u-margin-top-6">
@if (Model.ActionName == "CollaboratorReview")
{
Expand Down
9 changes: 6 additions & 3 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@
<input type="text" id="category-field" name="Category" maxlength="100" class="nhsuk-input nhsuk-u-width-two-thirds" asp-for="Category" />
</div>
</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>
@if (Model.UserRole > 1)
{
<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>
}
<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
5 changes: 4 additions & 1 deletion DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@
populate-with-current-value="true"
spell-check="false" />
</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>
@if (Model.UserRole > 1)
{
<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
9 changes: 6 additions & 3 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,12 @@ else if (Model.ActionName == "EditRole" && Model.SubGroupId != null)
else if (Model.ActionName == "Summary")
{
<form method="post">
<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>
@if (Model.UserRole > 1)
{
<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>
}
<input type="hidden" asp-for="ID" />
<input type="hidden" asp-for="CompetencyAssessmentName" />
<input type="hidden" asp-for="ProfessionalGroupId" />
Expand Down
9 changes: 6 additions & 3 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,12 @@
</fieldset>
<span nhs-validation-for="Vocabulary"></span>
</nhs-form-group>
<nhs-form-group nhs-validation-for="TaskStatus">
<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>
@if (Model.UserRole > 1)
{
<nhs-form-group nhs-validation-for="TaskStatus">
<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>
}
<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
145 changes: 74 additions & 71 deletions ...LearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,95 +23,98 @@
</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>
<h1 class="app-page-heading">
<span class="nhsuk-caption-xl">
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
Self-assessment @Model.VocabularySingular.ToLower() role requirements
</h1>

<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
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.EnforceRoleRequirementsForSignOff)
<dl class="nhsuk-summary-list">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Enforce role requirements
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.EnforceRoleRequirementsForSignOff)
{
<text>Yes.</text>
}
else
{
<text>No.</text>
}
</dd>
@if (Model.UserRole > 1)
{
<text>Yes.</text>
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditEnforceRoleRequirementsForSignOff">Change<span class="nhsuk-u-visually-hidden"> role requirements enforcement</span></a>
</dd>
}
else
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Role requirement filters
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.IncludeRequirementsFilters)
{
<text>Yes.</text>
}
else
{
<text>No.</text>
}
</dd>
@if (Model.UserRole > 1)
{
<text>No.</text>
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditIncludeRequirementsFilters">Change<span class="nhsuk-u-visually-hidden"> include requirements filters</span></a>
</dd>
}
</dd>
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditEnforceRoleRequirementsForSignOff">Change<span class="nhsuk-u-visually-hidden"> role requirements enforcement</span></a>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.VocabularySingular role requirements
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CountCompetencyRequirements @Model.VocabularySingular.ToLower() assessment questions with role requirements set.
</dd>
}
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Role requirement filters
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.IncludeRequirementsFilters)
@if (Model.UserRole > 1)
{
<text>Yes.</text>
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditCompetencyRoleRequirements">Change<span class="nhsuk-u-visually-hidden"> include requirements filters</span></a>
</dd>
}
else
</div>
</dl>
<form method="post" asp-action="ManageCompetencyRoleRequirements">
<nhs-form-group>
<input type="hidden" asp-for="Id" />
<input type="hidden" asp-for="EnforceRoleRequirementsForSignOff" />
<input type="hidden" asp-for="IncludeRequirementsFilters" />
@if (Model.UserRole > 1)
{
<text>No.</text>
<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>
}
</dd>
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditIncludeRequirementsFilters">Change<span class="nhsuk-u-visually-hidden"> include requirements filters</span></a>
</dd>
}
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.VocabularySingular role requirements
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CountCompetencyRequirements @Model.VocabularySingular.ToLower() assessment questions with role requirements set.
</dd>
</nhs-form-group>
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.Id" asp-action="EditCompetencyRoleRequirements">Change<span class="nhsuk-u-visually-hidden"> include requirements filters</span></a>
</dd>
<button class="nhsuk-button" type="submit">
Save
</button>
}
</form>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Cancel
</a>
</div>
</dl>
<form method="post" asp-action="ManageCompetencyRoleRequirements">
<nhs-form-group>
<input type="hidden" asp-for="Id" />
<input type="hidden" asp-for="EnforceRoleRequirementsForSignOff" />
<input type="hidden" asp-for="IncludeRequirementsFilters" />
<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>
@if (Model.UserRole > 1)
{
<button class="nhsuk-button" type="submit">
Save
</button>
}
</form>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Cancel
</a>
</div>
</div>
Loading
Loading