TD-5131 Self-assessment Manage Supervisor still displays the Supervisor even though supervisor role is removed from the Administrator

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -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 }
@@ -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 }