Skip to content

Merge Releases/phoenix Changes to CI #173

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: CI to Content Referencing V2 Branch
merged 2 commits into from
Mar 6, 2024
Merged

Merge Releases/phoenix Changes to CI #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7e7480
TD-3688: Fixed missing In progress resources in the My Accessed Learn…
sarathlal-sarangadharan Feb 27, 2024
bb1049f
Merge pull request #150 from TechnologyEnhancedLearning/Develop/Fixes…
sarathlal-sarangadharan Feb 27, 2024
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
4 changes: 2 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 @@ -15,6 +15,7 @@
-- 15 Jun 2023 RS Re-added BadgeUrl column following design change
-- 27 Sep 2023 HV Included Paging and user resource activity
-- 08 Nov 2023 OA Fixed latest resource activity entry selection(with updated logic for media activities) and status check for incomplete assessment.
-- 27 Feb 2024 SS Fixed missing In progress resources in the My Accessed Learning tray issue
-------------------------------------------------------------------------------

CREATE PROCEDURE [resources].[GetDashboardResources]
Expand Down Expand Up @@ -222,8 +223,7 @@ BEGIN
BEGIN
INSERT INTO @MyActivity
SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
FROM
(SELECT a.* 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
FROM activity.ResourceActivity 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 Down