Merge pull request #283 from TechnologyEnhancedLearning/Develop/Features/TD-2954-My-Learning-Page-Improvements-in-Performance-BugFix

TD-2954: Filter fix

Author: sarathlal-sarangadharan

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql

@@ -362,7 +362,7 @@ FROM (
 									AND 
 										(
 											 (SELECT TOP(1)
-													ISNULL([AssessmentResourceActivity3].[Score],0)
+													[AssessmentResourceActivity3].[Score]
 											 FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3]
 											 WHERE  
 													[AssessmentResourceActivity3].[Deleted] = 0
@@ -391,7 +391,7 @@ FROM (
 
 									AND        
 										(
-										   (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0)
+										   (SELECT TOP(1) [AssessmentResourceActivity5].[Score]
 											   FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
 											   WHERE  [AssessmentResourceActivity5].[Deleted] = 0
 											   AND  [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2))

WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs

@@ -400,11 +400,14 @@ private void BindAssessmentResourceActivityNestedData(List<MyLearningActivity> r
                     List<AssessmentResourceActivityInteraction> assessmentResourceActivityInteractionList = new List<AssessmentResourceActivityInteraction>();
                     foreach (var item in c)
                     {
-                        AssessmentResourceActivityInteraction assessmentResourceActivityInteraction = new AssessmentResourceActivityInteraction();
-                        assessmentResourceActivityInteraction.AssessmentResourceActivityId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_AssessmentResourceActivityId ?? 0;
-                        assessmentResourceActivityInteraction.Id = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id ?? 0;
-                        assessmentResourceActivityInteraction.QuestionBlockId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId ?? 0;
-                        assessmentResourceActivityInteractionList.Add(assessmentResourceActivityInteraction);
+                        if (i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id != null)
+                        {
+                            AssessmentResourceActivityInteraction assessmentResourceActivityInteraction = new AssessmentResourceActivityInteraction();
+                            assessmentResourceActivityInteraction.AssessmentResourceActivityId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_AssessmentResourceActivityId ?? 0;
+                            assessmentResourceActivityInteraction.Id = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id ?? 0;
+                            assessmentResourceActivityInteraction.QuestionBlockId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId ?? 0;
+                            assessmentResourceActivityInteractionList.Add(assessmentResourceActivityInteraction);
+                        }
                     }
 
                     assessmentResourceActivity.AssessmentResourceActivityInteractions = assessmentResourceActivityInteractionList;