Skip to content

TD-5131 Self-assessmentManageSupervisorstilldisplaystheSupervisoreventhoughsupervisorroleisremovedfromtheAdministrator #3033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2024
Merged

TD-5131 Self-assessmentManageSupervisorstilldisplaystheSupervisoreventhoughsupervisorroleisremovedfromtheAdministrator #3033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...utions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int delegateUserId
return connection.Query<SelfAssessmentSupervisor>(
@$"{SelectSelfAssessmentSupervisorQuery}
WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @delegateUserId)
AND (ca.SelfAssessmentID = @selfAssessmentId)
AND (ca.SelfAssessmentID = @selfAssessmentId) AND (au.Supervisor = 1 or au.NominatedSupervisor = 1)
AND (au.CategoryID = 0 OR au.CategoryID IN (select CategoryID from SelfAssessments where ID = @selfAssessmentId))
ORDER BY SupervisorName",
new { selfAssessmentId, delegateUserId }
Expand All @@ -95,7 +95,7 @@ int delegateUserId
WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.DelegateUserID = @delegateUserId)
AND (ca.SelfAssessmentID = @selfAssessmentId) AND (sd.SupervisorAdminID IS NOT NULL)
AND (coalesce(sasr.ResultsReview, 1) = 1)
AND au.Active = 1
AND au.Active = 1 AND (au.Supervisor = 1 or au.NominatedSupervisor = 1)
AND (au.CategoryID = 0 OR au.CategoryID IN (select CategoryID from SelfAssessments where ID = @selfAssessmentId))
ORDER BY SupervisorName",
new { selfAssessmentId, delegateUserId }
Expand Down
Loading