MDL-9628 Refactored display "Raw" string into "Real" to avoid confusion with raw...

diff --git a/grade/edit/item_form.php b/grade/edit/item_form.php
index 0d032152a0222b86bf9cff97ac33b6094d084d51..f37fc45b9697ed1e9053141e4cc44f429b1833ae 100644 (file)
--- a/grade/edit/item_form.php
+++ b/grade/edit/item_form.php
@@ -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')));

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 1b184bce50644514435ebd44ade409cc3ed6cace..3dff47e076f9d925757fb2c09b159cf03357c00e 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -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) {

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index c57bc3561843f0ea55ed8dfe9aad0ef0d22e73b3..1316ed35c285e80e1184c76e5fbf4e10895159fa 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -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),

diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index c46b47eba0964a4476d79a6171bf66e151763dee..b68751d481d35e4ab9e87773f019069f46adf5ff 100644 (file)
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -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'),

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 10e89a061414603895f246df29f4431c0907d9fd..0208691ab09406f8998a5d46665155089e027930 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -31,19 +31,19 @@ $string['categoriesedit'] = 'Edit Categories';
 $string['categoryname'] = 'Category name';
 $string['choosecategory'] = 'Select Category';
 $string['compact'] = 'Compact';
-$string['configaggregationposition'] = 'The position of the aggregation column in the grader report table, in reference to the raw grades.';
-$string['configaggregationview'] = 'The way aggregations are displayed: either alongside the raw grades, or in a compact form in which only one type is shown in the table at once: the raw grades OR the aggregated grades.';
+$string['configaggregationposition'] = 'The position of the aggregation column in the grader report table, in reference to the real grades.';
+$string['configaggregationview'] = 'The way aggregations are displayed: either alongside the real grades, or in a compact form in which only one type is shown in the table at once: the real grades OR the aggregated grades.';
 $string['configaveragesdecimalpoints'] = 'The number of decimal points to display for each average (group or whole), below a column of grades. This can be overriden per grading item.';
-$string['configaveragesdisplaytype'] = 'Specifies how to display the averages for each column in the grader report. The default and recommended value is Inherit, which first checks the display type of each column, and if such is not set explicitly, defaults to the more general Grade Display Type. If Raw or Percentage are selected, they ignore the individual settings for each column, and use exclusively the selected type.';
+$string['configaveragesdisplaytype'] = 'Specifies how to display the averages for each column in the grader report. The default and recommended value is Inherit, which first checks the display type of each column, and if such is not set explicitly, defaults to the more general Grade Display Type. If other display types are selected, they ignore the individual settings for each column, and use exclusively the selected type.';
 $string['configbulkcheckboxes'] = 'Checkboxes near each grade for Bulk grade operations.';
 $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['configgradedisplaytype'] = 'Grades can be shown as real grades, as percentages (in reference to the minimum and maximum grades) or as letters (A, B, C etc..)';
 $string['configmeanselection'] = 'Select which types of grades will be included in the column averages. Cells with no grade can be ignored, or counted as 0 (default setting).';
 $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['configrangesdecimalpoints'] = 'The number of decimal points to display for each range, above a column of grades. This can be overriden per grading item.';
-$string['configrangesdisplaytype'] = 'Specifies how to display the range for each column in the grader report. The default and recommended value is Inherit, which first checks the display type of each column, and if such is not set explicitly, defaults to the more general Grade Display Type. If Raw or Percentage are selected, they ignore the individual settings for each column, and use exclusively the selected type.';
+$string['configrangesdisplaytype'] = 'Specifies how to display the range for each column in the grader report. The default and recommended value is Inherit, which first checks the display type of each column, and if such is not set explicitly, defaults to the more general Grade Display Type. If other display types are selected, they ignore the individual settings for each column, and use exclusively the selected type.';
 $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['configshowaverages'] = 'Show column averages in the grader report.';
@@ -205,7 +205,7 @@ $string['range'] = 'Range';
 $string['rangesdecimalpoints'] = 'Decimals shown in ranges';
 $string['rangesdisplaytype'] = 'Range display type';
 $string['rank'] = 'Rank';
-$string['raw'] = 'Raw';
+$string['real'] = 'Real';
 $string['rawpct'] = 'Raw %%';
 $string['reportplugins'] = 'Report plugins';
 $string['reprintheaders'] = 'Reprint Headers';

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 67c0d978301ec6362722756ca31a5389bd262ce5..150826de17e74a0ba754df8c0bdf572a8e3f0b23 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -73,8 +73,9 @@ define('GRADE_REPORT_AGGREGATION_POSITION_LEFT', 0);
 define('GRADE_REPORT_AGGREGATION_POSITION_RIGHT', 1);
 define('GRADE_REPORT_AGGREGATION_VIEW_FULL', 0);
 define('GRADE_REPORT_AGGREGATION_VIEW_COMPACT', 1);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW', 0);
+define('GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL', 0);
 define('GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE', 1);
+define('GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER', 2);
 define('GRADE_REPORT_PREFERENCE_DEFAULT', 'default');
 define('GRADE_REPORT_PREFERENCE_INHERIT', 'inherit');
 

diff --git a/version.php b/version.php
index d1451587678551217bac63dcbf0eb86d8abad0be..db85e3a86c23f9a5ffb247a7b6b421ba8b667f08 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007071702;  // YYYYMMDD = date
+    $version = 2007071703;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '1.9 dev';   // Human-friendly version name