mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

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
Show Stats 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));

10
lang/en_utf8/grades.php
View File

@ -14,6 +14,7 @@ $string['allgrades'] = 'All grades by category';
$string['allstudents'] = 'All Students';
$string['autosort'] = 'Auto-sort';
$string['average'] = 'Average';
$string['averagesdisplaytype'] = 'Column averages display type';
$string['badgrade'] = 'Supplied grade is invalid';
$string['baduser'] = 'Supplied user is invalid';
$string['bonuspoints'] = 'Bonus Points';
@ -35,12 +36,12 @@ $string['configbulkcheckboxes'] = 'Checkboxes near each grade for Bulk grade ope
$string['configdecimalpoints'] = 'The number of decimal points to display for each grade. This can be overriden per grading item.';
$string['configenableajax'] = 'Adds a layer of AJAX functionality to the grader report, simplifying and speeding up common operations. Depends on Javascript being switched on at the user\'s browser level.';
$string['configgradedisplaytype'] = 'Grades can be shown as raw grades or as percentages (in reference to the minimum and maximum grades).';
$string['configgrandtotalsdisplaytype'] = 'Column totals can be shown as raw grades or as percentages (in reference to the minimum and maximum grades).';
$string['configaveragesdisplaytype'] = 'Column totals can be shown as raw grades or as percentages (in reference to the minimum and maximum grades).';
$string['configquickfeedback'] = 'Quick Feedback adds a text input element in each grade cell on the grader report, allowing you to edit many grades at once. You can then click the Update button to perform all these changes at once, instead of one at a time.';
$string['configquickgrading'] = 'Quick Grading adds a text input element in each grade cell on the grader report, allowing you to edit the feedback for many grades at once. You can then click the Update button to perform all these changes at once, instead of one at a time.';
$string['configshowcalculations'] = 'Whether to show calculator icons near each grade item and category, tooltips over calculated items and a visual indicator that a column is calculated.';
$string['configshoweyecons'] = 'Whether to show a show/hide icon near each grade (controlling its visibility to the user).';
$string['configshowgrandtotals'] = 'Show column totals in the grader report.';
$string['configshowaverages'] = 'Show column averages in the grader report.';
$string['configshowgroups'] = 'Show group totals and means in the grader report.';
$string['configshowlocks'] = 'Whether to show a lock/unlock icon near each grade.';
$string['configshowfeedback'] = 'Whether to show a feedback icon (for adding/editing) near each grade.';
@ -116,12 +117,11 @@ $string['gradereports'] = 'Grades report';
$string['graderreport'] = 'Grader report';
$string['gradetype'] = 'Grade type';
$string['gradeweighthelp'] = 'Grade Weight Help';
$string['grandtotalsdisplaytype'] = 'Column totals display type';
$string['hideadvanced'] = 'Hide Advanced Features';
$string['hidecalculations'] = 'Hide calculations';
$string['hidecategory'] = 'Hidden';
$string['hideeyecons'] = 'Hide show/hide icons';
$string['hidegrandtotals'] = 'Hide grandtotals';
$string['hideaverages'] = 'Hide averages';
$string['hidegroups'] = 'Hide groups';
$string['hidelocks'] = 'Hide locks';
$string['hidefeedback'] = 'Hide feedback';
@ -210,7 +210,7 @@ $string['setweights'] = 'Set Weights';
$string['showallstudents'] = 'Show All Students';
$string['showcalculations'] = 'Show calculations';
$string['showeyecons'] = 'Show show/hide icons';
$string['showgrandtotals'] = 'Show column totals';
$string['showaverages'] = 'Show column averages';
$string['showgroups'] = 'Show groups';
$string['showlocks'] = 'Show locks';
$string['showfeedback'] = 'Show feedback';