From e8737871687e1015eb557b29c80797babc98a71b Mon Sep 17 00:00:00 2001 From: gbateson Date: Thu, 5 Oct 2006 06:43:32 +0000 Subject: [PATCH] added names of unenrolled students to drop-down list of users names for which a report can be generated --- mod/hotpot/report.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php index ae6f841ed74..4eb6f484aca 100644 --- a/mod/hotpot/report.php +++ b/mod/hotpot/report.php @@ -459,6 +459,17 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) { 'existingstudents' => get_string('existingstudents') ); $users = get_records_sql(" + SELECT + u.id, u.firstname, u.lastname + FROM + {$CFG->prefix}user AS u, + {$CFG->prefix}hotpot_attempts AS ha + WHERE + u.id = ha.userid AND ha.hotpot=$hotpot->id + ORDER BY + u.lastname + "); + $students = get_records_sql(" SELECT u.id, u.firstname, u.lastname FROM @@ -469,8 +480,17 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) { ORDER BY u.lastname "); - if ($users) { - $menus['reportusers'][''] = '------'; // separator + if (!empty($students)) { + $menus['reportusers']['separator01'] = '------'; + foreach ($students as $id=>$user) { + if (isset($users[$id])) { + $menus['reportusers']["$id"] = fullname($user); + unset($users[$id]); + } + } + } + if (!empty($users)) { + $menus['reportusers']['separator02'] = '------'; foreach ($users as $id=>$user) { $menus['reportusers']["$id"] = fullname($user); }