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

MDL-32300 quiz manual grading report: also do some other cleanup.

Browse Source
This commit is contained in:
Tim Hunt 2011-11-17 19:21:20 +00:00
parent d42b8ac2f3
commit 7e3ac96cbe
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/quiz/report/grading/gradingsettings_form.php
View File

@ -53,7 +53,7 @@ class quiz_grading_settings extends moodleform {
}
protected function definition() {
$mform =& $this->_form;
$mform = $this->_form;
$mform->addElement('header', 'options', get_string('options', 'quiz_grading'));

1
mod/quiz/report/grading/lang/en/quiz_grading.php
View File

@ -64,6 +64,7 @@ $string['gradingungraded'] = '{$a} ungraded attempts';
$string['hideautomaticallygraded'] = 'Hide questions that have been graded automatically';
$string['inprogress'] = 'In progress';
$string['noquestionsfound'] = 'No manually graded questions found';
$string['nothingfound'] = 'Nothing to display';
$string['options'] = 'Options';
$string['orderattempts'] = 'Order attempts';
$string['pluginname'] = 'Manual grading';

22
mod/quiz/report/grading/report.php
View File

@ -45,8 +45,6 @@ class quiz_grading_report extends quiz_default_report {
protected $viewoptions = array();
protected $questions;
protected $currentgroup;
protected $users;
protected $cm;
protected $quiz;
protected $context;
@ -168,11 +166,19 @@ class quiz_grading_report extends quiz_default_report {
quiza.timefinish <> 0";
$params = array('mangrquizid' => $this->cm->instance);
if ($this->currentgroup) {
list($usql, $uparam) = $DB->get_in_or_equal(array_keys($this->users),
SQL_PARAMS_NAMED, 'mangru');
$where .= ' AND quiza.userid ' . $usql;
$params += $uparam;
$currentgroup = groups_get_activity_group($this->cm, true);
if ($currentgroup) {
$users = get_users_by_capability($this->context,
array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'), 'u.id, u.id', '', '', '',
$currentgroup, '', false);
if (empty($users)) {
$where .= ' AND quiza.userid = 0';
} else {
list($usql, $uparam) = $DB->get_in_or_equal(array_keys($users),
SQL_PARAMS_NAMED, 'mangru');
$where .= ' AND quiza.userid ' . $usql;
$params += $uparam;
}
}
return new qubaid_join('{quiz_attempts} quiza', 'quiza.uniqueid', $where, $params);
@ -308,7 +314,7 @@ class quiz_grading_report extends quiz_default_report {
}
if (empty($data)) {
echo $OUTPUT->heading(get_string('noquestionsfound', 'quiz_grading'));
echo $OUTPUT->heading(get_string('nothingfound', 'quiz_grading'));
return;
}