Skip to content

Commit 7c3b543

Browse files
ArunimaGeorgeArunimaGeorge
authored
Merge pull request #648 from TechnologyEnhancedLearning/Develop/Fixes/TD-4261-Duplicate-entries-for-the-assessment-results(elearning)-in-the-My-Learning-page
TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
2 parents b022dd9 + 4070549 commit 7c3b543

File tree

3 files changed

+47
-143
lines changed

3 files changed

+47
-143
lines changed

‎WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql‎

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
-- Sarathlal 20-02-2024
99
-- Sarathlal 23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
1010
-- Sarathlal 25-04-2024 TD-4067: Resource with muliple version issue resolved
11+
-- Arunima 11-10-2024 TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
1112
-------------------------------------------------------------------------------
1213

1314
CREATE PROCEDURE [activity].[GetUserLatestActivityCheck] (
@@ -175,58 +176,22 @@ FROM (
175176
) AS [t2]
176177
LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
177178
LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
178-
LEFT JOIN (
179-
SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
180-
FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
181-
WHERE [ScormResourceVersion2].[Deleted] = 0
182-
) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
183-
LEFT JOIN (
184-
SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
185-
FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
186-
WHERE [ScormResourceVersionManifest3].[Deleted] = 0
187-
) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
188-
LEFT JOIN (
189-
SELECT [BlockCollection].[Id], [BlockCollection].[AmendDate], [BlockCollection].[AmendUserId], [BlockCollection].[CreateDate], [BlockCollection].[CreateUserId], [BlockCollection].[Deleted]
190-
FROM [resources].[BlockCollection] AS [BlockCollection]
191-
WHERE [BlockCollection].[Deleted] = 0
192-
) AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id]
193-
INNER JOIN (
194-
SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
195-
FROM [hierarchy].[NodePath] AS [NodePath]
196-
WHERE [NodePath].[Deleted] = 0
197-
) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
198-
LEFT JOIN (
199-
SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
200-
FROM [resources].[ResourceReference] AS [ResourceReference5]
201-
WHERE [ResourceReference5].[Deleted] = 0
202-
) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
203-
LEFT JOIN (
204-
SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
205-
FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
206-
WHERE [MediaResourceActivity3].[Deleted] = 0
207-
) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
208-
LEFT JOIN (
209-
SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
210-
FROM [activity].[ScormActivity] AS [ScormActivity4]
211-
WHERE [ScormActivity4].[Deleted] = 0
212-
) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
213-
LEFT JOIN (
214-
SELECT [Block0].[Id], [Block0].[AmendDate], [Block0].[AmendUserId], [Block0].[BlockCollectionId], [Block0].[BlockType], [Block0].[CreateDate], [Block0].[CreateUserId], [Block0].[Deleted], [Block0].[Order], [Block0].[Title]
215-
FROM [resources].[Block] AS [Block0]
216-
WHERE [Block0].[Deleted] = 0
217-
) AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId]
179+
LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
180+
LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
181+
LEFT JOIN [resources].[BlockCollection] AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
182+
INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
183+
LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
184+
LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
185+
LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
186+
LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
218187
LEFT JOIN (
219188
SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
220189
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
221-
LEFT JOIN (
222-
SELECT [AssessmentResourceActivityInteraction6].[Id], [AssessmentResourceActivityInteraction6].[AmendDate], [AssessmentResourceActivityInteraction6].[AmendUserID], [AssessmentResourceActivityInteraction6].[AssessmentResourceActivityId], [AssessmentResourceActivityInteraction6].[CreateDate], [AssessmentResourceActivityInteraction6].[CreateUserID], [AssessmentResourceActivityInteraction6].[Deleted], [AssessmentResourceActivityInteraction6].[QuestionBlockId]
223-
FROM [activity].[AssessmentResourceActivityInteraction] AS [AssessmentResourceActivityInteraction6]
224-
WHERE [AssessmentResourceActivityInteraction6].[Deleted] = 0
225-
) AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId]
190+
LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
226191
WHERE [AssessmentResourceActivity5].[Deleted] = 0
227192
) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
228193
WHERE t2.ResourceVersionId=@ResourceVersionId
229194
ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
230195

231196

232-
END
197+
END

‎WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql‎

