Skip to content

TD-4879 Limit the self assessments returned in Delegate Activities by admin course category #2897

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
merged 2 commits into from
Oct 28, 2024
Merged

TD-4879 Limit the self assessments returned in Delegate Activities by admin course category #2897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972ecb0
TD-4879 Limit the self assessments returned in Delegate Activities by…
sherif-olaboye Oct 24, 2024
3b96ea3
TD-4879 Limit the self assessments returned in Delegate Activities by…
sherif-olaboye Oct 24, 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
6 changes: 3 additions & 3 deletions ...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,21 +229,21 @@ FROM SelfAssessments
sa.SupervisorSelfAssessmentReview,
sa.SupervisorResultsReview";

var fromTableQuery = $@" FROM dbo.SelfAssessments AS sa
var fromTableQuery = $@" FROM dbo.SelfAssessments AS sa
INNER JOIN dbo.CandidateAssessments AS ca WITH (NOLOCK) ON sa.ID = ca.SelfAssessmentID
INNER JOIN dbo.CentreSelfAssessments AS csa WITH (NOLOCK) ON sa.ID = csa.SelfAssessmentID
INNER JOIN dbo.DelegateAccounts da WITH (NOLOCK) ON ca.CentreID = da.CentreID AND ca.DelegateUserID = da.UserID AND da.CentreID = csa.CentreID
INNER JOIN dbo.Users u WITH (NOLOCK) ON DA.UserID = u.ID
LEFT JOIN UserCentreDetails AS ucd WITH (NOLOCK) ON ucd.UserID = da.UserID AND ucd.centreID = da.CentreID
LEFT OUTER JOIN AdminAccounts AS aaEnrolledBy WITH (NOLOCK) ON aaEnrolledBy.ID = ca.EnrolledByAdminID
LEFT OUTER JOIN AdminAccounts AS aaEnrolledBy WITH (NOLOCK) ON aaEnrolledBy.ID = ca.EnrolledByAdminID
LEFT OUTER JOIN Users AS uEnrolledBy WITH (NOLOCK) ON uEnrolledBy.ID = aaEnrolledBy.UserID
LEFT JOIN dbo.CandidateAssessmentSupervisors AS cas WITH (NOLOCK) ON ca.ID = cas.CandidateAssessmentID
LEFT JOIN dbo.CandidateAssessmentSupervisorVerifications AS casv WITH (NOLOCK) ON cas.ID = casv.CandidateAssessmentSupervisorID AND
(casv.Verified IS NOT NULL AND casv.SignedOff = 1)

WHERE sa.ID = @selfAssessmentId
AND da.CentreID = @centreID AND csa.CentreID = @centreID
AND (ca.RemovedDate IS NULL)
AND (ca.RemovedDate IS NULL) AND ( aaEnrolledBy.CategoryID IS NULL OR sa.CategoryID = aaEnrolledBy.CategoryID)
AND ( u.FirstName + ' ' + u.LastName + ' ' + COALESCE(ucd.Email, u.PrimaryEmail) + ' ' + COALESCE(da.CandidateNumber, '') LIKE N'%' + @searchString + N'%')
AND ((@isDelegateActive IS NULL) OR (@isDelegateActive = 1 AND (da.Active = 1)) OR (@isDelegateActive = 0 AND (da.Active = 0)))
AND ((@removed IS NULL) OR (@removed = 1 AND (ca.RemovedDate IS NOT NULL)) OR (@removed = 0 AND (ca.RemovedDate IS NULL)))
Expand Down
Loading