Skip to content

Fixed the issue with the My learning tray. Also included the excluded… #651

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
Oct 16, 2024
Merged

Fixed the issue with the My learning tray. Also included the excluded… #651

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,15 @@
<Build Include="Stored Procedures\Hierarchy\GetCataloguesCount.sql" />
<None Include="Scripts\Post-Deploy\Scripts\PPSXFileType.sql" />
<Build Include="Stored Procedures\Resources\GetMyLearningCertificatesDashboardResources.sql" />
<Build Include="Stored Procedures\Resources\GetMyInProgressDashboardResources.sql" />
<Build Include="Scripts\External\AddDigitalLearningSolutionsSso.sql" />
<Build Include="Stored Procedures\Resources\GetContributions.sql" />
<Build Include="Stored Procedures\Resources\GetMyRecentCompletedDashboardResources.sql" />
<Build Include="Stored Procedures\Resources\GetRecentDashboardResources.sql" />
<Build Include="Stored Procedures\Resources\GetScormContentDetails.sql" />
<Build Include="Stored Procedures\Resources\GetScormContentServerDetailsForLHExternalReference.sql" />
<Build Include="Tables\Resource\ScormResourceReferenceEvent.sql" />
<Build Include="Tables\Resource\ScormResourceReferenceEventType.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
Expand Down
2 changes: 1 addition & 1 deletion ...earningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 LEFT 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
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
Loading