Merge pull request #3332 from TechnologyEnhancedLearning/Develop/feature/TD-5611-Cannot-be-enrolled-retired-SA

TD-5611-Supervise - modified SQL query to hide retired self-assessment role profiles

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -796,7 +796,8 @@ FROM    CandidateAssessments AS CA
                              WHERE (DelegateUserID = @delegateUserId) AND (RemovedDate IS NULL)
                                 AND (CompletedDate IS NULL)))
                         AND ((rp.SupervisorSelfAssessmentReview = 1) OR (rp.SupervisorResultsReview = 1))
-                        AND (ISNULL(@categoryId, 0) = 0 OR rp.CategoryID = @categoryId)", new { delegateUserId, centreId, categoryId }
+                        AND (ISNULL(@categoryId, 0) = 0 OR rp.CategoryID = @categoryId) AND 
+						((CAST(rp.RetirementDate AS DATE) >= CAST(GETUTCDATE() AS DATE)) OR rp.RetirementDate IS NULL)", new { delegateUserId, centreId, categoryId }
                 );
         }