Tim Hunt
dae0ccfc45
This patch conbines valuable contributions from Kashmira Nagwekar and Luca Bösch. Many thanks to them. However, the final form of the fix, and hence the blame, falls to me -- Tim. There were several issues here: * The load_questions_usages_by_activity method in question/engine/datalib.php was incorrectly treating the case when no data was returned. (Looks like a historic copy-pase from other methods that fetch one item by unique id, which therefore must exist.) * The report was not correctly handling the display when the 'Which tries' was set to 'with, and without, attempts'. * It was possible to select the 'All tries' option when also saying 'Users without attempts'. This combination makes not sense, so a disabledIf rule was added to the form.
77 lines
3.2 KiB
PHP
77 lines
3.2 KiB
PHP
<?php
|
|
// This file is part of Moodle - http://moodle.org/
|
|
//
|
|
// Moodle is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Moodle is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
/**
|
|
* This file defines the setting form for the quiz responses report.
|
|
*
|
|
* @package quiz_responses
|
|
* @copyright 2008 Jean-Michel Vedrine
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
|
|
|
|
defined('MOODLE_INTERNAL') || die();
|
|
|
|
require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport_form.php');
|
|
|
|
|
|
/**
|
|
* Quiz responses report settings form.
|
|
*
|
|
* @copyright 2008 Jean-Michel Vedrine
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
class quiz_responses_settings_form extends mod_quiz_attempts_report_form {
|
|
|
|
protected function other_preference_fields(MoodleQuickForm $mform) {
|
|
$mform->addGroup(array(
|
|
$mform->createElement('advcheckbox', 'qtext', '',
|
|
get_string('questiontext', 'quiz_responses')),
|
|
$mform->createElement('advcheckbox', 'resp', '',
|
|
get_string('response', 'quiz_responses')),
|
|
$mform->createElement('advcheckbox', 'right', '',
|
|
get_string('rightanswer', 'quiz_responses')),
|
|
), 'coloptions', get_string('showthe', 'quiz_responses'), array(' '), false);
|
|
$mform->disabledIf('qtext', 'attempts', 'eq', quiz_attempts_report::ENROLLED_WITHOUT);
|
|
$mform->disabledIf('resp', 'attempts', 'eq', quiz_attempts_report::ENROLLED_WITHOUT);
|
|
$mform->disabledIf('right', 'attempts', 'eq', quiz_attempts_report::ENROLLED_WITHOUT);
|
|
}
|
|
|
|
public function validation($data, $files) {
|
|
$errors = parent::validation($data, $files);
|
|
|
|
if ($data['attempts'] != quiz_attempts_report::ENROLLED_WITHOUT && !(
|
|
$data['qtext'] || $data['resp'] || $data['right'])) {
|
|
$errors['coloptions'] = get_string('reportmustselectstate', 'quiz');
|
|
}
|
|
|
|
return $errors;
|
|
}
|
|
|
|
protected function other_attempt_fields(MoodleQuickForm $mform) {
|
|
parent::other_attempt_fields($mform);
|
|
if (quiz_allows_multiple_tries($this->_customdata['quiz'])) {
|
|
$mform->addElement('select', 'whichtries', get_string('whichtries', 'question'), array(
|
|
question_attempt::FIRST_TRY => get_string('firsttry', 'question'),
|
|
question_attempt::LAST_TRY => get_string('lasttry', 'question'),
|
|
question_attempt::ALL_TRIES => get_string('alltries', 'question'))
|
|
);
|
|
$mform->setDefault('whichtries', question_attempt::LAST_TRY);
|
|
$mform->disabledIf('whichtries', 'attempts', 'eq', quiz_attempts_report::ENROLLED_WITHOUT);
|
|
}
|
|
}
|
|
}
|