moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-28588-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2011-12-08 10:19:22 +13:00
commit 7f96df6222
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mod/scorm/report/basic/report.php
View file

@ -84,7 +84,7 @@ class scorm_basic_report extends scorm_default_report {
$nostudents = true; $nostudents = true;
$allowedlist = ''; $allowedlist = '';
} else { } else {
$allowedlist = join(',', array_keys($students)); $allowedlist = array_keys($students);
} }
} else { } else {
// all users who can attempt scoes and who are in the currently selected group // all users who can attempt scoes and who are in the currently selected group
@ -93,7 +93,7 @@ class scorm_basic_report extends scorm_default_report {
$nostudents = true; $nostudents = true;
$groupstudents = array(); $groupstudents = array();
} }
$allowedlist = join(',', array_keys($groupstudents)); $allowedlist = array_keys($groupstudents);
} }
if ( !$nostudents ) { if ( !$nostudents ) {
@ -269,7 +269,8 @@ class scorm_basic_report extends scorm_default_report {
header("Pragma: public"); header("Pragma: public");
echo implode("\t", $headers)." \n"; echo implode("\t", $headers)." \n";
} }
$params = array();
list($usql, $params) = $DB->get_in_or_equal($allowedlist, SQL_PARAMS_NAMED);
// Construct the SQL // Construct the SQL
$select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, '; $select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, ';
$select .= 'st.scormid AS scormid, st.attempt AS attempt, ' . $select .= 'st.scormid AS scormid, st.attempt AS attempt, ' .
@ -282,15 +283,15 @@ class scorm_basic_report extends scorm_default_report {
switch ($attemptsmode) { switch ($attemptsmode) {
case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH: case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH:
// Show only students with attempts // Show only students with attempts
$where = ' WHERE u.id IN (' .$allowedlist. ') AND st.userid IS NOT NULL'; $where = ' WHERE u.id ' .$usql. ' AND st.userid IS NOT NULL';
break; break;
case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO: case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO:
// Show only students without attempts // Show only students without attempts
$where = ' WHERE u.id IN (' .$allowedlist. ') AND st.userid IS NULL'; $where = ' WHERE u.id ' .$usql. ' AND st.userid IS NULL';
break; break;
case SCORM_REPORT_ATTEMPTS_ALL_STUDENTS: case SCORM_REPORT_ATTEMPTS_ALL_STUDENTS:
// Show all students with or without attempts // Show all students with or without attempts
$where = ' WHERE u.id IN (' .$allowedlist. ') AND (st.userid IS NOT NULL OR st.userid IS NULL)'; $where = ' WHERE u.id ' .$usql. ' AND (st.userid IS NOT NULL OR st.userid IS NULL)';
break; break;
} }
@ -298,7 +299,6 @@ class scorm_basic_report extends scorm_default_report {
$countsql .= 'COUNT(DISTINCT('.$DB->sql_concat('u.id', '\'#\'', 'st.attempt').')) AS nbattempts, '; $countsql .= 'COUNT(DISTINCT('.$DB->sql_concat('u.id', '\'#\'', 'st.attempt').')) AS nbattempts, ';
$countsql .= 'COUNT(DISTINCT(u.id)) AS nbusers '; $countsql .= 'COUNT(DISTINCT(u.id)) AS nbusers ';
$countsql .= $from.$where; $countsql .= $from.$where;
$params = array();
if (!$download) { if (!$download) {
$sort = $table->get_sql_sort(); $sort = $table->get_sql_sort();
@ -321,7 +321,7 @@ class scorm_basic_report extends scorm_default_report {
} }
if (!empty($countsql)) { if (!empty($countsql)) {
$count = $DB->get_record_sql($countsql); $count = $DB->get_record_sql($countsql, $params);
$totalinitials = $count->nbresults; $totalinitials = $count->nbresults;
if ($twhere) { if ($twhere) {
$countsql .= ' AND '.$twhere; $countsql .= ' AND '.$twhere;