Skip to content

TD-4411: Fixed filter result for 'Completed' filter along with 'Assessment'. #499

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 LH Virgo changes to RC
merged 8 commits into from
Jul 31, 2024
Merged

TD-4411: Fixed filter result for 'Completed' filter along with 'Assessment'. #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e80080e
TD-4411: Fixed filter result for "Completed" filter along with "Asses…
ArunimaGeorge Jul 26, 2024
e04b3a3
Update GetUserLearningActivities.sql
ArunimaGeorge Jul 26, 2024
cc89580
Update GetUserLearningActivitiesCount.sql
ArunimaGeorge Jul 26, 2024
fc3d67a
Update GetUserLearningActivities.sql
ArunimaGeorge Jul 26, 2024
671ef24
Update GetUserLearningActivities.sql
ArunimaGeorge Jul 26, 2024
d462067
Update GetUserLearningActivitiesCount.sql
ArunimaGeorge Jul 26, 2024
2740353
Update GetUserLearningActivities.sql
ArunimaGeorge Jul 26, 2024
e28850e
Update GetUserLearningActivitiesCount.sql
ArunimaGeorge Jul 26, 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
35 changes: 30 additions & 5 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-- Sarathlal 08-03-2024
-- Sarathlal 23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
-- Sarathlal 25-04-2024 TD-4067: Resource with muliple version issue resolved
-- Arunima 26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
-------------------------------------------------------------------------------
CREATE PROCEDURE [activity].[GetUserLearningActivities] (
@userId INT
Expand Down Expand Up @@ -271,9 +272,35 @@ FROM (
)
)
OR
([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)
OR ([Res].[ResourceTypeId] IN (11) AND [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
--OR
([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3)
OR (
EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 3)
AND
(
[Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=1
AND
EXISTS
(
SELECT 1
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity6]
WHERE
[AssessmentResourceActivity6].[Deleted] = 0
AND
[ResourceActivity].[Id] = [AssessmentResourceActivity6].[ResourceActivityId]
)
AND
(
(SELECT TOP(1)
[AssessmentResourceActivity7].[Score]
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity7]
WHERE
[AssessmentResourceActivity7].[Deleted] = 0
AND [ResourceActivity].[Id] = [AssessmentResourceActivity7].[ResourceActivityId]) >= 0.0
)
)

)
--OR
--(
-- ([Res].[ResourceTypeId] IN (1,5,10,12) AND [ResourceActivity].[ActivityStatusId] = 3)
-- AND
Expand Down Expand Up @@ -507,5 +534,3 @@ LEFT JOIN (
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]

END


34 changes: 30 additions & 4 deletions ...PI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
-- Sarathlal 18-12-2023
-- Sarathlal 08-03-2024
-- Sarathlal 23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
-- Arunima 26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
-------------------------------------------------------------------------------
CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
@userId INT
Expand Down Expand Up @@ -186,10 +187,35 @@ FROM (
)
)
OR
([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3)
OR ([Res].[ResourceTypeId] IN (11) AND [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)

--OR
([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3)
OR (
EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 3)
AND
(
[Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=1
AND
EXISTS
(
SELECT 1
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity6]
WHERE
[AssessmentResourceActivity6].[Deleted] = 0
AND
[ResourceActivity].[Id] = [AssessmentResourceActivity6].[ResourceActivityId]
)
AND
(
(SELECT TOP(1)
[AssessmentResourceActivity7].[Score]
FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity7]
WHERE
[AssessmentResourceActivity7].[Deleted] = 0
AND [ResourceActivity].[Id] = [AssessmentResourceActivity7].[ResourceActivityId]) >= 0.0
)
)

)
--OR
--(
-- ([Res].[ResourceTypeId] IN (1,5,10,12) AND [ResourceActivity].[ActivityStatusId] = 3)
-- AND
Expand Down