Merge pull request #273 from TechnologyEnhancedLearning/Develop/Features/TD-2954-My-Learning-Page-Improvements-in-Performance-filter-issue

sarathlal-sarangadharan · web-flow · commit 5c2e39e0cbcd · 2024-04-11T09:07:21.000+01:00
TD-2954: Filter issue in combination of Assessment and Completed (Issue1) fixed
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
@@ -246,7 +246,7 @@ FROM (
 												)
 										  )
 										  OR
-												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
+												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
 										--OR         
 										--(
 										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
@@ -361,7 +361,7 @@ FROM (
 									AND 
 										(
 											 (SELECT TOP(1)
-													[AssessmentResourceActivity3].[Score]
+													ISNULL([AssessmentResourceActivity3].[Score],0)
 											 FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3]
 											 WHERE  
 													[AssessmentResourceActivity3].[Deleted] = 0
@@ -390,7 +390,7 @@ FROM (
 									
 									AND        
 										(
-										   (SELECT TOP(1) [AssessmentResourceActivity5].[Score]
+										   (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0)
 											   FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
 											   WHERE  [AssessmentResourceActivity5].[Deleted] = 0
 											   AND  [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2))
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
@@ -161,7 +161,7 @@ FROM (
 												)
 										  )
 										  OR
-												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
+												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
 
 										--OR         
 										--(
@@ -277,7 +277,7 @@ FROM (
 									AND 
 										(
 											 (SELECT TOP(1)
-													[AssessmentResourceActivity3].[Score]
+													ISNULL([AssessmentResourceActivity3].[Score],0)
 											 FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3]
 											 WHERE  
 													[AssessmentResourceActivity3].[Deleted] = 0
@@ -306,7 +306,7 @@ FROM (
 									
 									AND        
 										(
-										   (SELECT TOP(1) [AssessmentResourceActivity5].[Score]
+										   (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0)
 											   FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
 											   WHERE  [AssessmentResourceActivity5].[Deleted] = 0
 											   AND  [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2))

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ FROM (`
`246`	`246`	`)`
`247`	`247`	`)`
`248`	`248`	`OR`
`249`		`- ([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3)`
	`249`	`+ ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)`
`250`	`250`	`--OR`
`251`	`251`	`--(`
`252`	`252`	`-- ([Res].[ResourceTypeId] IN (1,5,10,12) AND [ResourceActivity].[ActivityStatusId] = 3)`
`@@ -361,7 +361,7 @@ FROM (`
`361`	`361`	`AND`
`362`	`362`	`(`
`363`	`363`	`(SELECT TOP(1)`
`364`		`- [AssessmentResourceActivity3].[Score]`
	`364`	`+ ISNULL([AssessmentResourceActivity3].[Score],0)`
`365`	`365`	`FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3]`
`366`	`366`	`WHERE`
`367`	`367`	`[AssessmentResourceActivity3].[Deleted] = 0`
`@@ -390,7 +390,7 @@ FROM (`
`390`	`390`
`391`	`391`	`AND`
`392`	`392`	`(`
`393`		`- (SELECT TOP(1) [AssessmentResourceActivity5].[Score]`
	`393`	`+ (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0)`
`394`	`394`	`FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]`
`395`	`395`	`WHERE [AssessmentResourceActivity5].[Deleted] = 0`
`396`	`396`	`AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2))`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ FROM (`
`161`	`161`	`)`
`162`	`162`	`)`
`163`	`163`	`OR`
`164`		`- ([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3)`
	`164`	`+ ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)`
`165`	`165`
`166`	`166`	`--OR`
`167`	`167`	`--(`
`@@ -277,7 +277,7 @@ FROM (`
`277`	`277`	`AND`
`278`	`278`	`(`
`279`	`279`	`(SELECT TOP(1)`
`280`		`- [AssessmentResourceActivity3].[Score]`
	`280`	`+ ISNULL([AssessmentResourceActivity3].[Score],0)`
`281`	`281`	`FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3]`
`282`	`282`	`WHERE`
`283`	`283`	`[AssessmentResourceActivity3].[Deleted] = 0`
`@@ -306,7 +306,7 @@ FROM (`
`306`	`306`
`307`	`307`	`AND`
`308`	`308`	`(`
`309`		`- (SELECT TOP(1) [AssessmentResourceActivity5].[Score]`
	`309`	`+ (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0)`
`310`	`310`	`FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]`
`311`	`311`	`WHERE [AssessmentResourceActivity5].[Deleted] = 0`
`312`	`312`	`AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2))`