Skip to content

TD-6952 Working group page content improvements #3592

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 1 commit into from
May 27, 2026
Merged

TD-6952 Working group page content improvements #3592

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
7 changes: 6 additions & 1 deletion ...earningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,8 @@ public IActionResult AssessmentWorkingGroup(int competencyAssessmentId, string a
public IActionResult AssessmentWorkingGroup(WorkingGroupCollaboratorsViewModel model, bool canModify, string actionName)
{
int? centreID = GetCentreId();
if (actionName == "Collaborators" || actionName == "CollaboratorReview")

if (actionName == "Collaborators")
{
var collaboratorId = competencyAssessmentService.AddCollaboratorToCompetencyAssessment(model.CompetencyAssessmentID, model.UserEmail, canModify, centreID);
if (collaboratorId > 0)
Expand Down Expand Up @@ -929,6 +930,10 @@ public IActionResult AssessmentWorkingGroup(WorkingGroupCollaboratorsViewModel m
return RedirectToAction("AssessmentWorkingGroup", "CompetencyAssessments", new { model.CompetencyAssessmentID, actionName = actionName });

}
else if(actionName == "CollaboratorReview")
{
return RedirectToAction("SendForReview", "CompetencyAssessments", new { model.CompetencyAssessmentID, actionName = actionName });
}
else
{
competencyAssessmentService.UpdateWorkingGroupTaskStatus(model.CompetencyAssessmentID, model.CompetencyAssessmentTaskStatus ?? false, null);
Expand Down
20 changes: 10 additions & 10 deletions ...LearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,20 @@ Select working group members</h1>
<form method="post">
@if (Model.UserRole > 1)
{
<label class="nhsuk-label nhsuk-u-margin-top-6" for="add-user-hint">
<h2>Add a user as a:</h2>
<label class="nhsuk-label nhsuk-u-margin-top-6">
<p>Add a user as a:</p>
</label>
<ul class="nhsuk-list nhsuk-list--bullet">
<li>Contributor</li>
<li>Reviewer</li>
</ul>
<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">
<label class="nhsuk-label nhsuk-u-margin-top-6">
<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
Expand Down Expand Up @@ -98,8 +100,6 @@ Select working group members</h1>
</tbody>
</table>
</div>
<input type="hidden" asp-for="ActionName" />

<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 Down Expand Up @@ -134,13 +134,13 @@ Select working group members</h1>
@if (Model.ActionName == "CollaboratorReview")
{
<a class="nhsuk-button" asp-action="SendForReview" asp-route-actionName="CollaboratorReview" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">
Add
Save
</a>
}
else
{
<button class="nhsuk-button" asp-route-actionName="Summary" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID" asp-route-taskStatus="@Model.CompetencyAssessmentTaskStatus">
Add
Save
</button>
}
</div>
Expand Down
Loading