MDL-32322 quiz reports: rename classes, and fix one strict syntax.

This commit is contained in:
Tim Hunt
2012-04-20 10:07:08 +01:00
parent f5e42695bd
commit 6b4e2d76a3
10 changed files with 17 additions and 16 deletions
@@ -35,7 +35,7 @@ require_once($CFG->libdir . '/formslib.php');
* @copyright 2010 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quiz_grading_settings extends moodleform {
class quiz_grading_settings_form extends moodleform {
protected $includeauto;
protected $hidden = array();
protected $counts;
+1 -1
View File
@@ -358,7 +358,7 @@ class quiz_grading_report extends quiz_default_report {
if (array_key_exists('includeauto', $this->viewoptions)) {
$hidden['includeauto'] = $this->viewoptions['includeauto'];
}
$mform = new quiz_grading_settings($hidden, $counts, $shownames, $showidnumbers);
$mform = new quiz_grading_settings_form($hidden, $counts, $shownames, $showidnumbers);
// Tell the form the current settings.
$settings = new stdClass();
@@ -35,7 +35,7 @@ require_once($CFG->libdir . '/formslib.php');
* @copyright 2008 Jamie Pratt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_report_overview_settings extends moodleform {
class quiz_overview_settings_form extends moodleform {
protected function definition() {
$mform = $this->_form;
+4 -4
View File
@@ -26,9 +26,9 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->dirroot.'/mod/quiz/report/attemptsreport.php');
require_once($CFG->dirroot.'/mod/quiz/report/overview/overviewsettings_form.php');
require_once($CFG->dirroot.'/mod/quiz/report/overview/overview_table.php');
require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport.php');
require_once($CFG->dirroot . '/mod/quiz/report/overview/overviewsettings_form.php');
require_once($CFG->dirroot . '/mod/quiz/report/overview/overview_table.php');
/**
@@ -56,7 +56,7 @@ class quiz_overview_report extends quiz_attempt_report {
$reporturl = new moodle_url('/mod/quiz/report.php', $pageoptions);
$qmsubselect = quiz_report_qm_filter_select($quiz);
$mform = new mod_quiz_report_overview_settings($reporturl,
$mform = new quiz_overview_settings_form($reporturl,
array('qmsubselect' => $qmsubselect, 'quiz' => $quiz,
'currentgroup' => $currentgroup, 'context' => $this->context));
+2 -1
View File
@@ -371,7 +371,8 @@ function quiz_report_download_filename($report, $courseshortname, $quizname) {
* @param object $context the quiz context.
*/
function quiz_report_default_report($context) {
return reset(quiz_report_list($context));
$reports = quiz_report_list($context);
return reset($reports);
}
/**
+4 -4
View File
@@ -26,9 +26,9 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->dirroot.'/mod/quiz/report/attemptsreport.php');
require_once($CFG->dirroot.'/mod/quiz/report/responses/responsessettings_form.php');
require_once($CFG->dirroot.'/mod/quiz/report/responses/responses_table.php');
require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport.php');
require_once($CFG->dirroot . '/mod/quiz/report/responses/responsessettings_form.php');
require_once($CFG->dirroot . '/mod/quiz/report/responses/responses_table.php');
/**
@@ -64,7 +64,7 @@ class quiz_responses_report extends quiz_attempt_report {
$reporturl = new moodle_url('/mod/quiz/report.php', $pageoptions);
$qmsubselect = quiz_report_qm_filter_select($quiz);
$mform = new mod_quiz_report_responses_settings($reporturl,
$mform = new quiz_responses_settings_form($reporturl,
array('qmsubselect' => $qmsubselect, 'quiz' => $quiz,
'currentgroup' => $currentgroup, 'context' => $this->context));
@@ -35,7 +35,7 @@ require_once($CFG->libdir . '/formslib.php');
* @copyright 2008 Jean-Michel Vedrine
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_report_responses_settings extends moodleform {
class quiz_responses_settings_form extends moodleform {
protected function definition() {
$mform = $this->_form;
+1 -1
View File
@@ -37,7 +37,7 @@ require_once($CFG->dirroot . '/mod/quiz/report/reportlib.php'); // Include the c
* @copyright 2008 Jamie Pratt [email protected]
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/
class question_reportlib_test extends UnitTestCase {
class mod_quiz_reportlib_test extends UnitTestCase {
public static $includecoverage = array('mod/quiz/report/reportlib.php');
public function test_quiz_report_index_by_keys() {
+1 -1
View File
@@ -70,7 +70,7 @@ class quiz_statistics_report extends quiz_default_report {
$reporturl = new moodle_url('/mod/quiz/report.php', $pageoptions);
$mform = new quiz_statistics_statistics_settings_form($reporturl);
$mform = new quiz_statistics_settings_form($reporturl);
if ($fromform = $mform->get_data()) {
$useallattempts = $fromform->useallattempts;
if ($fromform->useallattempts) {
@@ -35,7 +35,7 @@ require_once($CFG->libdir . '/formslib.php');
* @copyright 2008 Jamie Pratt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quiz_statistics_statistics_settings_form extends moodleform {
class quiz_statistics_settings_form extends moodleform {
protected function definition() {
$mform = $this->_form;