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

MDL-60317 quiz reports: fix regression caused by MDL-57511

Browse source
This commit is contained in:
Tim Hunt 2017-10-02 18:22:30 +01:00
parent 23ab0d7788
commit 32250b8836
3 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/quiz/report/overview/report.php
View file

@ -138,7 +138,9 @@ class quiz_overview_report extends quiz_attempts_report {
// Construct the SQL.
list($fields, $from, $where, $params) = $table->base_sql($allowedjoins);
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp", $params);
// The WHERE clause is vital here, because some parts of tablelib.php will expect to
// add bits like ' AND x = 1' on the end, and that needs to leave to valid SQL.
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp WHERE 1 = 1", $params);
// Test to see if there are any regraded attempts to be listed.
$fields .= ", COALESCE((

22
mod/quiz/report/overview/tests/report_test.php
View file

@ -115,7 +115,7 @@ class quiz_overview_report_testcase extends advanced_testcase {
// Now do a minimal set-up of the table class.
$table = new quiz_overview_table($quiz, $context, $qmsubselect, $reportoptions,
$empty, $studentsjoins, array(1), null);
$table->define_columns(array('attempt'));
$table->define_columns(array('fullname'));
$table->sortable(true, 'uniqueid');
$table->define_baseurl(new moodle_url('/mod/quiz/report.php'));
$table->setup();
@ -123,6 +123,7 @@ class quiz_overview_report_testcase extends advanced_testcase {
// Run the query.
list($fields, $from, $where, $params) = $table->base_sql($studentsjoins);
$table->set_sql($fields, $from, $where, $params);
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp WHERE 1 = 1", $params);
$table->query_db(30, false);
// Verify what was returned: Student 1's best and in progress attempts.
@ -137,6 +138,25 @@ class quiz_overview_report_testcase extends advanced_testcase {
$this->assertEquals(1, $table->rawdata[$student2->id . '#3']->gradedattempt);
$this->assertArrayHasKey($student3->id . '#0', $table->rawdata);
$this->assertEquals(0, $table->rawdata[$student3->id . '#0']->gradedattempt);
// Ensure that filtering by inital does not break it.
// This involves setting a private properly of the base class, which is
// only really possible using reflection :-(.
$reflectionobject = new ReflectionObject($table);
while ($parent = $reflectionobject->getParentClass()) {
$reflectionobject = $parent;
}
$prefsproperty = $reflectionobject->getProperty('prefs');
$prefsproperty->setAccessible(true);
$prefs = $prefsproperty->getValue($table);
$prefs['i_first'] = 'A';
$prefsproperty->setValue($table, $prefs);
list($fields, $from, $where, $params) = $table->base_sql($studentsjoins);
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp WHERE 1 = 1", $params);
$table->set_sql($fields, $from, $where, $params);
$table->query_db(30, false);
// Just verify that this does not cause a fatal error.
}
/**

4
mod/quiz/report/responses/report.php
View file

@ -151,7 +151,9 @@ class quiz_responses_report extends quiz_attempts_report {
list($fields, $from, $where, $params) = $table->base_sql($allowedjoins);
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp", $params);
// The WHERE clause is vital here, because some parts of tablelib.php will expect to
// add bits like ' AND x = 1' on the end, and that needs to leave to valid SQL.
$table->set_count_sql("SELECT COUNT(1) FROM (SELECT $fields FROM $from WHERE $where) temp WHERE 1 = 1", $params);
$table->set_sql($fields, $from, $where, $params);