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

MDL-9628 Refactored display "Raw" string into "Real" to avoid confusion with raw vs final grades

Browse source
This commit is contained in:
nicolasconnault 2007-07-17 19:04:50 +00:00
parent 01516fd39a
commit db4c796818
7 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grade/edit/item_form.php
View file

@ -77,7 +77,7 @@ class edit_item_form extends moodleform {
$mform->addElement('select', 'pref_gradedisplaytype', get_string('gradedisplaytype', 'grades'),
array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades')));
$mform->setHelpButton('pref_gradedisplaytype', array(false, get_string('gradedisplaytype', 'grades'),
false, true, false, get_string("config_gradedisplaytype", 'grades')));

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

@ -709,7 +709,7 @@ class grade_report_grader extends grade_report {
// finalgrades[$userid][$itemid] could be null because of the outer join
// in this case it's different than a 0
if ($item->scaleid && !empty($scales_array[$item->scaleid]) && $gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW) {
if ($item->scaleid && !empty($scales_array[$item->scaleid]) && $gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL) {
$scale = $scales_array[$item->scaleid];
$scales = explode(",", $scale->scale);
@ -783,7 +783,7 @@ class grade_report_grader extends grade_report {
// Determine which display type to use for this average
$gradedisplaytype = $this->get_pref('gradedisplaytype', $item->id);
if ($USER->gradeediting) {
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW;
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL;
} elseif ($averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // Inherit specific column or general preference
$displaytype = $gradedisplaytype;
} else { // General preference overrides specific column display type
@ -868,7 +868,7 @@ class grade_report_grader extends grade_report {
// Determine which display type to use for this average
$gradedisplaytype = $this->get_pref('gradedisplaytype', $item->id);
if ($USER->gradeediting) {
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW;
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL;
} elseif ($averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // Inherit specific column or general preference
$displaytype = $gradedisplaytype;
} else { // General preference overrides specific column display type
@ -928,15 +928,16 @@ class grade_report_grader extends grade_report {
$decimalpoints = $this->get_pref('decimalpoints', $item->id);
// Determine which display type to use for this range
$gradedisplaytype = $this->get_pref('gradedisplaytype', $item->id);
if ($USER->gradeediting) {
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW;
$displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL;
} elseif ($rangesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // Inherit specific column or general preference
$displaytype = $gradedisplaytype;
} else { // General preference overrides specific column display type
$displaytype = $rangesdisplaytype;
}
if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW) {
if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL) {
$grademin = $this->get_grade_clean($item->grademin, $decimalpoints);
$grademax = $this->get_grade_clean($item->grademax, $decimalpoints);
} elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {

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

@ -36,13 +36,13 @@ class grader_report_preferences_form extends moodleform {
GRADE_REPORT_AGGREGATION_POSITION_RIGHT => get_string('right', 'grades')),
'aggregationview' => array(GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('full', 'grades'),
GRADE_REPORT_AGGREGATION_VIEW_COMPACT => get_string('compact', 'grades')),
'gradedisplaytype' => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
'gradedisplaytype' => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades')),
'averagesdisplaytype' => array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades')),
'rangesdisplaytype' => array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades')),
'averagesdecimalpoints' => array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
0, 1, 2, 3, 4, 5),

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

@ -20,19 +20,19 @@ $settings->add(new admin_setting_configcheckbox('grade_report_enableajax', get_s
$settings->add(new admin_setting_configselect('grade_report_gradedisplaytype', get_string('gradedisplaytype', 'grades'),
get_string('configgradedisplaytype', 'grades'), false,
array(GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
array(GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'))));
$settings->add(new admin_setting_configselect('grade_report_rangesdisplaytype', get_string('rangesdisplaytype', 'grades'),
get_string('configrangesdisplaytype', 'grades'), false,
array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'))));
$settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'),
get_string('configaveragesdisplaytype', 'grades'), false,
array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'))));
$settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'),