Skip to content

Dashboard script optimization #1759

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
AnjuJose011 merged 5 commits into from
Apr 2, 2026
Merged

Dashboard script optimization #1759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9948c98
TD-7070 dashboard script optimization
OluwatobiAwe Mar 31, 2026
4c7c019
.
OluwatobiAwe Apr 1, 2026
8816e27
update
OluwatobiAwe Apr 1, 2026
228ee4d
comment cleanup
OluwatobiAwe Apr 1, 2026
8af1a15
JSON_QUERY and OUTER APPLY replacement
OluwatobiAwe Apr 1, 2026
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
145 changes: 85 additions & 60 deletions ...arningHub.Nhs.Database/Stored Procedures/Activity/GetUserInProgressLearningActivities.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
-- Modification History
-- 01-10-2025 SA added assesment score and passmark and provider details
-- 05-02-2025 SA TD-6860 : Fixed the null issue with the search history
-- 31-03-2026 OA TD-7057 Script Optimization
-------------------------------------------------------------------------------
CREATE PROCEDURE [activity].[GetUserInProgressLearningActivities] (
@userId INT
Expand All @@ -15,66 +16,90 @@ BEGIN

;WITH CTERecentActivities AS (
SELECT
ra.Id AS ActivityId,
ara.LaunchResourceActivityId AS LaunchResourceActivityId,
ra.UserId AS UserId,
ra.ResourceId AS ResourceId,
r.CurrentResourceVersionId AS ResourceVersionId,
CASE WHEN r.CurrentResourceVersionId = ra.ResourceVersionId THEN 1 ELSE 0 END AS IsCurrentResourceVersion,
(
SELECT TOP 1 rr.OriginalResourceReferenceId
FROM [resources].[ResourceReference] rr
WHERE rr.ResourceId = rv.ResourceId --AND rr.Deleted = 0
) AS ResourceReferenceID,
ra.MajorVersion AS MajorVersion,
ra.MinorVersion AS MinorVersion,
ra.NodePathId AS NodePathId,
r.ResourceTypeId AS ResourceType,
rv.Title AS Title,
--rv.[Description] AS ResourceDescription,
rv.CertificateEnabled AS CertificateEnabled,
ISNULL(ara.ActivityStatusId, ra.ActivityStatusId) AS ActivityStatus,
ra.ActivityStart AS ActivityDate,
-- ara.ActivityEnd,
ISNULL(ara.DurationSeconds, 0) AS ActivityDurationSeconds,
ara.Score AS ScorePercentage,
arv.AssessmentType AS AssessmentType,
arv.PassMark AS AssessmentPassMark,
asra.score AS AssesmentScore,
mar.SecondsPlayed AS SecondsPlayed,
ISNULL( CAST(mar.PercentComplete AS INT) ,0) AS PercentComplete,
sa.CmiCoreLesson_status AS CmiCoreLessonstatus,
sa.CmiCoreScoreMax AS CmiCoreScoreMax,
sa.CmiCoreSession_time AS CmiCoreSessiontime,
sa.DurationSeconds AS DurationSeconds,
rpAgg.ProvidersJson,
ROW_NUMBER() OVER (PARTITION BY ra.ResourceId ORDER BY ISNULL(ara.ActivityEnd, ra.ActivityStart) DESC) AS rn
FROM activity.ResourceActivity ra
LEFT JOIN activity.ResourceActivity ara ON ara.LaunchResourceActivityId = ra.Id
INNER JOIN [resources].[Resource] r ON ra.ResourceId = r.Id
INNER JOIN [resources].[ResourceVersion] rv ON rv.Id = ra.ResourceVersionId AND rv.Deleted = 0
LEFT JOIN (
SELECT
rp.ResourceVersionId,
JSON_QUERY('[' + STRING_AGG(
'{"Id":' + CAST(p.Id AS NVARCHAR) +
',"Name":"' + p.Name + '"' +
',"Description":"' + p.Description + '"' +
',"Logo":"' + ISNULL(p.Logo, '') + '"}',
',') + ']') AS ProvidersJson
FROM resources.ResourceVersionProvider rp
JOIN hub.Provider p ON p.Id = rp.ProviderId
WHERE p.Deleted = 0 and rp.Deleted = 0
GROUP BY rp.ResourceVersionId
) rpAgg ON rpAgg.ResourceVersionId = r.CurrentResourceVersionId
LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
LEFT JOIN [activity].[AssessmentResourceActivity] asra ON asra.ResourceActivityId = ra.Id
LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
WHERE ra.LaunchResourceActivityId IS NULL AND ra.userid = @userId
AND ra.deleted = 0
AND r.ResourceTypeId IN(6) --AND ra.ActivityStart >= DATEADD(MONTH, -6, SYSDATETIMEOFFSET())
)
ra.Id AS ActivityId,
ara.LaunchResourceActivityId AS LaunchResourceActivityId,
ra.UserId AS UserId,
ra.ResourceId AS ResourceId,
r.CurrentResourceVersionId AS ResourceVersionId,
CASE WHEN r.CurrentResourceVersionId = ra.ResourceVersionId THEN 1 ELSE 0 END AS IsCurrentResourceVersion,

rrRef.OriginalResourceReferenceId AS ResourceReferenceID,

ra.MajorVersion AS MajorVersion,
ra.MinorVersion AS MinorVersion,
ra.NodePathId AS NodePathId,
r.ResourceTypeId AS ResourceType,
rv.Title AS Title,
rv.CertificateEnabled AS CertificateEnabled,
ISNULL(ara.ActivityStatusId, ra.ActivityStatusId) AS ActivityStatus,
ra.ActivityStart AS ActivityDate,
ISNULL(ara.DurationSeconds, 0) AS ActivityDurationSeconds,
ara.Score AS ScorePercentage,
arv.AssessmentType AS AssessmentType,
arv.PassMark AS AssessmentPassMark,
asra.score AS AssesmentScore,
mar.SecondsPlayed AS SecondsPlayed,
ISNULL(CAST(mar.PercentComplete AS INT), 0) AS PercentComplete,
sa.CmiCoreLesson_status AS CmiCoreLessonstatus,
sa.CmiCoreScoreMax AS CmiCoreScoreMax,
sa.CmiCoreSession_time AS CmiCoreSessiontime,
sa.DurationSeconds AS DurationSeconds,
rpAgg.ProvidersJson,

ROW_NUMBER() OVER (
PARTITION BY ra.ResourceId
ORDER BY ISNULL(ara.ActivityEnd, ra.ActivityStart) DESC
) AS rn

FROM activity.ResourceActivity ra
LEFT JOIN activity.ResourceActivity ara ON ara.LaunchResourceActivityId = ra.Id
INNER JOIN resources.Resource r ON ra.ResourceId = r.Id
INNER JOIN resources.ResourceVersion rv ON rv.Id = ra.ResourceVersionId AND rv.Deleted = 0

LEFT JOIN (
SELECT
ResourceId,
MAX(Id) AS LatestRefId
FROM resources.ResourceReference
WHERE Deleted = 0
GROUP BY ResourceId
) rrLatest ON rrLatest.ResourceId = rv.ResourceId

LEFT JOIN resources.ResourceReference rrRef
ON rrRef.Id = rrLatest.LatestRefId

LEFT JOIN (
SELECT
rp.ResourceVersionId,
(
SELECT
p.Id,
p.Name,
p.Description,
p.Logo
FROM resources.ResourceVersionProvider rp2
JOIN hub.Provider p ON p.Id = rp2.ProviderId
WHERE rp2.ResourceVersionId = rp.ResourceVersionId
AND rp2.Deleted = 0
AND p.Deleted = 0
FOR JSON PATH
) AS ProvidersJson
FROM resources.ResourceVersionProvider rp
GROUP BY rp.ResourceVersionId
) rpAgg ON rpAgg.ResourceVersionId = r.CurrentResourceVersionId


LEFT JOIN resources.AssessmentResourceVersion arv ON arv.ResourceVersionId = ra.ResourceVersionId
LEFT JOIN activity.AssessmentResourceActivity asra ON asra.ResourceActivityId = ra.Id
LEFT JOIN activity.MediaResourceActivity mar ON mar.ResourceActivityId = ra.Id
LEFT JOIN activity.ScormActivity sa ON sa.ResourceActivityId = ra.Id

WHERE ra.LaunchResourceActivityId IS NULL
AND ra.UserId = @userId
AND ra.Deleted = 0
AND r.ResourceTypeId IN (6)
)

SELECT Top 8 ActivityId,
LaunchResourceActivityId,
UserId,
Expand Down
Loading
Loading