Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ LEFT OUTER JOIN AdminUsers AS au
ON sd.SupervisorAdminID = au.AdminID
INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID AND au.CentreID = da.CentreID AND da.Active=1
INNER JOIN SelfAssessments sa
ON sa.ID = ca.SelfAssessmentID";
ON sa.ID = ca.SelfAssessmentID
INNER JOIN CentreSelfAssessments cs ON sa.ID = cs.SelfAssessmentID AND CS.CentreID = au.CentreID";

public SelfAssessmentSupervisor? GetSupervisorForSelfAssessmentId(int selfAssessmentId, int delegateUserId)
{
Expand Down Expand Up @@ -129,6 +130,7 @@ FROM SupervisorDelegates AS sd
INNER JOIN CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID
INNER JOIN AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID AND au.Active = 1
INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID and au.CentreID = da.CentreID and da.Active=1
INNER JOIN CentreSelfAssessments cs ON cs.SelfAssessmentID = @selfAssessmentId AND cs.CentreID = au.CentreID
WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID IS NOT NULL) AND (sd.DelegateUserID = @delegateUserId)
AND (au.Supervisor = 1 OR au.NominatedSupervisor = 1) AND (au.Active = 1)
AND (ca.SelfAssessmentID <> @selfAssessmentId)
Expand Down
Loading