Lines changed: 19 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
-- Sarathlal 08-03-2024
1111
-- Sarathlal 23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
1212
-- Sarathlal 25-04-2024 TD-4067: Resource with muliple version issue resolved
13-
-- Arunima 26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
13+
-- Arunima 26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
14+
-- Arunima 11-10-2024 TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
1415
-------------------------------------------------------------------------------
1516
CREATE PROCEDURE [activity].[GetUserLearningActivities] (
1617
@userId INT
@@ -215,7 +216,7 @@ FROM (
215216
WHERE ([ScormActivity].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity].[ResourceActivityId])
216217
)
217218
IS NULL
218-
)
219+
)
219220
AND
220221
(
221222
(
@@ -227,12 +228,17 @@ FROM (
227228
))
228229
)
229230
OR
231+
(
230232
-- or launch resource activity completed
231233
EXISTS
232234
(
233235
SELECT 1 FROM [activity].[ResourceActivity] AS [ResAct2]
234236
WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7,5,4)
235237
)
238+
AND
239+
(
240+
[Res].[ResourceTypeId] <> 6)
241+
)
236242

237243
)
238244
AND
@@ -358,7 +364,7 @@ FROM (
358364
(
359365
(SELECT TOP(1) [ScormActivity1].[CmiCoreLesson_status]
360366
FROM [activity].[ScormActivity] AS [ScormActivity1]
361-
WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 2
367+
WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 7
362368
)
363369
)
364370

@@ -481,56 +487,20 @@ FROM (
481487
) AS [t2]
482488
LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
483489
LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
484-
LEFT JOIN (
485-
SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
486-
FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
487-
WHERE [ScormResourceVersion2].[Deleted] = 0
488-
) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
489-
LEFT JOIN (
490-
SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
491-
FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
492-
WHERE [ScormResourceVersionManifest3].[Deleted] = 0
493-
) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
494-
LEFT JOIN (
495-
SELECT [BlockCollection].[Id], [BlockCollection].[AmendDate], [BlockCollection].[AmendUserId], [BlockCollection].[CreateDate], [BlockCollection].[CreateUserId], [BlockCollection].[Deleted]
496-
FROM [resources].[BlockCollection] AS [BlockCollection]
497-
WHERE [BlockCollection].[Deleted] = 0
498-
) AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id]
499-
INNER JOIN (
500-
SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
501-
FROM [hierarchy].[NodePath] AS [NodePath]
502-
WHERE [NodePath].[Deleted] = 0
503-
) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
504-
LEFT JOIN (
505-
SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
506-
FROM [resources].[ResourceReference] AS [ResourceReference5]
507-
WHERE [ResourceReference5].[Deleted] = 0
508-
) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
509-
LEFT JOIN (
510-
SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
511-
FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
512-
WHERE [MediaResourceActivity3].[Deleted] = 0
513-
) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
514-
LEFT JOIN (
515-
SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
516-
FROM [activity].[ScormActivity] AS [ScormActivity4]
517-
WHERE [ScormActivity4].[Deleted] = 0
518-
) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
519-
LEFT JOIN (
520-
SELECT [Block0].[Id], [Block0].[AmendDate], [Block0].[AmendUserId], [Block0].[BlockCollectionId], [Block0].[BlockType], [Block0].[CreateDate], [Block0].[CreateUserId], [Block0].[Deleted], [Block0].[Order], [Block0].[Title]
521-
FROM [resources].[Block] AS [Block0]
522-
WHERE [Block0].[Deleted] = 0
523-
) AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId]
490+
LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
491+
LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
492+
LEFT JOIN [resources].[BlockCollection] AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
493+
INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
494+
LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
495+
LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
496+
LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
497+
LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
524498
LEFT JOIN (
525499
SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
526500
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
527-
LEFT JOIN (
528-
SELECT [AssessmentResourceActivityInteraction6].[Id], [AssessmentResourceActivityInteraction6].[AmendDate], [AssessmentResourceActivityInteraction6].[AmendUserID], [AssessmentResourceActivityInteraction6].[AssessmentResourceActivityId], [AssessmentResourceActivityInteraction6].[CreateDate], [AssessmentResourceActivityInteraction6].[CreateUserID], [AssessmentResourceActivityInteraction6].[Deleted], [AssessmentResourceActivityInteraction6].[QuestionBlockId]
529-
FROM [activity].[AssessmentResourceActivityInteraction] AS [AssessmentResourceActivityInteraction6]
530-
WHERE [AssessmentResourceActivityInteraction6].[Deleted] = 0
531-
) AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId]
501+
LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
532502
WHERE [AssessmentResourceActivity5].[Deleted] = 0
533503
) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
534504
ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
535505

536-
END
506+
END

0 commit comments

Comments
 (0)