Skip to content

TD-4975-Limit the supervisor task list to show only sign off and confirmation requests that are for self assessments that match the supervisors category #2916

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 1 commit into from
Nov 6, 2024
Merged

TD-4975-Limit the supervisor task list to show only sign off and confirmation requests that are for self assessments that match the supervisors category #2916

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
11 changes: 8 additions & 3 deletions DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,11 @@ public IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsF
SelfAssessments AS sa ON ca.SelfAssessmentID = sa.ID INNER JOIN
SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
CandidateAssessmentSupervisorVerifications AS casv ON cas.ID = casv.CandidateAssessmentSupervisorID INNER JOIN
Users AS u ON ca.DelegateUserID = u.ID
WHERE (sd.SupervisorAdminID = @adminId) AND (casv.Verified IS NULL) AND (cas.Removed IS NULL) AND (sd.Removed IS NULL)", new { adminId }
Users AS u ON ca.DelegateUserID = u.ID INNER JOIN
AdminAccounts As aa ON sd.SupervisorAdminID = aa.ID
WHERE (sd.SupervisorAdminID = @adminId) AND (casv.Verified IS NULL) AND (cas.Removed IS NULL)
AND (sd.Removed IS NULL)
AND (aa.CategoryID is null or sa.CategoryID = aa.CategoryID)", new { adminId }
);
}
public IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsForRequestedReviews(int adminId)
Expand All @@ -559,8 +562,10 @@ public IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsF
SELECT TOP 1 sar2.DateTime
FROM SelfAssessmentResults AS sar2
WHERE sar2.ID = sar.ID AND sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID AND sar2.Result != 0 ORDER BY sar2.ID DESC
)
) INNER JOIN
AdminAccounts AS aa ON sd.SupervisorAdminID = aa.ID
WHERE (sd.SupervisorAdminID = @adminId) AND (cas.Removed IS NULL) AND (sasv.Verified IS NULL) AND (sd.Removed IS NULL)
AND (aa.CategoryID is null or sa.CategoryID = aa.CategoryID)
GROUP BY sa.ID, ca.ID, sd.ID, u.FirstName, u.LastName, sa.Name,cast(sasv.Requested as date)", new { adminId }
);
}
Expand Down
Loading