From 0e15d1818936ec8ed89c3dcd631f842b939cdddc Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Fri, 17 Jan 2025 09:44:22 +0000 Subject: [PATCH 1/2] TD-5255: The My learning page does show the activity but it's not showing up under accessed learning --- .../Resources/GetMyInProgressDashboardResources.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql index 7464de6e3..0b4c79c4a 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql @@ -31,7 +31,7 @@ BEGIN INSERT INTO @MyActivity SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId FROM - (SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id order by a.Id desc OFFSET 0 ROWS) ra + (SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity WHERE UserId = @UserId GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id order by a.Id desc OFFSET 0 ROWS) ra JOIN [resources].[Resource] r ON ra.ResourceId = r.Id JOIN [resources].[ResourceVersion] rv ON rv.Id = ra.ResourceVersionId LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId From 86f0068e9ab18f1d665d9431aba3063dfe39ab92 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Fri, 17 Jan 2025 09:45:16 +0000 Subject: [PATCH 2/2] Comments added --- .../Resources/GetMyInProgressDashboardResources.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql index 0b4c79c4a..a56e37084 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql @@ -7,6 +7,7 @@ -- -- 24 Jun 2024 OA Initial Revision -- 27 Jun 2024 SA My Learning Dashboard Tray showing Wrong Counts +-- 17 Jan 2025 TD-5255: SA The My learning page does show the activity but it's not showing up under accessed learning ------------------------------------------------------------------------------- CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]