From a91e39fc507d7665da9e10d1490f8e1b74041359 Mon Sep 17 00:00:00 2001
From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com>
Date: Tue, 26 May 2026 11:26:12 +0100
Subject: [PATCH] TD-6952 Working group page content improvements

---
 .../CompetencyAssessments.cs                  |  7 ++++++-
 .../CompetencyAssessmentWorkingGroup.cshtml   | 20 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index 2581f964b9..fa6d9f76b2 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -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)
@@ -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);
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
index caa62ccbe6..d678d84aa5 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
@@ -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
@@ -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">
@@ -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>