L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-36916' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-12-11 15:42:08 +13:00
parent 505530eaf5 6e4a2acf93
commit 6ff1745873
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/report/attemptsreport_table.php
+2 -10
View File
@@ -272,16 +272,8 @@ abstract class quiz_attempts_report_table extends table_sql {
protected function icon_for_fraction($fraction) {
global $OUTPUT;
$state = question_state::graded_state_for_fraction($fraction);
if ($state == question_state::$gradedright) {
$icon = 'i/grade_correct';
} else if ($state == question_state::$gradedpartial) {
$icon = 'i/grade_partiallycorrect';
} else {
$icon = 'i/grade_incorrect';
}
return $OUTPUT->pix_icon($icon, get_string($state->get_feedback_class(), 'question'),
$feedbackclass = question_state::graded_state_for_fraction($fraction)->get_feedback_class();
return $OUTPUT->pix_icon('i/grade_' . $feedbackclass, get_string($feedbackclass, 'question'),
'moodle', array('class' => 'icon'));
}
question/type/rendererbase.php
+3 -11
View File
@@ -226,19 +226,11 @@ abstract class qtype_renderer extends plugin_renderer_base {
* @return string html fragment.
*/
protected function feedback_image($fraction, $selected = true) {
$state = question_state::graded_state_for_fraction($fraction);
if ($state == question_state::$gradedright) {
$icon = 'grade_correct';
} else if ($state == question_state::$gradedpartial) {
$icon = 'grade_partiallycorrect';
} else {
$icon = 'grade_incorrect';
}
$feedbackclass = question_state::graded_state_for_fraction($fraction)->get_feedback_class();
$attributes = array(
'src' => $this->output->pix_url('i/' . $icon),
'alt' => get_string($state->get_feedback_class(), 'question'),
'src' => $this->output->pix_url('i/grade_' . $feedbackclass),
'alt' => get_string($feedbackclass, 'question'),
'class' => 'questioncorrectnessicon',
);