mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-30683' of git://github.com/timhunt/moodle
This commit is contained in:
commit
92e72b0a86
@ -305,15 +305,16 @@ abstract class quiz_attempt_report extends quiz_default_report {
|
||||
* @param object $quiz the quiz settings.
|
||||
* @param array $columns the list of columns. Added to.
|
||||
* @param array $headers the columns headings. Added to.
|
||||
* @param bool $includefeedback whether to include the feedbacktext columns
|
||||
*/
|
||||
protected function add_grade_columns($quiz, &$columns, &$headers) {
|
||||
protected function add_grade_columns($quiz, &$columns, &$headers, $includefeedback = true) {
|
||||
if ($this->should_show_grades($quiz)) {
|
||||
$columns[] = 'sumgrades';
|
||||
$headers[] = get_string('grade', 'quiz') . '/' .
|
||||
quiz_format_grade($quiz, $quiz->grade);
|
||||
}
|
||||
|
||||
if (quiz_has_feedback($quiz)) {
|
||||
if ($includefeedback && quiz_has_feedback($quiz)) {
|
||||
$columns[] = 'feedbacktext';
|
||||
$headers[] = get_string('feedback', 'quiz');
|
||||
}
|
||||
|
@ -321,7 +321,7 @@ class quiz_overview_report extends quiz_attempt_report {
|
||||
$headers[] = get_string('regrade', 'quiz_overview');
|
||||
}
|
||||
|
||||
$this->add_grade_columns($quiz, $columns, $headers);
|
||||
$this->add_grade_columns($quiz, $columns, $headers, false);
|
||||
|
||||
$this->set_up_table_columns(
|
||||
$table, $columns, $headers, $reporturl, $displayoptions, false);
|
||||
|
Loading…
x
Reference in New Issue
Block a user