MDL-13778 Added new display types to course settings. Merged from MOODLE_19_STABLE

diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
index 8de83303bb977571d134ec14b8797a302ef06e99..fecaa9ed5e5ca2508595b6fd356c279b53ecd734 100644 (file)
--- a/grade/edit/settings/form.php
+++ b/grade/edit/settings/form.php
@@ -72,7 +72,15 @@ class course_settings_form extends moodleform {
         $options = array(-1                            => get_string('default', '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'));
+                         GRADE_DISPLAY_TYPE_LETTER     => get_string('letter', 'grades'),
+                         GRADE_DISPLAY_TYPE_REAL_PERCENTAGE => get_string('realpercentage', 'grades'),
+                         GRADE_DISPLAY_TYPE_REAL_LETTER => get_string('realletter', 'grades'),
+                         GRADE_DISPLAY_TYPE_LETTER_REAL => get_string('letterreal', 'grades'),
+                         GRADE_DISPLAY_TYPE_LETTER_PERCENTAGE => get_string('letterpercentage', 'grades'),
+                         GRADE_DISPLAY_TYPE_PERCENTAGE_LETTER => get_string('percentageletter', 'grades'),
+                         GRADE_DISPLAY_TYPE_PERCENTAGE_REAL => get_string('percentagereal', 'grades'));
+        asort($options);
+
         $default_gradedisplaytype = $CFG->grade_displaytype;
         foreach ($options as $key=>$option) {
             if ($key == $default_gradedisplaytype) {