From 774d3c7c2c4c9f0c27fe01aa563a46073b9a3f07 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Tue, 30 Apr 2024 17:06:44 +0100 Subject: [PATCH] TD-4106: Doplicate record for assessment with dafault date issue resolved --- .../Activity/GetUserLatestActivityCheck.sql | 5 +++++ .../Stored Procedures/Activity/GetUserLearningActivities.sql | 5 +++++ .../Activity/GetUserLearningActivitiesCount.sql | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql index 2ae321439..99543b933 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql @@ -166,6 +166,11 @@ FROM ( ) ) + AND + ( + -- resource type is not assessment and activity status is Complete/Incomplete + [Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3) + ) ) AS [t2] LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId] diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql index f1c121dba..68d69fe64 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql @@ -234,6 +234,11 @@ FROM ( ) ) + AND + ( + -- resource type is not assessment and activity status is Complete/Incomplete + [Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3) + ) AND ( @filterActivityStatus = 0 diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql index 29d549dba..16f18b122 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql @@ -149,6 +149,11 @@ FROM ( ) ) + AND + ( + -- resource type is not assessment and activity status is Complete/Incomplete + [Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3) + ) AND ( @filterActivityStatus = 0