moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed "Grand totals" to "averages" everywhere

Browse source
This commit is contained in:
moodler 2007-07-16 07:04:52 +00:00
parent fbb004324a
commit 36e53792c5
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
grade/report/grader/lib.php
View file

@ -388,7 +388,7 @@ class grade_report_grader extends grade_report {
$html .= $this->print_toggle('calculations', true);
}
$html .= $this->print_toggle('grandtotals', true);
$html .= $this->print_toggle('averages', true);
$html .= $this->print_toggle('groups', true);
$html .= $this->print_toggle('ranges', true);
$html .= '</div>';
@ -407,7 +407,7 @@ class grade_report_grader extends grade_report {
$icons = array('eyecons' => 'hide',
'calculations' => 'calc',
'locks' => 'lock',
'grandtotals' => 'sigma');
'averages' => 'sigma');
$pref_name = 'grade_report_show' . $type;
$show_pref = get_user_preferences($pref_name, $CFG->$pref_name);
@ -799,7 +799,7 @@ class grade_report_grader extends grade_report {
$gradeavghtml = '';
$numusers = $this->get_numusers(false); // find total number of users, without group constraint
if ($this->get_pref('showgrandtotals')) {
if ($this->get_pref('showaverages')) {
/** SQL for finding the SUM grades of all visible users ($CFG->gradebookroles) */
// do not sum -1 (no grade), treat as 0 for now
@ -820,7 +820,7 @@ class grade_report_grader extends grade_report {
$classsum[$itemid] = $csum;
}
$gradeavghtml = '<tr><th>'.get_string('average').'</th>';
$gradeavghtml = '<tr><th>'.get_string('average', 'grades').'</th>';
foreach ($this->items as $item) {
if (!isset($classsum[$item->id])) {
$gradeavghtml .= '<td>-</td>';

4
grade/report/grader/preferences_form.php
View file

@ -23,7 +23,7 @@ class grader_report_preferences_form extends moodleform {
'enableajax' => 'advcheckbox',
'showcalculations' => 'advcheckbox',
'showeyecons' => 'advcheckbox',
'showgrandtotals' => 'advcheckbox',
'showaverages' => 'advcheckbox',
'showgroups' => 'advcheckbox',
'showlocks' => 'advcheckbox',
'showranges' => 'advcheckbox',
@ -32,7 +32,7 @@ class grader_report_preferences_form extends moodleform {
'aggregationposition' => array(get_string('left', 'grades'), get_string('right', 'grades')),
'aggregationview' => array(get_string('full', 'grades'), get_string('compact', 'grades')),
'gradedisplaytype' => array(get_string('raw', 'grades'), get_string('percentage', 'grades')),
'grandtotalsdisplaytype' => array(get_string('raw', 'grades'), get_string('percentage', 'grades')),
'averagesdisplaytype' => array(get_string('raw', 'grades'), get_string('percentage', 'grades')),
'decimalpoints' => array(0, 1, 2, 3, 4, 5),
'studentsperpage' => 'text');

8
grade/report/grader/settings.php
View file

@ -19,8 +19,8 @@ $settings->add(new admin_setting_configselect('grade_report_gradedisplaytype', g
get_string('configgradedisplaytype', 'grades'), false,
array(get_string('raw', 'grades'), get_string('percentage', 'grades'))));
$settings->add(new admin_setting_configselect('grade_report_grandtotalsdisplaytype', get_string('grandtotalsdisplaytype', 'grades'),
get_string('configgrandtotalsdisplaytype', 'grades'), false,
$settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'),
get_string('configaveragesdisplaytype', 'grades'), false,
array(get_string('raw', 'grades'), get_string('percentage', 'grades'))));
$settings->add(new admin_setting_configcheckbox('grade_report_showcalculations', get_string('showcalculations', 'grades'),
@ -32,8 +32,8 @@ $settings->add(new admin_setting_configcheckbox('grade_report_showeyecons', get_
$settings->add(new admin_setting_configcheckbox('grade_report_showgroups', get_string('showgroups', 'grades'),
get_string('configshowgroups', 'grades'), 0));
$settings->add(new admin_setting_configcheckbox('grade_report_showgrandtotals', get_string('showgrandtotals', 'grades'),
get_string('configshowgrandtotals', 'grades'), 0));
$settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'),
get_string('configshowaverages', 'grades'), 0));
$settings->add(new admin_setting_configcheckbox('grade_report_showlocks', get_string('showlocks', 'grades'),
get_string('configshowlocks', 'grades'), 0));