Skip to content

DLSV2-517 Include NominatedSupervisors in the Manage Supervisors pick supervisor list #1012

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 6 commits into from
Mar 29, 2022
Merged

DLSV2-517 Include NominatedSupervisors in the Manage Supervisors pick supervisor list #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8aa542b
DLSV2-517 Include NominatedSupervisors in the Manage Supervisors pick…
daniel-manta-hee Mar 10, 2022
deded6c
DLSV2-517 Merged from master
daniel-manta-hee Mar 14, 2022
d531721
DLSV2-517 Minor change: adding spacing before Quick Add list
daniel-manta-hee Mar 14, 2022
858d543
DLSV2-517 Removed unnecessary learner value in sql query (chanage req…
daniel-manta-hee Mar 23, 2022
d27bd15
Merge remote-tracking branch 'origin/master' into Develop/Features/DL…
daniel-manta-hee Mar 24, 2022
eacc2fb
DLSV2-517 Merged from master. Solved conflict in SelfAssessmentSuperv…
daniel-manta-hee Mar 24, 2022
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
26 changes: 11 additions & 15 deletions ...utions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,27 +107,23 @@ public IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(
int candidateId
)
{
const string selectQuery =
return connection.Query<SelfAssessmentSupervisor>(
@"SELECT
0 AS ID,
sd.ID AS SupervisorDelegateID,
sd.SupervisorAdminID,
sd.SupervisorEmail,
sd.NotificationSent,
au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END) AS SupervisorName,
'Supervisor' AS RoleName
au.Forename + ' ' + au.Surname AS SupervisorName,
(CASE WHEN au.Supervisor = 1 THEN 'Supervisor'
WHEN au.NominatedSupervisor = 1 THEN 'Nominated supervisor'
END) AS RoleName
FROM SupervisorDelegates AS sd
INNER JOIN CandidateAssessmentSupervisors AS cas ON sd.ID = cas.SupervisorDelegateId
INNER JOIN CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID
INNER JOIN AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID";

return connection.Query<SelfAssessmentSupervisor>(
@$"{selectQuery}
WHERE (sd.Removed IS NULL) AND (sd.SupervisorAdminID IS NOT NULL) AND (sd.CandidateID = @candidateId)
EXCEPT
{selectQuery}
WHERE (sd.Removed IS NULL) AND (sd.CandidateID = @candidateId) AND (ca.SelfAssessmentID = @selfAssessmentId)
GROUP BY sd.ID, SupervisorAdminID, SupervisorEmail, sd.NotificationSent, au.Forename + ' ' + au.Surname, au.Active",
INNER JOIN AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID AND au.Active = 1
WHERE (sd.Removed IS NULL) AND (sd.SupervisorAdminID IS NOT NULL) AND (sd.CandidateID = @candidateId)
AND (au.Supervisor = 1 OR au.NominatedSupervisor = 1) AND (au.Active = 1)
AND (ca.SelfAssessmentID <> @selfAssessmentId)",
new { selfAssessmentId, candidateId }
);
}
Expand Down Expand Up @@ -236,9 +232,9 @@ int candidateId
IsFrameworkDeveloper
FROM AdminUsers
WHERE (
(Supervisor = 1) AND (Active = 1) AND (CategoryID = 0) AND (CentreID = @centreId)
(Supervisor = 1 OR NominatedSupervisor = 1) AND (Active = 1) AND (CategoryID = 0) AND (CentreID = @centreId)
OR
(Supervisor = 1) AND (Active = 1) AND (CategoryID = (SELECT CategoryID FROM SelfAssessments WHERE (ID = @selfAssessmentId))) AND (CentreID = @centreId)
(Supervisor = 1 OR NominatedSupervisor = 1) AND (Active = 1) AND (CategoryID = (SELECT CategoryID FROM SelfAssessments WHERE (ID = @selfAssessmentId))) AND (CentreID = @centreId)
)
AND AdminID NOT IN (
SELECT sd.SupervisorAdminID
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageSupervisors.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
}
@if (Model.SuggestedSupervisors.Any())
{
<h2>Quick add</h2>
<h2 class="nhsuk-u-margin-top-6">Quick add</h2>
<table class="nhsuk-table">
<caption class="nhsuk-table__caption">Supervisors for your other activities</caption>
<thead role="rowgroup" class="nhsuk-table__head">
Expand Down