Merge pull request #2172 from TechnologyEnhancedLearning/Develop/Fixes/TD-508-TD-2906-FixSPJoin

TD-508 TD-2906 Fixes sp query join to ensure all self assessments are returned

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/202309141644_AlterGetActivitiesForDelegateEnrolmentSPNotHiddenInLearningPortal.cs renamed to DigitalLearningSolutions.Data.Migrations/202310031044_AlterGetActivitiesForDelegateEnrolmentSPNotHiddenInLearningPortal.cs

@@ -2,7 +2,7 @@
 {
     using FluentMigrator;
 
-    [Migration(202309141645)]
+    [Migration(202310031044)]
     public class AlterGetActivitiesForDelegateEnrolmentSPNotHiddenInLearningPortal : Migration
     {
         public override void Up()

DigitalLearningSolutions.Data.Migrations/Scripts/TD-2508-GetActivitiesForDelegateEnrolmentHiddenInLearningPortalTweak.sql

@@ -43,9 +43,9 @@ AS
 										 FROM    CourseCategories
 										 WHERE (CourseCategoryID = SA.CategoryID)) AS Category,
 										 '' AS Topic, IIF(CA.RemovedDate IS NULL,0,1) AS DelegateStatus,
-                                         null AS HideInLearnerPortal
+                                         0 AS HideInLearnerPortal
 						FROM   SelfAssessments AS SA 
-		INNER JOIN CentreSelfAssessments AS CSA ON SA.Id = CSA.SelfAssessmentID AND CSA.CentreId = @centreId AND CSA.AllowEnrolment = 1
+		INNER JOIN CentreSelfAssessments AS CSA ON SA.Id = CSA.SelfAssessmentID AND CSA.CentreId = @centreId
 		LEFT JOIN CandidateAssessments AS CA ON CSA.SelfAssessmentID=CA.SelfAssessmentID AND CA.DelegateUserID = (SELECT UserID from DelegateAccounts where ID=@DelegateID)
 						WHERE (SA.ID NOT IN
 										 (SELECT SelfAssessmentID

DigitalLearningSolutions.Data.Migrations/Scripts/TD-2508-GetActivitiesForDelegateEnrolmentHiddenInLearningPortalTweak_down.sql

@@ -43,7 +43,7 @@ AS
 										 WHERE (CourseCategoryID = SA.CategoryID)) AS Category,
 										 '' AS Topic, IIF(CA.RemovedDate IS NULL,0,1) AS DelegateStatus
 						FROM   SelfAssessments AS SA 
-		INNER JOIN CentreSelfAssessments AS CSA ON SA.Id = CSA.SelfAssessmentID AND CSA.CentreId = @centreId AND CSA.AllowEnrolment = 1
+		INNER JOIN CentreSelfAssessments AS CSA ON SA.Id = CSA.SelfAssessmentID AND CSA.CentreId = @centreId
 		LEFT JOIN CandidateAssessments AS CA ON CSA.SelfAssessmentID=CA.SelfAssessmentID AND CA.DelegateUserID = (SELECT UserID from DelegateAccounts where ID=@DelegateID)
 						WHERE (SA.ID NOT IN
 										 (SELECT SelfAssessmentID