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

gradebook MDL-16103 prevented outcomes in gradebook showing the same icon as the activity they are attached to as it makes them hard to find.

Browse Source
This commit is contained in:
Andrew Davis 2010-11-30 09:03:43 +00:00
parent e76e431c66
commit 0077f57198
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
grade/lib.php
View File

@ -1013,6 +1013,7 @@ class grade_structure {
$is_category = $element['object']->is_category_item(); $is_category = $element['object']->is_category_item();
$is_scale = $element['object']->gradetype == GRADE_TYPE_SCALE; $is_scale = $element['object']->gradetype == GRADE_TYPE_SCALE;
$is_value = $element['object']->gradetype == GRADE_TYPE_VALUE; $is_value = $element['object']->gradetype == GRADE_TYPE_VALUE;
$is_outcome = !empty($element['object']->outcomeid);
if ($element['object']->is_calculated()) { if ($element['object']->is_calculated()) {
$strcalc = get_string('calculatedgrade', 'grades'); $strcalc = get_string('calculatedgrade', 'grades');
@ -1038,12 +1039,19 @@ class grade_structure {
} }
} else if ($element['object']->itemtype == 'mod') { } else if ($element['object']->itemtype == 'mod') {
$strmodname = get_string('modulename', $element['object']->itemmodule); //prevent outcomes being displaying the same icon as the activity they are attached to
return '<img src="'.$OUTPUT->pix_url('icon', if ($is_outcome) {
$stroutcome = s(get_string('outcome', 'grades'));
return '<img src="'.$OUTPUT->pix_url('i/outcomes') . '" ' .
'class="icon itemicon" title="'.$stroutcome.
'" alt="'.$stroutcome.'"/>';
} else {
$strmodname = get_string('modulename', $element['object']->itemmodule);
return '<img src="'.$OUTPUT->pix_url('icon',
$element['object']->itemmodule) . '" ' . $element['object']->itemmodule) . '" ' .
'class="icon itemicon" title="' .s($strmodname). 'class="icon itemicon" title="' .s($strmodname).
'" alt="' .s($strmodname).'"/>'; '" alt="' .s($strmodname).'"/>';
}
} else if ($element['object']->itemtype == 'manual') { } else if ($element['object']->itemtype == 'manual') {
if ($element['object']->is_outcome_item()) { if ($element['object']->is_outcome_item()) {
$stroutcome = get_string('outcome', 'grades'); $stroutcome = get_string('outcome', 'grades');