From 51a237e9912993e1c2c048205b0fbc9e973cb1c7 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 20:32:12 +0100 Subject: [PATCH] TD-2954: Filter fix --- .../Activity/GetUserLearningActivities.sql | 4 ++-- .../Activity/ResourceActivityRepository.cs | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql index 6c5d32f69..5eb46e6cb 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql +++ b/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)) diff --git a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs index 6a5ab608a..9b70c942b 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs @@ -400,11 +400,14 @@ private void BindAssessmentResourceActivityNestedData(List r List assessmentResourceActivityInteractionList = new List(); 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;