Merge pull request #335 from TechnologyEnhancedLearning/Develop/Fixes/LH/TD-4115_Issues-on-showing-statuses-on-My-accessed-Learning'

Swapnamol · web-flow · commit d3430a22491b · 2024-05-02T16:21:51.000+01:00
TD-4115: Issue 3 - Contributed to ‘Formal assessment’ slide viewer im…
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
@@ -239,7 +239,7 @@ BEGIN
 				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
 					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
 					OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (3))
-					OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (1))) 
+					OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) 
 					)		
 				GROUP BY ra.ResourceId	
 				ORDER BY ResourceActivityId DESC

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ BEGIN`
`239`	`239`	`OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))`
`240`	`240`	`OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))`
`241`	`241`	`OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (3))`
`242`		`- OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (1)))`
	`242`	`+ OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7))`
`243`	`243`	`)`
`244`	`244`	`GROUP BY ra.ResourceId`
`245`	`245`	`ORDER BY ResourceActivityId DESC`