Skip to content

Commit 1a9a537

Browse files
authored
Merge pull request #3372 from TechnologyEnhancedLearning/Develop/Fix/TD-6139-Nominated-Supervisors-listed-on-certificate
TD-6139-Retrieved only those accessors who have verified the assessment results
2 parents 0d3cbbe + 357129c commit 1a9a537

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,13 @@ public IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserI
513513
{
514514
return connection.Query<Accessor>(
515515
@"SELECT CASE WHEN AccessorPRN IS NOT NULL THEN AccessorName+', '+AccessorPRN ELSE AccessorName END AS AccessorList,AccessorName,AccessorPRN
516-
FROM (SELECT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
516+
FROM (SELECT DISTINCT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
517517
u.ProfessionalRegistrationNumber AS AccessorPRN
518518
FROM SupervisorDelegates AS sd
519519
INNER JOIN CandidateAssessmentSupervisors AS cas
520520
ON sd.ID = cas.SupervisorDelegateId
521+
INNER JOIN SelfAssessmentResultSupervisorVerifications AS srsv
522+
ON cas.ID = srsv.CandidateAssessmentSupervisorID
521523
INNER JOIN CandidateAssessments AS ca
522524
ON cas.CandidateAssessmentID = ca.ID
523525
LEFT OUTER JOIN AdminUsers AS au
@@ -527,7 +529,8 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
527529
ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
528530
INNER JOIN Users AS u ON U.PrimaryEmail = au.Email
529531
WHERE
530-
(sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)) Accessor
532+
(ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)
533+
AND (srsv.Verified IS NOT NULL)) Accessor
531534
ORDER BY AccessorName, AccessorPRN DESC",
532535
new { selfAssessmentId, delegateUserID }
533536
);

0 commit comments

Comments
 (0)