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 GetAccessor(int selfAssessmentId, int delegateUserI { return connection.Query( @"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 } ); 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, 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"; }
@@ -10,12 +10,12 @@

It looks like you still need to link your accounts. You might be seeing this because:

    -
  • 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.
  • -
  • Or, you might not have a DLS account. You will need to create a DLS account and link your Learning Hub accout.
  • +
  • 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.
  • +
  • Or, you might not have a DLS account. You will need to create a DLS account and link your Learning Hub account.
-

+

- Return to home page + Return to home page