L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-15545 "sql to fetch question states in overview report should use a JOIN instead of passing attempt ids in IN clause when downloading data with no paging"

Browse Source
This commit is contained in:
jamiesensei
2008-07-05 05:57:22 +00:00
parent 2461f2e2bd
commit 67d4dfb84b
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/report/overview/overview_table.php
+9 -5
View File
@@ -177,13 +177,17 @@ class quiz_report_overview_table extends table_sql {
if ($gradedstatesbyattempt === null){
//get all the attempt ids we want to display on this page
//or to export for download.
$attemptids = array();
foreach ($this->rawdata as $attempt){
if ($attempt->attemptuniqueid > 0){
$attemptids[] = $attempt->attemptuniqueid;
if (!$this->is_downloading()) {
$attemptids = array();
foreach ($this->rawdata as $attempt){
if ($attempt->attemptuniqueid > 0){
$attemptids[] = $attempt->attemptuniqueid;
}
}
$gradedstatesbyattempt = quiz_get_newgraded_states($attemptids, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
} else {
$gradedstatesbyattempt = quiz_get_newgraded_states($this->sql, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
}
$gradedstatesbyattempt = quiz_get_newgraded_states($attemptids, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
}
if (preg_match('/^qsgrade([0-9]+)$/', $colname, $matches)){
$questionid = $matches[1];
mod/quiz/report/reportlib.php
+29 -15
View File
@@ -10,32 +10,46 @@ define('QUIZ_REPORT_ATTEMPTS_ALL_STUDENTS', 3);
* Get newest graded state or newest state for a number of attempts. Pass in the
* uniqueid field from quiz_attempt table not the id. Use question_state_is_graded
* function to check that the question is actually graded.
* @param array attemptidssql either an array of attemptids with numerical keys
* or an object with properties from, where and params.
* @param boolean idxattemptq true if a multidimensional array should be
* constructed with keys indexing array first by attempt and then by question
* id.
*/
function quiz_get_newgraded_states($attemptids, $idxattemptq = true, $fields='qs.*'){
function quiz_get_newgraded_states($attemptidssql, $idxattemptq = true, $fields='qs.*'){
global $CFG, $DB;
if ($attemptids){
list($usql, $params) = $DB->get_in_or_equal($attemptids);
if ($attemptidssql && is_array($attemptidssql)){
list($usql, $params) = $DB->get_in_or_equal($attemptidssql);
$gradedstatesql = "SELECT $fields FROM " .
"{question_sessions} qns, " .
"{question_states} qs " .
"WHERE qns.attemptid $usql AND " .
"qns.newgraded = qs.id";
$gradedstates = $DB->get_records_sql($gradedstatesql, $params);
if ($idxattemptq){
$gradedstatesbyattempt = array();
foreach ($gradedstates as $gradedstate){
if (!isset($gradedstatesbyattempt[$gradedstate->attempt])){
$gradedstatesbyattempt[$gradedstate->attempt] = array();
}
$gradedstatesbyattempt[$gradedstate->attempt][$gradedstate->question] = $gradedstate;
}
return $gradedstatesbyattempt;
} else {
return $gradedstates;
}
} else if ($attemptidssql && is_object($attemptidssql)){
$gradedstatesql = "SELECT $fields FROM " .
$attemptidssql->from.",".
"{question_sessions} qns, " .
"{question_states} qs " .
"WHERE qns.attemptid = qa.uniqueid AND " .
$attemptidssql->where." AND ".
"qns.newgraded = qs.id";
$gradedstates = $DB->get_records_sql($gradedstatesql, $attemptidssql->params);
} else {
return array();
}
if ($idxattemptq){
$gradedstatesbyattempt = array();
foreach ($gradedstates as $gradedstate){
if (!isset($gradedstatesbyattempt[$gradedstate->attempt])){
$gradedstatesbyattempt[$gradedstate->attempt] = array();
}
$gradedstatesbyattempt[$gradedstate->attempt][$gradedstate->question] = $gradedstate;
}
return $gradedstatesbyattempt;
} else {
return $gradedstates;
}
}
function quiz_get_average_grade_for_questions($quiz, $userids){