Replacing GRADE_REPORT_GRADE_DISPLAY_TYPE... by GRADE_DISPLAY_TYPE...

diff --git a/grade/edit/gradedisplay/gradedisplay_form.php b/grade/edit/gradedisplay/gradedisplay_form.php
index 50914a28c8699158fe54a865ead4697f3e094530..c4dab1d73b73d60d845b8201623850e6c84d026e 100644 (file)
--- a/grade/edit/gradedisplay/gradedisplay_form.php
+++ b/grade/edit/gradedisplay/gradedisplay_form.php
@@ -14,19 +14,19 @@ class edit_grade_display_form extends moodleform {
 
         $mform->addElement('header', 'coursesettings', get_string('coursesettings', 'grades'));
 
-        $gradedisplaytypes = array(GRADE_REPORT_GRADE_DISPLAY_TYPE_DEFAULT => get_string('default'),
-                                   GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                   GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                   GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'));
+        $gradedisplaytypes = array(GRADE_DISPLAY_TYPE_DEFAULT => get_string('default'),
+                                   GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                   GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                   GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'));
         $mform->addElement('select', 'gradedisplaytype', get_string('coursegradedisplaytype', 'grades'), $gradedisplaytypes);
         $mform->setHelpButton('gradedisplaytype', array(false, get_string('coursegradedisplaytype', 'grades'),
                 false, true, false, get_string('configcoursegradedisplaytype', 'grades')));
         $mform->setDefault('gradedisplaytype', $coursegradedisplaytype);
         $mform->setType($coursegradedisplaytype, PARAM_INT);
 
-        $course_set_to_letters  = $coursegradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER;
-        $course_set_to_default  = $coursegradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_DEFAULT;
-        $site_set_to_letters = $CFG->grade_report_gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER;
+        $course_set_to_letters  = $coursegradedisplaytype == GRADE_DISPLAY_TYPE_LETTER;
+        $course_set_to_default  = $coursegradedisplaytype == GRADE_DISPLAY_TYPE_DEFAULT;
+        $site_set_to_letters = $CFG->grade_report_gradedisplaytype == GRADE_DISPLAY_TYPE_LETTER;
 
         if ($course_set_to_letters || ($course_set_to_default && $site_set_to_letters)) {
 

diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php
index e02ca69b1ca68638b97083e0f89fc701d57e797a..36836e4f502ae6d711ccd2117ba23af5721f11c3 100644 (file)
--- a/grade/edit/tree/item_form.php
+++ b/grade/edit/tree/item_form.php
@@ -89,9 +89,9 @@ class edit_item_form extends moodleform {
         }
 
         $options = array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default', 'grades'),
-                         GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                         GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                         GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'));
+                         GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                         GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                         GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'));
         $label = get_string('gradedisplaytype', 'grades') . ' (' . get_string('default', 'grades')
                . ': ' . $options[$default_gradedisplaytype] . ')';
         $mform->addElement('select', 'display', $label, $options);

diff --git a/grade/export/lib.php b/grade/export/lib.php
index f58231e0ebc1c8f02cc86d5bf35e8afad59ab436..4e0538e26405338909cc08de0908d07ee9628733 100755 (executable)
--- a/grade/export/lib.php
+++ b/grade/export/lib.php
@@ -173,7 +173,7 @@ class grade_export {
             $grade_item = $this->grade_items[$grade->itemid];
             $grade_item_displaytype = $this->report->get_pref('gradedisplaytype', $grade_item->id);
 
-            if ($grade_item_displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
+            if ($grade_item_displaytype == GRADE_DISPLAY_TYPE_LETTER) {
                 return grade_grade::get_letter($this->letters, $grade->finalgrade, $grade_item->grademin, $grade_item->grademax);
             }
         }

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index d1b6b6c57324761a9765fc5b7fcfe42de1ba07ca..edfa1acaa5faab044a1f87f6ba301f3b59f5a26b 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -733,7 +733,7 @@ class grade_report_grader extends grade_report {
                     $grademin = $item->grademin;
                     $grademax = $item->grademax;
 
-                    if ($gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
+                    if ($gradedisplaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
                         if (!is_null($gradeval)) {
                             $gradeval = grade_to_percentage($gradeval, $grademin, $grademax);
                         }
@@ -754,13 +754,13 @@ class grade_report_grader extends grade_report {
                     if ($item->needsupdate) {
                         $studentshtml .= '<span class="gradingerror">'.get_string('error').'</span>';
 
-                    } else if ($gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
+                    } else if ($gradedisplaytype == GRADE_DISPLAY_TYPE_LETTER) {
                         $letters = grade_report::get_grade_letters();
                         if (!is_null($gradeval)) {
                             $studentshtml .= grade_grade::get_letter($letters, $gradeval, $grademin, $grademax);
                         }
                     } else if ($item->scaleid && !empty($scales_array[$item->scaleid])
-                                && $gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL) {
+                                && $gradedisplaytype == GRADE_DISPLAY_TYPE_REAL) {
                         $scale = $scales_array[$item->scaleid];
                         $scales = explode(",", $scale->scale);
 
@@ -902,7 +902,7 @@ class grade_report_grader extends grade_report {
                 $gradedisplaytype = $item->get_displaytype();
 
                 if ($USER->gradeediting[$this->courseid]) {
-                    $displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL;
+                    $displaytype = 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
@@ -935,10 +935,10 @@ class grade_report_grader extends grade_report {
                         $gradehtml = $gradeval;
                     }
 
-                    if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
+                    if ($displaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
                         $gradeval = grade_to_percentage($rawgradeval, $item->grademin, $item->grademax);
                         $gradehtml = format_float($gradeval, $decimalpoints). '%';
-                    } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
+                    } elseif ($displaytype == GRADE_DISPLAY_TYPE_LETTER) {
                         $letters = grade_report::get_grade_letters();
                         $gradehtml = grade_grade::get_letter($letters, $rawgradeval, $item->grademin, $item->grademax);
                     }
@@ -979,7 +979,7 @@ class grade_report_grader extends grade_report {
                 $gradedisplaytype = $item->get_displaytype();
 
                 if ($USER->gradeediting[$this->courseid]) {
-                    $displaytype = GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL;
+                    $displaytype = 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
@@ -990,13 +990,13 @@ class grade_report_grader extends grade_report {
                     $decimalpoints = $rangesdecimalpoints;
                 }
 
-                if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL) {
+                if ($displaytype == GRADE_DISPLAY_TYPE_REAL) {
                     $grademin = format_float($item->grademin, $decimalpoints);
                     $grademax = format_float($item->grademax, $decimalpoints);
-                } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
+                } elseif ($displaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
                     $grademin = 0;
                     $grademax = 100;
-                } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
+                } elseif ($displaytype == GRADE_DISPLAY_TYPE_LETTER) {
                     $letters = grade_report::get_grade_letters();
                     $grademin = end($letters);
                     $grademax = reset($letters);

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 56740ba47e7e4d1819076fd938619f0b6f96fe8d..86c2d99f27e570676193f2e860836c5576cac665 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -52,14 +52,14 @@ class grader_report_preferences_form extends moodleform {
                                              'showlocks'         => $checkbox_default);
 
             $preferences['prefrows'] = array(
-                        'averagesdisplaytype'    => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_DEFAULT => 'default',
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
-                        'rangesdisplaytype'      => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_DEFAULT => 'default',
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                                                          GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
+                        'averagesdisplaytype'    => array(GRADE_DISPLAY_TYPE_DEFAULT => 'default',
+                                                          GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                                          GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                                          GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
+                        'rangesdisplaytype'      => array(GRADE_DISPLAY_TYPE_DEFAULT => 'default',
+                                                          GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                                                          GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                                                          GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),
                         'averagesdecimalpoints'  => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
                                                           GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 0, 1, 2, 3, 4, 5),
                         'rangesdecimalpoints'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',

diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index 1cb01be628d3e3bebcb001133b3d62ec0d8126b0..6151fda6f6c96adfcf60356c4aafb4d5cc2542d3 100644 (file)
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -41,9 +41,9 @@ $settings->add(new admin_setting_configselect('grade_report_aggregationview', ge
 
 $settings->add(new admin_setting_configselect('grade_report_gradedisplaytype', get_string('gradedisplaytype', 'grades'),
                                           get_string('configgradedisplaytype', 'grades'), false,
-                                          array(GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => $strreal,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => $strletter)));
+                                          array(GRADE_DISPLAY_TYPE_REAL => $strreal,
+                                                GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
+                                                GRADE_DISPLAY_TYPE_LETTER => $strletter)));
 
 $settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'),
                                           get_string('configmeanselection', 'grades'), false,
@@ -82,15 +82,15 @@ $settings->add(new admin_setting_configcheckbox('grade_report_shownumberofgrades
 
 $settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'),
                                           get_string('configaveragesdisplaytype', 'grades'), false,
-                                          array(GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => $strreal,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => $strletter)));
+                                          array(GRADE_DISPLAY_TYPE_REAL => $strreal,
+                                                GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
+                                                GRADE_DISPLAY_TYPE_LETTER => $strletter)));
 
 $settings->add(new admin_setting_configselect('grade_report_rangesdisplaytype', get_string('rangesdisplaytype', 'grades'),
                                           get_string('configrangesdisplaytype', 'grades'), false,
-                                          array(GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => $strreal,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
-                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER => $strletter)));
+                                          array(GRADE_DISPLAY_TYPE_REAL => $strreal,
+                                                GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage,
+                                                GRADE_DISPLAY_TYPE_LETTER => $strletter)));
 
 $settings->add(new admin_setting_configselect('grade_report_averagesdecimalpoints', get_string('averagesdecimalpoints', 'grades'),
                                           get_string('configaveragesdecimalpoints', 'grades'), 2,

diff --git a/lib/grade/constants.php b/lib/grade/constants.php
index ab80b13aad29c581c3215b0b5615dd35337e9e31..84e6d7b3a20f200093f3af42c264d2a7704e1f87 100644 (file)
--- a/lib/grade/constants.php
+++ b/lib/grade/constants.php
@@ -64,10 +64,10 @@ define('GRADE_REPORT_AGGREGATION_POSITION_RIGHT', 1);
 define('GRADE_REPORT_AGGREGATION_VIEW_FULL', 0);
 define('GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY', 1);
 define('GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY', 2);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_DEFAULT', 0);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL', 1);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE', 2);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER', 3);
+define('GRADE_DISPLAY_TYPE_DEFAULT', 0);
+define('GRADE_DISPLAY_TYPE_REAL', 1);
+define('GRADE_DISPLAY_TYPE_PERCENTAGE', 2);
+define('GRADE_DISPLAY_TYPE_LETTER', 3);
 define('GRADE_REPORT_PREFERENCE_DEFAULT', 'default');
 define('GRADE_REPORT_PREFERENCE_INHERIT', 'inherit');
 define('GRADE_REPORT_PREFERENCE_UNUSED', -1);