From 357129c350c038fbe9996344d36d7738d5754100 Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Mon, 15 Sep 2025 16:30:25 +0100
Subject: [PATCH 1/3] TD-6139-Retrieved only those accessors who have verified
 the assessment results.

---
 .../CandidateAssessmentsDataService.cs                     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
index 48b267fa2e..aae3988660 100644
--- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
@@ -513,11 +513,13 @@ public IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserI
         {
             return connection.Query<Accessor>(
                 @"SELECT CASE  WHEN AccessorPRN IS NOT NULL THEN AccessorName+', '+AccessorPRN ELSE AccessorName END AS AccessorList,AccessorName,AccessorPRN   
-                   FROM (SELECT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
+                   FROM (SELECT DISTINCT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
                			u.ProfessionalRegistrationNumber AS AccessorPRN
             FROM SupervisorDelegates AS sd
             INNER JOIN CandidateAssessmentSupervisors AS cas
                 ON sd.ID = cas.SupervisorDelegateId
+            INNER JOIN SelfAssessmentResultSupervisorVerifications AS srsv
+			    ON cas.ID = srsv.CandidateAssessmentSupervisorID
             INNER JOIN CandidateAssessments AS ca
                 ON cas.CandidateAssessmentID = ca.ID
             LEFT OUTER JOIN AdminUsers AS au
@@ -527,7 +529,8 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
                 ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
 				INNER JOIN Users AS u ON U.PrimaryEmail =  au.Email 
              WHERE
-              (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)) Accessor
+                (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)
+                    AND (srsv.Verified IS NOT NULL)) Accessor
                 ORDER BY AccessorName, AccessorPRN DESC",
                 new { selfAssessmentId, delegateUserID }
             );

From 3b7d075ab886e3d1568af22f74975d23df177e2b Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Tue, 16 Sep 2025 11:31:27 +0100
Subject: [PATCH 2/3] TD-5616-Recreated multipage form data object

---
 .../Controllers/SupervisorController/Supervisor.cs             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
index fbeea40adb..65f5cc298f 100644
--- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
+++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
@@ -785,6 +785,9 @@ public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAsses
                 return View("EnrolDelegateOnProfileAssessment", model);
             }
 
+            if (sessionEnrolOnRoleProfile.SelfAssessmentID != selfAssessmentID)
+                sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile();
+
             sessionEnrolOnRoleProfile.SelfAssessmentID = selfAssessmentID;
             multiPageFormService.SetMultiPageFormData(
                 sessionEnrolOnRoleProfile,

From 007253685b9d93ebd929b303c78f5a5c06d3dad0 Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Tue, 16 Sep 2025 15:22:11 +0100
Subject: [PATCH 3/3] TD-6092-Corrected typo

---
 .../Views/Login/NotLinked.cshtml                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Login/NotLinked.cshtml b/DigitalLearningSolutions.Web/Views/Login/NotLinked.cshtml
index 766eb17715..79868ad902 100644
--- a/DigitalLearningSolutions.Web/Views/Login/NotLinked.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Login/NotLinked.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.Login
 @model AccountInactiveViewModel
 @{
-  ViewData["Title"] = "Account not linked";
+    ViewData["Title"] = "Account not linked";
 }
 
 <div class="nhsuk-grid-row">
@@ -10,12 +10,12 @@
         <p class="nhsuk-body-l">
             It looks like you still need to link your accounts. You might be seeing this because:
             <ul>
-              <li>You've got a DLS and a Learning Hub account but you've not linked them. You'll need to login to DLS and link your accounts.</li>
-              <li>Or, you might not have a DLS account. You will need to <a asp-controller="Register" asp-action="Start">create a DLS account</a> and link your Learning Hub accout.</li>
+                <li>You've got a DLS and a Learning Hub account but you've not linked them. You'll need to login to DLS and link your accounts.</li>
+                <li>Or, you might not have a DLS account. You will need to <a asp-controller="Register" asp-action="Start">create a DLS account</a> and link your Learning Hub account.</li>
             </ul>
-         </p>
+        </p>
         <a class="nhsuk-button" role="button" asp-controller="Home" asp-action="Welcome">
-          Return to home page
+            Return to home page
         </a>
     </div>
 </div>