From 6f63913f393814da8e08a15f8c3ac438627d40a7 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Mon, 13 May 2024 10:48:51 +0100 Subject: [PATCH] TD-4115: Issues on showing statuses on 'My accessed Learning' section of Learning Hub Home page --- .../Resources/GetDashboardResources.sql | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql index 4fc44526b..1618e5af4 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql @@ -18,6 +18,7 @@ -- 17 Jan 2024 SA Changes to accomadate activity status changes -- 27 Feb 2024 SS Fixed missing In progress resources in the My Accessed Learning tray issue -- 2 May 2024 SA Fixed the issue on showing statuses on 'My accessed Learning' for resource type file +-- 13 May 2024 SA TD-4115 ------------------------------------------------------------------------------- CREATE PROCEDURE [resources].[GetDashboardResources] @@ -238,11 +239,13 @@ BEGIN (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3) OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00')) OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5)))) - OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) + OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (3)) + OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (7))) + OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId IN (7)) ) GROUP BY ra.ResourceId ORDER BY ResourceActivityId DESC - + SELECT ma.ResourceActivityId, r.Id AS ResourceId ,( SELECT TOP 1 rr.OriginalResourceReferenceId FROM [resources].[ResourceReference] rr @@ -384,7 +387,8 @@ BEGIN AND ( (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5)))) - OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)) + OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5))) + OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5))) OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId IN (3))) GROUP BY ra.ResourceId ORDER BY ResourceActivityId DESC