Skip to content

TD-3688: Issue fix for Completed status resource showing in In progress tray #212

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
Mar 19, 2024
Merged

TD-3688: Issue fix for Completed status resource showing in In progress tray #212

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
5 changes: 3 additions & 2 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 @@ -223,7 +223,8 @@ BEGIN
BEGIN
INSERT INTO @MyActivity
SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
FROM activity.ResourceActivity ra
FROM
(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId,ActivityStatusId ) 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
Expand All @@ -234,7 +235,7 @@ BEGIN
AND (
(r.ResourceTypeId IN (1, 5, 8, 10, 12) AND ra.ActivityStatusId <> 1)
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))
OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (6))
OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (1)))
)
Expand Down