Skip to content

Commit

Permalink
Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/mo…
Browse files Browse the repository at this point in the history
…odle
  • Loading branch information
Sam Hemelryk committed Jun 20, 2011
2 parents f2113d6 + 1b327de commit 3fc7c06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mod/quiz/index.php
Expand Up @@ -177,7 +177,7 @@
$grade = get_string('outofshort', 'quiz', $a); $grade = get_string('outofshort', 'quiz', $a);
} }
if ($alloptions->overallfeedback) { if ($alloptions->overallfeedback) {
$feedback = quiz_feedback_for_grade($grades[$quiz->id], $quiz, $context, $cm); $feedback = quiz_feedback_for_grade($grades[$quiz->id], $quiz, $context);
} }
} }
$data[] = $grade; $data[] = $grade;
Expand Down
6 changes: 3 additions & 3 deletions mod/quiz/renderer.php
Expand Up @@ -800,7 +800,7 @@ public function view_table($quiz, $context, $viewobj) {


if ($viewobj->feedbackcolumn && $attempt->timefinish > 0) { if ($viewobj->feedbackcolumn && $attempt->timefinish > 0) {
if ($attemptoptions->overallfeedback) { if ($attemptoptions->overallfeedback) {
$row[] = quiz_feedback_for_grade($attemptgrade, $quiz, $context, $cm); $row[] = quiz_feedback_for_grade($attemptgrade, $quiz, $context);
} else { } else {
$row[] = ''; $row[] = '';
} }
Expand Down Expand Up @@ -880,7 +880,7 @@ public function view_result_info($quiz, $context, $cm, $viewobj) {
if ($viewobj->feedbackcolumn) { if ($viewobj->feedbackcolumn) {
$resultinfo .= $this->heading(get_string('overallfeedback', 'quiz'), 3, 'main'); $resultinfo .= $this->heading(get_string('overallfeedback', 'quiz'), 3, 'main');
$resultinfo .= html_writer::tag('p', $resultinfo .= html_writer::tag('p',
quiz_feedback_for_grade($viewobj->mygrade, $quiz, $context, $cm), quiz_feedback_for_grade($viewobj->mygrade, $quiz, $context),
array('class' => 'quizgradefeedback')).'\n'; array('class' => 'quizgradefeedback')).'\n';
} }


Expand Down Expand Up @@ -1039,4 +1039,4 @@ class mod_quiz_view_object {
* @var int $lastfinishedattempt contains a pointer to the last attempt in the attempts array. * @var int $lastfinishedattempt contains a pointer to the last attempt in the attempts array.
*/ */
public $lastfinishedattempt; public $lastfinishedattempt;
} }

0 comments on commit 3fc7c06

Please sign in to comment.