Skip to content

TD-4115: Issues on showing statuses on 'My accessed Learning' sectionof Learning Hub Home page #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge RC changes into CI
merged 1 commit into from
May 13, 2024
Merged

TD-4115: Issues on showing statuses on 'My accessed Learning' sectionof Learning Hub Home page #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down