From 7a708a1459cd5a927c8a19a0ad5ed596dbdbffea Mon Sep 17 00:00:00 2001 From: CamilleBeau Date: Tue, 21 Nov 2023 08:19:38 -0500 Subject: [PATCH 1/2] [examiner] Only show active examiner sites --- modules/examiner/php/examinerprovisioner.class.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/examiner/php/examinerprovisioner.class.inc b/modules/examiner/php/examinerprovisioner.class.inc index 47c1b9ffc06..7548859d38c 100644 --- a/modules/examiner/php/examinerprovisioner.class.inc +++ b/modules/examiner/php/examinerprovisioner.class.inc @@ -41,7 +41,7 @@ class ExaminerProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner select e.full_name as Examiner, u.Email, - GROUP_CONCAT(DISTINCT psc.CenterID) as centerIds, + GROUP_CONCAT(DISTINCT epr.CenterID) as centerIds, e.examinerID as ID, e.radiologist as Radiologist, @@ -56,6 +56,7 @@ class ExaminerProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner (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 ", [], From 9642fc579db2f6e5df96f8ee8db6099d595b3ac5 Mon Sep 17 00:00:00 2001 From: CamilleBeau Date: Tue, 21 Nov 2023 08:25:02 -0500 Subject: [PATCH 2/2] changelog + cleanup --- CHANGELOG.md | 3 ++ .../php/examinerprovisioner.class.inc | 38 +++++++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83517134028..fc4e8b4c1a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ changes in the following format: PR #1234*** #### Features - Add OpenID Connect authorization support to LORIS (PR #8255) +#### Bug Fixes +- Fix examiner site display (PR #8967) + ## LORIS 25.0 (Release Date: ????-??-??) ### Core #### Features diff --git a/modules/examiner/php/examinerprovisioner.class.inc b/modules/examiner/php/examinerprovisioner.class.inc index 7548859d38c..91ece0dfd00 100644 --- a/modules/examiner/php/examinerprovisioner.class.inc +++ b/modules/examiner/php/examinerprovisioner.class.inc @@ -37,27 +37,23 @@ class ExaminerProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner function __construct() { parent::__construct( - " - 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 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 - WHERE epr.active='Y' - 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 ", [], );