mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-11-08 11:11:28 +08:00
commit 379cbb459a
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/quiz/report/reportlib.php
View File

@ -182,7 +182,11 @@ function quiz_report_grade_method_sql($grademethod, $quizattemptsalias = 'quiza'
return '';
case QUIZ_ATTEMPTFIRST :
return "$quizattemptsalias.attempt = 1";
return "$quizattemptsalias.id = (
SELECT MIN(qa2.id)
FROM {quiz_attempts} qa2
WHERE qa2.quiz = $quizattemptsalias.quiz AND
qa2.userid = $quizattemptsalias.userid)";
case QUIZ_ATTEMPTLAST :
return "$quizattemptsalias.id = (

28
mod/quiz/report/statistics/classes/calculator.php
View File

@ -193,32 +193,16 @@ class quiz_statistics_calculator {
protected function attempt_counts_and_averages($quizid, $groupstudents) {
global $DB;
list($fromqa, $whereqa, $qaparams) = quiz_statistics_attempts_sql($quizid, $groupstudents);
$selects = array();
$attempttotals = new stdClass();
foreach (array_keys(quiz_get_grading_options()) as $which) {
$fieldprefix = static::using_attempts_string_id($which);
$condition = quiz_report_grade_method_sql($which);
if ($condition == '') {
$case = '1';
} else {
$case = "CASE WHEN ($condition) THEN 1 ELSE 0 END";
}
$selects[] = "
SUM($case) AS {$fieldprefix}count,
SUM(sumgrades * $case) AS {$fieldprefix}total";
}
$select = join(',', $selects);
$attempttotals = $DB->get_record_sql("
SELECT {$select}
FROM $fromqa
WHERE $whereqa", $qaparams);
list($fromqa, $whereqa, $qaparams) = quiz_statistics_attempts_sql($quizid, $groupstudents, $which);
foreach (array_keys(quiz_get_grading_options()) as $which) {
$fromdb = $DB->get_record_sql("SELECT COUNT(*) AS rcount, AVG(sumgrades) AS average FROM $fromqa WHERE $whereqa",
$qaparams);
$fieldprefix = static::using_attempts_string_id($which);
$attempttotals->{$fieldprefix.'avg'} = $attempttotals->{$fieldprefix.'total'} / $attempttotals->{$fieldprefix.'count'};
unset($attempttotals->{$fieldprefix.'total'});
$attempttotals->{$fieldprefix.'avg'} = $fromdb->average;
$attempttotals->{$fieldprefix.'count'} = $fromdb->rcount;
}
return $attempttotals;
}