MDL-10481

Two new preferences: averagesdecimalpoints and rangesdecimalpoints
Two new constants: GRADE_REPORT_PREFERENCE_INHERIT and GRADE_REPORT_PREFERENCE_DEFAULT with string values
removed GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT in favour of the above
Added a number of language strings.

diff --git a/grade/edit/item_form.php b/grade/edit/item_form.php
index 241c637ce6da9ab1639d33f6b27ad94bd407cde9..0d032152a0222b86bf9cff97ac33b6094d084d51 100644 (file)
--- a/grade/edit/item_form.php
+++ b/grade/edit/item_form.php
@@ -76,18 +76,18 @@ class edit_item_form extends moodleform {
         $mform->addElement('header', 'general', get_string('userpreferences', 'grades'));
 
         $mform->addElement('select', 'pref_gradedisplaytype', get_string('gradedisplaytype', 'grades'),
-                    array('default' => get_string('default', '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_PERCENTAGE => get_string('percentage', 'grades')));
         $mform->setHelpButton('pref_gradedisplaytype', array(false, get_string('gradedisplaytype', 'grades'),
                               false, true, false, get_string("config_gradedisplaytype", 'grades')));
-        $mform->setDefault('pref_gradedisplaytype', 'default');
+        $mform->setDefault('pref_gradedisplaytype', GRADE_REPORT_PREFERENCE_DEFAULT);
 
         $mform->addElement('select', 'pref_decimalpoints', get_string('decimalpoints', 'grades'),
-                    array('default' => get_string('default', 'grades'), 0, 1, 2, 3, 4, 5));
+                    array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default', 'grades'), 0, 1, 2, 3, 4, 5));
         $mform->setHelpButton('pref_decimalpoints', array(false, get_string('decimalpoints', 'grades'),
                               false, true, false, get_string("config_decimalpoints", 'grades')));
-        $mform->setDefault('pref_decimalpoints', 'default');
+        $mform->setDefault('pref_decimalpoints', GRADE_REPORT_PREFERENCE_DEFAULT);
 
 /// hidden params
         $mform->addElement('hidden', 'id', 0);

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index cbde3e90ea0953d13ca37ba26950ab1fc6a4d329..1b184bce50644514435ebd44ade409cc3ed6cace 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -589,6 +589,8 @@ class grade_report_grader extends grade_report {
             $studentshtml .= '<tr><th class="user"><a href="' . $CFG->wwwroot . '/user/view.php?id='
                           . $user->id . '">' . fullname($user) . '</a></th>';
             foreach ($this->items as $item) {
+                // Get the decimal points preference for this item
+                $decimalpoints = $this->get_pref('decimalpoints', $item->id);
 
                 if (isset($this->finalgrades[$userid][$item->id])) {
                     $gradeval = $this->finalgrades[$userid][$item->id]->finalgrade;
@@ -660,9 +662,9 @@ class grade_report_grader extends grade_report {
                     } else if ($item->gradetype != GRADE_TYPE_TEXT) { // Value type
                         if ($this->get_pref('quickgrading') and $grade->is_editable()) {
                             $studentshtml .= '<input size="6" tabindex="' . $gradetabindex++ . '" type="text" name="grade_'.$userid.'_'
-                                          .$item->id.'" value="'.$this->get_grade_clean($gradeval).'"/>';
+                                          .$item->id.'" value="'.$this->get_grade_clean($gradeval, $decimalpoints).'"/>';
                         } else {
-                            $studentshtml .= $this->get_grade_clean($gradeval);
+                            $studentshtml .= $this->get_grade_clean($gradeval, $decimalpoints);
                         }
                     }
 
@@ -679,6 +681,7 @@ class grade_report_grader extends grade_report {
                 } else {
                     // Percentage format if specified by user (check each item for a set preference)
                     $gradedisplaytype = $this->get_pref('gradedisplaytype', $item->id);
+
                     $percentsign = '';
 
                     if ($gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
@@ -720,7 +723,7 @@ class grade_report_grader extends grade_report {
                         if (is_null($gradeval)) {
                             $studentshtml .= '-';
                         } else {
-                            $studentshtml .=  $this->get_grade_clean($gradeval). $percentsign;
+                            $studentshtml .=  $this->get_grade_clean($gradeval, $decimalpoints). $percentsign;
                         }
                     }
                     if (!empty($grade->feedback)) {
@@ -776,11 +779,12 @@ class grade_report_grader extends grade_report {
 
             $groupavghtml = '<tr><th>'.get_string('groupavg', 'grades').'</th>';
             foreach ($this->items as $item) {
+                $decimalpoints = $this->get_pref('decimalpoints', $item->id);
                 // 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;
-                } elseif ($averagesdisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT) { // Inherit specific column or general preference
+                } elseif ($averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // Inherit specific column or general preference
                     $displaytype = $gradedisplaytype;
                 } else { // General preference overrides specific column display type
                     $displaytype = $averagesdisplaytype;
@@ -795,7 +799,7 @@ class grade_report_grader extends grade_report {
                         $gradeitemsum = $groupsum[$item->id];
                         $gradeitemavg = $gradeitemsum/$groupscount[$item->id];
 
-                        $scaleval = round($this->get_grade_clean($gradeitemavg));
+                        $scaleval = round($this->get_grade_clean($gradeitemavg, $decimalpoints));
 
                         $scales_array = get_records_list('scale', 'id', $item->scaleid);
                         $scale = $scales_array[$item->scaleid];
@@ -809,14 +813,14 @@ class grade_report_grader extends grade_report {
                         $gradehtml = $scales[$scaleval-1];
                         $rawvalue = $scaleval;
                     } else {
-                        $gradeval = $this->get_grade_clean($sum/$groupscount[$item->id]);
-                        $gradehtml = round($gradeval, $this->get_pref('decimalpoints', $item->id));
+                        $gradeval = $this->get_grade_clean($sum/$groupscount[$item->id], $decimalpoints);
+                        $gradehtml = round($gradeval, $decimalpoints);
                         $rawvalue = $gradeval;
                     }
 
                     if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
                         $gradeval = grade_grades::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
-                        $gradehtml = round($gradeval, $this->get_pref('decimalpoints', $item->id)) . '%';
+                        $gradehtml = round($gradeval, $decimalpoints) . '%';
                     }
                     $groupavghtml .= '<td>'.$gradehtml.'</td>';
                 }
@@ -860,11 +864,12 @@ class grade_report_grader extends grade_report {
 
             $gradeavghtml = '<tr><th>'.get_string('average', 'grades').'</th>';
             foreach ($this->items as $item) {
+                $decimalpoints = $this->get_pref('decimalpoints', $item->id);
                 // 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;
-                } elseif ($averagesdisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT) { // Inherit specific column or general preference
+                } elseif ($averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // Inherit specific column or general preference
                     $displaytype = $gradedisplaytype;
                 } else { // General preference overrides specific column display type
                     $displaytype = $averagesdisplaytype;
@@ -876,7 +881,7 @@ class grade_report_grader extends grade_report {
                     $sum = $classsum[$item->id];
 
                     if ($item->scaleid) {
-                        $scaleval = round($this->get_grade_clean($sum/$classcount[$itemid]));
+                        $scaleval = round($this->get_grade_clean($sum/$classcount[$itemid], $decimalpoints));
                         $scales_array = get_records_list('scale', 'id', $item->scaleid);
                         $scale = $scales_array[$item->scaleid];
                         $scales = explode(",", $scale->scale);
@@ -889,15 +894,15 @@ class grade_report_grader extends grade_report {
                         $gradehtml = $scales[$scaleval-1];
                         $rawvalue = $scaleval;
                     } else {
-                        $gradeval = $this->get_grade_clean($sum/$classcount[$itemid]);
+                        $gradeval = $this->get_grade_clean($sum/$classcount[$itemid], $decimalpoints);
 
-                        $gradehtml = round($gradeval, $this->get_pref('decimalpoints', $item->id));
+                        $gradehtml = round($gradeval, $decimalpoints);
                         $rawvalue = $gradeval;
                     }
 
                     if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
                         $gradeval = grade_grades::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
-                        $gradehtml = round($gradeval, $this->get_pref('decimalpoints', $item->id)) . '%';
+                        $gradehtml = round($gradeval, $decimalpoints) . '%';
                     }
 
                     $gradeavghtml .= '<td>'.$gradehtml.'</td>';
@@ -920,19 +925,20 @@ class grade_report_grader extends grade_report {
             $rangesdisplaytype = $this->get_pref('rangesdisplaytype');
             $scalehtml = '<tr><th class="range">'.$this->get_lang_string('range','grades').'</th>';
             foreach ($this->items as $item) {
+                $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;
-                } elseif ($rangesdisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT) { // Inherit specific column or general preference
+                } 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) {
-                    $grademin = $this->get_grade_clean($item->grademin);
-                    $grademax = $this->get_grade_clean($item->grademax);
+                    $grademin = $this->get_grade_clean($item->grademin, $decimalpoints);
+                    $grademax = $this->get_grade_clean($item->grademax, $decimalpoints);
                 } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
                     $grademin = 0;
                     $grademax = 100;

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index cd4d7d80532335ca3a73ef241ee5353d473c7fad..c57bc3561843f0ea55ed8dfe9aad0ef0d22e73b3 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -38,12 +38,16 @@ class grader_report_preferences_form extends moodleform {
                                                                GRADE_REPORT_AGGREGATION_VIEW_COMPACT => get_string('compact', 'grades')),
                              'gradedisplaytype'       => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
                                                                GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades')),
-                             'averagesdisplaytype'    => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT => get_string('inherit', '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_PERCENTAGE => get_string('percentage', 'grades')),
-                             'rangesdisplaytype'      => array(GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT => get_string('inherit', '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_PERCENTAGE => get_string('percentage', 'grades')),
+                             'averagesdecimalpoints'  => array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
+                                                               0, 1, 2, 3, 4, 5),
+                             'rangesdecimalpoints'    => array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
+                                                               0, 1, 2, 3, 4, 5),
                              'decimalpoints'          => array(0, 1, 2, 3, 4, 5),
                              'studentsperpage'        => 'text');
 
@@ -60,7 +64,7 @@ class grader_report_preferences_form extends moodleform {
             $mform->addElement($type, $full_pref, get_string($pref, 'grades'), $options);
             $mform->setHelpButton($full_pref, array(false, get_string($pref, 'grades'), false, true, false, get_string("config_$pref", 'grades')));
             $mform->setDefault($full_pref, $pref_value);
-            $mform->setType($full_pref, PARAM_INT);
+            $mform->setType($full_pref, PARAM_ALPHANUM);
         }
 
         $mform->addElement('hidden', 'id');

diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index ccffb9e6ca4e601118caf990e3359aa7933c765a..c46b47eba0964a4476d79a6171bf66e151763dee 100644 (file)
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -25,13 +25,13 @@ $settings->add(new admin_setting_configselect('grade_report_gradedisplaytype', g
 
 $settings->add(new admin_setting_configselect('grade_report_rangesdisplaytype', get_string('rangesdisplaytype', 'grades'),
                                           get_string('configrangesdisplaytype', 'grades'), false,
-                                          array(GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT => get_string('inherit', 'grades'),
+                                          array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
                                                 GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', '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_GRADE_DISPLAY_TYPE_INHERIT => get_string('inherit', 'grades'),
+                                          array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
                                                 GRADE_REPORT_GRADE_DISPLAY_TYPE_RAW => get_string('raw', 'grades'),
                                                 GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'))));
 
@@ -78,5 +78,24 @@ $settings->add(new admin_setting_configselect('grade_report_decimalpoints', get_
                                                  '3' => '3',
                                                  '4' => '4',
                                                  '5' => '5')));
+$settings->add(new admin_setting_configselect('grade_report_averagesdecimalpoints', get_string('averagesdecimalpoints', 'grades'),
+                                          get_string('configaveragesdecimalpoints', 'grades'), 2,
+                                          array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
+                                                 '0' => '0',
+                                                 '1' => '1',
+                                                 '2' => '2',
+                                                 '3' => '3',
+                                                 '4' => '4',
+                                                 '5' => '5')));
+$settings->add(new admin_setting_configselect('grade_report_rangesdecimalpoints', get_string('rangesdecimalpoints', 'grades'),
+                                          get_string('configrangesdecimalpoints', 'grades'), 2,
+                                          array(GRADE_REPORT_PREFERENCE_INHERIT => get_string('inherit', 'grades'),
+                                                 '0' => '0',
+                                                 '1' => '1',
+                                                 '2' => '2',
+                                                 '3' => '3',
+                                                 '4' => '4',
+                                                 '5' => '5')));
+
 
 ?>

diff --git a/grade/report/lib.php b/grade/report/lib.php
index 0370ebe66915ecec63a6157be9aa56108eb3f40c..b7bcb5327aee39afd65a02b940dc8c668ad81098 100755 (executable)
--- a/grade/report/lib.php
+++ b/grade/report/lib.php
@@ -35,9 +35,9 @@ class grade_report {
 
     /**
      * User preferences related to this report.
-     * @var array $user_prefs
+     * @var array $prefs
      */
-    var $user_prefs = array();
+    var $prefs = array();
 
     /**
      * The roles for this report.
@@ -105,25 +105,34 @@ class grade_report {
         global $CFG;
         $fullprefname = 'grade_report_' . $pref;
 
+        $retval = null;
+
         if (!isset($this)) {
             if (!empty($itemid)) {
-                $value = get_user_preferences($fullprefname . $itemid, grade_report::get_pref($pref));
+                $retval = get_user_preferences($fullprefname . $itemid, grade_report::get_pref($pref));
             } else {
-                $value = get_user_preferences($fullprefname, $CFG->$fullprefname);
+                $retval = get_user_preferences($fullprefname, $CFG->$fullprefname);
             }
-            return $value;
-
         } else {
-            if (empty($this->user_prefs[$pref.$itemid])) {
+            if (empty($this->prefs[$pref.$itemid])) {
+
                 if (!empty($itemid)) {
-                    $value = get_user_preferences($fullprefname . $itemid, $this->get_pref($pref));
+                    $retval = get_user_preferences($fullprefname . $itemid);
+                    if (empty($retval)) {
+                        // No item pref found, we are returning the global preference
+                        $retval = $this->get_pref($pref);
+                        $itemid = null;
+                    }
                 } else {
-                    $value = get_user_preferences($fullprefname, $CFG->$fullprefname);
+                    $retval = get_user_preferences($fullprefname, $CFG->$fullprefname);
                 }
-                $this->user_prefs[$pref.$itemid] = $value;
+                $this->prefs[$pref.$itemid] = $retval;
+            } else {
+                $retval = $this->prefs[$pref.$itemid];
             }
-            return $this->user_prefs[$pref.$itemid];
         }
+
+        return $retval;
     }
 
     /**
@@ -215,17 +224,20 @@ class grade_report {
      * the result is suitable for printing on html page
      * @static
      * @param float $gradeval raw grade value pulled from db
+     * @param int $decimalpoints Optional integers to override global decimalpoints preference
      * @return string $gradeval formatted grade value
      */
-    function get_grade_clean($gradeval) {
+    function get_grade_clean($gradeval, $decimalpoints=null) {
         global $CFG;
 
         if (is_null($gradeval)) {
             $gradeval = '';
         } else {
             // decimal points as specified by user
-            $decimals = $this->get_pref('decimalpoints');
-            $gradeval = number_format($gradeval, $decimals, $this->get_lang_string('decpoint', 'langconfig'),
+            if (empty($decimalpoints)) {
+                $decimalpoints = $this->get_pref('decimalpoints');
+            }
+            $gradeval = number_format($gradeval, $decimalpoints, $this->get_lang_string('decpoint', 'langconfig'),
                                       $this->get_lang_string('thousandsep', 'langconfig'));
         }
 

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 29b53ab9541e8659ee1f811f115231288d20ade9..10e89a061414603895f246df29f4431c0907d9fd 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -14,6 +14,7 @@ $string['allgrades'] = 'All grades by category';
 $string['allstudents'] = 'All Students';
 $string['autosort'] = 'Auto-sort';
 $string['average'] = 'Average';
+$string['averagesdecimalpoints'] = 'Decimals in column averages';
 $string['averagesdisplaytype'] = 'Column averages display type';
 $string['badgrade'] = 'Supplied grade is invalid';
 $string['baduser'] = 'Supplied user is invalid';
@@ -32,6 +33,7 @@ $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['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['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.';
@@ -40,6 +42,7 @@ $string['configgradedisplaytype'] = 'Grades can be shown as raw grades or as per
 $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['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).';
@@ -55,7 +58,8 @@ $string['createcategory'] = 'Create Category';
 $string['createcategoryerror'] = 'Could not create a new category';
 $string['creatinggradebooksettings'] = 'Creating Gradebook settings';
 $string['curveto'] = 'Curve To';
-$string['decimalpoints'] = 'Decimal points';
+$string['decimalpoints'] = 'Overall decimal points';
+$string['default'] = 'Default';
 $string['deletecategory'] = 'Delete Category';
 $string['displaylettergrade'] = 'Display Letter Grades';
 $string['displaypercent'] = 'Display Percents';
@@ -66,6 +70,7 @@ $string['dropxlowest'] = 'Drop X Lowest';
 $string['dropxlowestwarning'] = 'Note: If you use drop x lowest the grading assumes that all items in the category have the same point value. If point values differ results will be unpredictable';
 $string['editcalculation'] = 'Edit calculation';
 $string['editfeedback'] = 'Edit Feedback';
+$string['edittree'] = 'Categories';
 $string['enableajax'] = 'Enable AJAX';
 $string['encoding'] = 'Encoding';
 $string['errorgradevaluenonnumeric'] = 'Received non-numeric for low or high grade for';
@@ -76,6 +81,7 @@ $string['exceptions'] = 'Exceptions';
 $string['excluded'] = 'Excluded';
 $string['expand'] = 'Expand Category';
 $string['exportods'] = 'Export ODS';
+$string['exportplugins'] = 'Export plugins';
 $string['exporttxt'] = 'Export TXT';
 $string['exportxml'] = 'Export XML';
 $string['extracredit'] = 'Extra Credit';
@@ -110,6 +116,7 @@ $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br
 $string['grademax'] = 'Maximum grade';
 $string['grademin'] = 'Minimum grade';
 $string['gradepass'] = 'Grade to pass';
+$string['importplugins'] = 'Import plugins';
 $string['itemsedit'] = 'Edit grade item';
 $string['multfactor'] = 'Multiplicator';
 $string['plusfactor'] = 'Offset';
@@ -195,16 +202,19 @@ $string['preferences'] = 'Preferences';
 $string['quickfeedback'] = 'Quick Feedback';
 $string['quickgrading'] = 'Quick Grading';
 $string['range'] = 'Range';
+$string['rangesdecimalpoints'] = 'Decimals shown in ranges';
 $string['rangesdisplaytype'] = 'Range display type';
 $string['rank'] = 'Rank';
 $string['raw'] = 'Raw';
 $string['rawpct'] = 'Raw %%';
+$string['reportplugins'] = 'Report plugins';
 $string['reprintheaders'] = 'Reprint Headers';
 $string['right'] = 'Right';
 $string['savechanges'] = 'Save Changes';
 $string['savepreferences'] = 'Save Preferences';
 $string['scaledpct'] = 'Scaled %%';
 $string['selectdestination'] = 'Select destination of $a';
+$string['selectplugin'] = 'Select a plugin';
 $string['septab'] = 'Tab';
 $string['sepcomma'] = 'Comma';
 $string['separator'] = 'Separator';
@@ -254,6 +264,7 @@ $string['useadvanced'] = 'Use Advanced Features';
 $string['usenooutcome'] = 'Use no outcome';
 $string['usenoscale'] = 'Use no scale';
 $string['usepercent'] = 'Use Percent';
+$string['userpreferences'] = 'User preferences';
 $string['userreport'] = 'User grade report';
 $string['useweighted'] = 'Use Weighted';
 $string['viewbygroup'] = 'Group';

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 6707eefa3487aef5db6579ace509f33c9415ae5a..67c0d978301ec6362722756ca31a5389bd262ce5 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -75,7 +75,8 @@ 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_PERCENTAGE', 1);
-define('GRADE_REPORT_GRADE_DISPLAY_TYPE_INHERIT', 2); // Inherit the value set for a particular grade_item (grade_report_gradedisplaytype{$itemid})
+define('GRADE_REPORT_PREFERENCE_DEFAULT', 'default');
+define('GRADE_REPORT_PREFERENCE_INHERIT', 'inherit');
 
 require_once($CFG->libdir . '/grade/grade_category.php');
 require_once($CFG->libdir . '/grade/grade_item.php');

diff --git a/version.php b/version.php
index 8a8dd7beb4fc9c33ce0486623e3c30d743f0ee45..d1451587678551217bac63dcbf0eb86d8abad0be 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 = 2007071701;  // YYYYMMDD = date
+    $version = 2007071702;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '1.9 dev';   // Human-friendly version name