Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[examiner] Only show active examiner sites #8967

Merged
merged 3 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ changes in the following format: PR #1234***
- Add OpenID Connect authorization support to LORIS (PR #8255)

#### Bug Fixes
- Fix examiner site display (PR #8967)
- bvl_feedback updates in real-time (PR #8966)

## LORIS 25.0 (Release Date: ????-??-??)
Expand Down
37 changes: 17 additions & 20 deletions modules/examiner/php/examinerprovisioner.class.inc
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,23 @@ class ExaminerProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
function __construct()
{
parent::__construct(
"
select
e.full_name as Examiner,
u.Email,
GROUP_CONCAT(DISTINCT psc.CenterID) as centerIds,
e.examinerID as ID,
e.radiologist as Radiologist,
GROUP_CONCAT(DISTINCT tn.full_name SEPARATOR ', ') as
Certification
FROM examiners e
LEFT JOIN examiners_psc_rel epr ON
(epr.examinerID=e.examinerID)
LEFT JOIN psc ON (epr.centerID=psc.CenterID)
LEFT JOIN certification c ON
(c.examinerID=e.examinerID and c.pass = 'certified')
LEFT JOIN test_names tn ON (tn.ID = c.testID)
LEFT JOIN users u ON u.ID=e.userID
group by e.examinerID
"SELECT
e.full_name as Examiner,
u.Email,
GROUP_CONCAT(DISTINCT epr.CenterID) as centerIds,
e.examinerID as ID,
e.radiologist as Radiologist,
GROUP_CONCAT(DISTINCT tn.full_name SEPARATOR ', ') as
Certification
FROM examiners e
LEFT JOIN examiners_psc_rel epr ON
(epr.examinerID=e.examinerID)
LEFT JOIN certification c ON
(c.examinerID=e.examinerID and c.pass = 'certified')
LEFT JOIN test_names tn ON (tn.ID = c.testID)
LEFT JOIN users u ON u.ID=e.userID
WHERE epr.active='Y'
GROUP BY e.examinerID
",
[],
);
Expand Down
Loading