mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-01 05:18:06 +01:00
Code Issues Projects Releases Wiki Activity

MDL-32322 quiz reports: killing more duplication.

Browse Source
This commit is contained in:
Tim Hunt 2012-04-04 19:12:13 +01:00
parent 5ca45fddab
commit 303aa3b8d0
3 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mod/quiz/report/attemptsreport.php
View File

@ -48,12 +48,56 @@ abstract class quiz_attempt_report extends quiz_default_report {
/** @var int include all enroled users. */ /** @var int include all enroled users. */
const ALL_STUDENTS = 3; const ALL_STUDENTS = 3;
/** @var string the mode this report is. */
protected $mode;
/** @var object the quiz context. */ /** @var object the quiz context. */
protected $context; protected $context;
/** @var mod_quiz_attempt_report_form The settings form to use. */
protected $form;
/** @var string SQL fragment for selecting the attempt that gave the final grade,
* if applicable. */
protected $qmsubselect;
/** @var boolean caches the results of {@link should_show_grades()}. */ /** @var boolean caches the results of {@link should_show_grades()}. */
protected $showgrades = null; protected $showgrades = null;
/**
* Initialise various aspects of this report.
*
* @param string $mode
* @param string $formclass
* @param object $quiz
* @param object $cm
* @param object $course
*/
protected function init($mode, $formclass, $quiz, $cm, $course) {
$this->mode = $mode;
$this->context = context_module::instance($cm->id);
list($currentgroup, $students, $groupstudents, $allowed) =
$this->load_relevant_students($cm, $course);
$this->qmsubselect = quiz_report_qm_filter_select($quiz);
$this->form = new $formclass($this->get_base_url(),
array('qmsubselect' => $this->qmsubselect, 'quiz' => $quiz,
'currentgroup' => $currentgroup, 'context' => $this->context));
return array($currentgroup, $students, $groupstudents, $allowed);
}
/**
* @return moodle_url the base URL for this report.
*/
protected function get_base_url() {
return new moodle_url('/mod/quiz/report.php',
array('id' => $this->context->instanceid, 'mode' => $this->mode));
}
/** /**
* Should the grades be displayed in this report. That depends on the quiz * Should the grades be displayed in this report. That depends on the quiz
* display options, and whether the quiz is graded. * display options, and whether the quiz is graded.

55
mod/quiz/report/overview/report.php
View File

@ -41,30 +41,15 @@ class quiz_overview_report extends quiz_attempt_report {
public function display($quiz, $cm, $course) { public function display($quiz, $cm, $course) {
global $CFG, $DB, $OUTPUT; global $CFG, $DB, $OUTPUT;
$this->context = context_module::instance($cm->id);
$download = optional_param('download', '', PARAM_ALPHA);
list($currentgroup, $students, $groupstudents, $allowed) = list($currentgroup, $students, $groupstudents, $allowed) =
$this->load_relevant_students($cm, $course); $this->init('overview', 'quiz_overview_settings_form', $quiz, $cm, $course);
$pageoptions = array(); if ($fromform = $this->form->get_data()) {
$pageoptions['id'] = $cm->id;
$pageoptions['mode'] = 'overview';
$reporturl = new moodle_url('/mod/quiz/report.php', $pageoptions);
$qmsubselect = quiz_report_qm_filter_select($quiz);
$mform = new quiz_overview_settings_form($reporturl,
array('qmsubselect' => $qmsubselect, 'quiz' => $quiz,
'currentgroup' => $currentgroup, 'context' => $this->context));
if ($fromform = $mform->get_data()) {
$regradeall = false; $regradeall = false;
$regradealldry = false; $regradealldry = false;
$regradealldrydo = false; $regradealldrydo = false;
$attemptsmode = $fromform->attemptsmode; $attemptsmode = $fromform->attemptsmode;
if ($qmsubselect) { if ($this->qmsubselect) {
$qmfilter = $fromform->qmfilter; $qmfilter = $fromform->qmfilter;
} else { } else {
$qmfilter = 0; $qmfilter = 0;
@ -80,7 +65,7 @@ class quiz_overview_report extends quiz_attempt_report {
$regradealldry = optional_param('regradealldry', 0, PARAM_BOOL); $regradealldry = optional_param('regradealldry', 0, PARAM_BOOL);
$regradealldrydo = optional_param('regradealldrydo', 0, PARAM_BOOL); $regradealldrydo = optional_param('regradealldrydo', 0, PARAM_BOOL);
$attemptsmode = optional_param('attemptsmode', null, PARAM_INT); $attemptsmode = optional_param('attemptsmode', null, PARAM_INT);
if ($qmsubselect) { if ($this->qmsubselect) {
$qmfilter = optional_param('qmfilter', 0, PARAM_INT); $qmfilter = optional_param('qmfilter', 0, PARAM_INT);
} else { } else {
$qmfilter = 0; $qmfilter = 0;
@ -96,7 +81,7 @@ class quiz_overview_report extends quiz_attempt_report {
$displayoptions['qmfilter'] = $qmfilter; $displayoptions['qmfilter'] = $qmfilter;
$displayoptions['regradefilter'] = $regradefilter; $displayoptions['regradefilter'] = $regradefilter;
$mform->set_data($displayoptions + $this->form->set_data($displayoptions +
array('detailedmarks' => $detailedmarks, 'pagesize' => $pagesize)); array('detailedmarks' => $detailedmarks, 'pagesize' => $pagesize));
if (!$this->should_show_grades($quiz)) { if (!$this->should_show_grades($quiz)) {
@ -122,12 +107,12 @@ class quiz_overview_report extends quiz_attempt_report {
// Prepare for downloading, if applicable. // Prepare for downloading, if applicable.
$courseshortname = format_string($course->shortname, true, $courseshortname = format_string($course->shortname, true,
array('context' => context_course::instance($course->id))); array('context' => context_course::instance($course->id)));
$table = new quiz_overview_table($quiz, $this->context, $qmsubselect, $table = new quiz_overview_table($quiz, $this->context, $this->qmsubselect,
$qmfilter, $attemptsmode, $groupstudents, $students, $detailedmarks, $qmfilter, $attemptsmode, $groupstudents, $students, $detailedmarks,
$questions, $includecheckboxes, $reporturl, $displayoptions); $questions, $includecheckboxes, $this->get_base_url(), $displayoptions);
$filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'), $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'),
$courseshortname, $quiz->name); $courseshortname, $quiz->name);
$table->is_downloading($download, $filename, $table->is_downloading(optional_param('download', '', PARAM_ALPHA), $filename,
$courseshortname . ' ' . format_string($quiz->name, true)); $courseshortname . ' ' . format_string($quiz->name, true));
if ($table->is_downloading()) { if ($table->is_downloading()) {
raise_memory_limit(MEMORY_EXTRA); raise_memory_limit(MEMORY_EXTRA);
@ -139,14 +124,14 @@ class quiz_overview_report extends quiz_attempt_report {
if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) { if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) {
require_capability('mod/quiz:deleteattempts', $this->context); require_capability('mod/quiz:deleteattempts', $this->context);
$this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed); $this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed);
redirect($reporturl->out(false, $displayoptions)); redirect($this->get_base_url()->out(false, $displayoptions));
} }
} else if (optional_param('regrade', 0, PARAM_BOOL) && confirm_sesskey()) { } else if (optional_param('regrade', 0, PARAM_BOOL) && confirm_sesskey()) {
if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) { if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) {
require_capability('mod/quiz:regrade', $this->context); require_capability('mod/quiz:regrade', $this->context);
$this->regrade_attempts($quiz, false, $groupstudents, $attemptids); $this->regrade_attempts($quiz, false, $groupstudents, $attemptids);
redirect($reporturl->out(false, $displayoptions)); redirect($this->get_base_url()->out(false, $displayoptions));
} }
} }
} }
@ -154,17 +139,17 @@ class quiz_overview_report extends quiz_attempt_report {
if ($regradeall && confirm_sesskey()) { if ($regradeall && confirm_sesskey()) {
require_capability('mod/quiz:regrade', $this->context); require_capability('mod/quiz:regrade', $this->context);
$this->regrade_attempts($quiz, false, $groupstudents); $this->regrade_attempts($quiz, false, $groupstudents);
redirect($reporturl->out(false, $displayoptions), '', 5); redirect($this->get_base_url()->out(false, $displayoptions), '', 5);
} else if ($regradealldry && confirm_sesskey()) { } else if ($regradealldry && confirm_sesskey()) {
require_capability('mod/quiz:regrade', $this->context); require_capability('mod/quiz:regrade', $this->context);
$this->regrade_attempts($quiz, true, $groupstudents); $this->regrade_attempts($quiz, true, $groupstudents);
redirect($reporturl->out(false, $displayoptions), '', 5); redirect($this->get_base_url()->out(false, $displayoptions), '', 5);
} else if ($regradealldrydo && confirm_sesskey()) { } else if ($regradealldrydo && confirm_sesskey()) {
require_capability('mod/quiz:regrade', $this->context); require_capability('mod/quiz:regrade', $this->context);
$this->regrade_attempts_needing_it($quiz, $groupstudents); $this->regrade_attempts_needing_it($quiz, $groupstudents);
redirect($reporturl->out(false, $displayoptions), '', 5); redirect($this->get_base_url()->out(false, $displayoptions), '', 5);
} }
// Start output. // Start output.
@ -176,7 +161,7 @@ class quiz_overview_report extends quiz_attempt_report {
if ($groupmode = groups_get_activity_groupmode($cm)) { if ($groupmode = groups_get_activity_groupmode($cm)) {
// Groups are being used, so output the group selector if we are not downloading. // Groups are being used, so output the group selector if we are not downloading.
if (!$table->is_downloading()) { if (!$table->is_downloading()) {
groups_print_activity_menu($cm, $reporturl->out(true, $displayoptions)); groups_print_activity_menu($cm, $this->get_base_url()->out(true, $displayoptions));
} }
} }
@ -199,7 +184,7 @@ class quiz_overview_report extends quiz_attempt_report {
} }
// Print the display options. // Print the display options.
$mform->display(); $this->form->display();
} }
$hasstudents = $students && (!$currentgroup || $groupstudents); $hasstudents = $students && (!$currentgroup || $groupstudents);
@ -207,10 +192,10 @@ class quiz_overview_report extends quiz_attempt_report {
// Construct the SQL. // Construct the SQL.
$fields = $DB->sql_concat('u.id', "'#'", 'COALESCE(quiza.attempt, 0)') . $fields = $DB->sql_concat('u.id', "'#'", 'COALESCE(quiza.attempt, 0)') .
' AS uniqueid, '; ' AS uniqueid, ';
if ($qmsubselect) { if ($this->qmsubselect) {
$fields .= $fields .=
"(CASE " . "(CASE " .
" WHEN $qmsubselect THEN 1" . " WHEN {$this->qmsubselect} THEN 1" .
" ELSE 0 " . " ELSE 0 " .
"END) AS gradedattempt, "; "END) AS gradedattempt, ";
} }
@ -258,7 +243,7 @@ class quiz_overview_report extends quiz_attempt_report {
$regradealllabel = $regradealllabel =
get_string('regradeall', 'quiz_overview'); get_string('regradeall', 'quiz_overview');
} }
$displayurl = new moodle_url($reporturl, $displayurl = new moodle_url($this->get_base_url(),
$displayoptions + array('sesskey' => sesskey())); $displayoptions + array('sesskey' => sesskey()));
echo '<div class="mdl-align">'; echo '<div class="mdl-align">';
echo '<form action="'.$displayurl->out_omit_querystring().'">'; echo '<form action="'.$displayurl->out_omit_querystring().'">';
@ -277,7 +262,7 @@ class quiz_overview_report extends quiz_attempt_report {
} }
// Print information on the grading method. // Print information on the grading method.
if ($strattempthighlight = quiz_report_highlighting_grading_method( if ($strattempthighlight = quiz_report_highlighting_grading_method(
$quiz, $qmsubselect, $qmfilter)) { $quiz, $this->qmsubselect, $qmfilter)) {
echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>'; echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>';
} }
} }
@ -319,7 +304,7 @@ class quiz_overview_report extends quiz_attempt_report {
$this->add_grade_columns($quiz, $columns, $headers, false); $this->add_grade_columns($quiz, $columns, $headers, false);
$this->set_up_table_columns( $this->set_up_table_columns(
$table, $columns, $headers, $reporturl, $displayoptions, false); $table, $columns, $headers, $this->get_base_url(), $displayoptions, false);
$table->set_attribute('class', 'generaltable generalbox grades'); $table->set_attribute('class', 'generaltable generalbox grades');
$table->out($pagesize, true); $table->out($pagesize, true);

41
mod/quiz/report/responses/report.php
View File

@ -49,27 +49,12 @@ class quiz_responses_report extends quiz_attempt_report {
public function display($quiz, $cm, $course) { public function display($quiz, $cm, $course) {
global $CFG, $DB, $OUTPUT; global $CFG, $DB, $OUTPUT;
$this->context = context_module::instance($cm->id);
$download = optional_param('download', '', PARAM_ALPHA);
list($currentgroup, $students, $groupstudents, $allowed) = list($currentgroup, $students, $groupstudents, $allowed) =
$this->load_relevant_students($cm, $course); $this->init('responses', 'quiz_responses_settings_form', $quiz, $cm, $course);
$pageoptions = array(); if ($fromform = $this->form->get_data()) {
$pageoptions['id'] = $cm->id;
$pageoptions['mode'] = 'responses';
$reporturl = new moodle_url('/mod/quiz/report.php', $pageoptions);
$qmsubselect = quiz_report_qm_filter_select($quiz);
$mform = new quiz_responses_settings_form($reporturl,
array('qmsubselect' => $qmsubselect, 'quiz' => $quiz,
'currentgroup' => $currentgroup, 'context' => $this->context));
if ($fromform = $mform->get_data()) {
$attemptsmode = $fromform->attemptsmode; $attemptsmode = $fromform->attemptsmode;
if ($qmsubselect) { if ($this->qmsubselect) {
$qmfilter = $fromform->qmfilter; $qmfilter = $fromform->qmfilter;
} else { } else {
$qmfilter = 0; $qmfilter = 0;
@ -85,7 +70,7 @@ class quiz_responses_report extends quiz_attempt_report {
} else { } else {
$attemptsmode = optional_param('attemptsmode', null, PARAM_INT); $attemptsmode = optional_param('attemptsmode', null, PARAM_INT);
if ($qmsubselect) { if ($this->qmsubselect) {
$qmfilter = optional_param('qmfilter', 0, PARAM_INT); $qmfilter = optional_param('qmfilter', 0, PARAM_INT);
} else { } else {
$qmfilter = 0; $qmfilter = 0;
@ -104,7 +89,7 @@ class quiz_responses_report extends quiz_attempt_report {
$displayoptions['resp'] = $includeresp; $displayoptions['resp'] = $includeresp;
$displayoptions['right'] = $includeright; $displayoptions['right'] = $includeright;
$mform->set_data($displayoptions + $this->form->set_data($displayoptions +
array('pagesize' => $pagesize)); array('pagesize' => $pagesize));
if (!$includeqtext && !$includeresp && !$includeright) { if (!$includeqtext && !$includeresp && !$includeright) {
@ -130,12 +115,12 @@ class quiz_responses_report extends quiz_attempt_report {
// Prepare for downloading, if applicable. // Prepare for downloading, if applicable.
$courseshortname = format_string($course->shortname, true, $courseshortname = format_string($course->shortname, true,
array('context' => context_course::instance($course->id))); array('context' => context_course::instance($course->id)));
$table = new quiz_responses_table($quiz, $this->context, $qmsubselect, $table = new quiz_responses_table($quiz, $this->context, $this->qmsubselect,
$qmfilter, $attemptsmode, $groupstudents, $students, $qmfilter, $attemptsmode, $groupstudents, $students,
$questions, $includecheckboxes, $reporturl, $displayoptions); $questions, $includecheckboxes, $this->get_base_url(), $displayoptions);
$filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'), $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'),
$courseshortname, $quiz->name); $courseshortname, $quiz->name);
$table->is_downloading($download, $filename, $table->is_downloading(optional_param('download', '', PARAM_ALPHA), $filename,
$courseshortname . ' ' . format_string($quiz->name, true)); $courseshortname . ' ' . format_string($quiz->name, true));
if ($table->is_downloading()) { if ($table->is_downloading()) {
raise_memory_limit(MEMORY_EXTRA); raise_memory_limit(MEMORY_EXTRA);
@ -147,7 +132,7 @@ class quiz_responses_report extends quiz_attempt_report {
if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) { if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) {
require_capability('mod/quiz:deleteattempts', $this->context); require_capability('mod/quiz:deleteattempts', $this->context);
$this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed); $this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed);
redirect($reporturl->out(false, $displayoptions)); redirect($this->get_base_url()->out(false, $displayoptions));
} }
} }
} }
@ -161,7 +146,7 @@ class quiz_responses_report extends quiz_attempt_report {
if ($groupmode = groups_get_activity_groupmode($cm)) { if ($groupmode = groups_get_activity_groupmode($cm)) {
// Groups are being used, so output the group selector if we are not downloading. // Groups are being used, so output the group selector if we are not downloading.
if (!$table->is_downloading()) { if (!$table->is_downloading()) {
groups_print_activity_menu($cm, $reporturl->out(true, $displayoptions)); groups_print_activity_menu($cm, $this->get_base_url()->out(true, $displayoptions));
} }
} }
@ -184,7 +169,7 @@ class quiz_responses_report extends quiz_attempt_report {
} }
// Print the display options. // Print the display options.
$mform->display(); $this->form->display();
} }
$hasstudents = $students && (!$currentgroup || $groupstudents); $hasstudents = $students && (!$currentgroup || $groupstudents);
@ -193,7 +178,7 @@ class quiz_responses_report extends quiz_attempt_report {
if (!$table->is_downloading()) { if (!$table->is_downloading()) {
// Do not print notices when downloading. // Do not print notices when downloading.
if ($strattempthighlight = quiz_report_highlighting_grading_method( if ($strattempthighlight = quiz_report_highlighting_grading_method(
$quiz, $qmsubselect, $qmfilter)) { $quiz, $this->qmsubselect, $qmfilter)) {
echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>'; echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>';
} }
} }
@ -241,7 +226,7 @@ class quiz_responses_report extends quiz_attempt_report {
$table->sortable(true, 'uniqueid'); $table->sortable(true, 'uniqueid');
// Set up the table. // Set up the table.
$table->define_baseurl($reporturl->out(true, $displayoptions)); $table->define_baseurl($this->get_base_url()->out(true, $displayoptions));
$this->configure_user_columns($table); $this->configure_user_columns($table);