Re-enabling inherit options for range and average rows in grader report

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 0ea6cf737b87dcf6a0ce12ac9f31e05719d2021e..5a605b95f1cbbbd039a9f996cfca3d3eb8fc7710 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -725,22 +725,14 @@ class grade_report_grader extends grade_report {
                                       .$userid.'_'.$item->id.'" value="' . s($grade->feedback) . '" />';
                     }
 
-                } else {
-                    // Percentage format if specified by user (check each item for a set preference)
+                } else { // Not editing
                     $gradedisplaytype = $item->get_displaytype();
 
                     $percentsign = '';
                     $grademin = $item->grademin;
                     $grademax = $item->grademax;
 
-                    if ($gradedisplaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
-                        if (!is_null($gradeval)) {
-                            $gradeval = grade_to_percentage($gradeval, $grademin, $grademax);
-                        }
-                        $percentsign = '%';
-                    }
-
-                    // If feedback present, surround grade with feedback tooltip
+                    // If feedback present, surround grade with feedback tooltip: Open span here
                     if (!empty($grade->feedback)) {
                         $overlib = '';
                         if ($grade->feedbackformat == 1) {
@@ -755,13 +747,7 @@ class grade_report_grader extends grade_report {
 
                     if ($item->needsupdate) {
                         $studentshtml .= '<span class="gradingerror">'.get_string('error').'</span>';
-
-                    } else if ($gradedisplaytype == GRADE_DISPLAY_TYPE_LETTER) {
-                        if (!is_null($gradeval)) {
-                           $studentshtml .= grade_format_gradevalue($gradeval, $item, false, GRADE_DISPLAY_TYPE_LETTER, null);
-                        }
-                    } else if ($item->scaleid && !empty($scales_array[$item->scaleid])
-                                && $gradedisplaytype == GRADE_DISPLAY_TYPE_REAL) {
+                    } elseif ($item->scaleid && !empty($scales_array[$item->scaleid])) {
                         $scale = $scales_array[$item->scaleid];
                         $scales = explode(",", $scale->scale);
 
@@ -775,9 +761,11 @@ class grade_report_grader extends grade_report {
                         if (is_null($gradeval)) {
                             $studentshtml .= '-';
                         } else {
-                            $studentshtml .=  format_float($gradeval, $decimalpoints). $percentsign;
+                           $studentshtml .= grade_format_gradevalue($gradeval, $item, true, $gradedisplaytype, null);
                         }
                     }
+
+                    // Close feedback span
                     if (!empty($grade->feedback)) {
                         $studentshtml .= '</span>';
                     }

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 461e1d5a3cbea093c6db431c01ad6126917e1b21..049abbcf9fe29cd1ba519c6db5c24590d0bbc216 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -51,11 +51,13 @@ class grader_report_preferences_form extends moodleform {
                                              'showlocks'         => $checkbox_default);
 
             $preferences['prefrows'] = array(
-                        'averagesdisplaytype'    => array(GRADE_DISPLAY_TYPE_DEFAULT => 'default',
+                        'averagesdisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 
                                                           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',
+                        'rangesdisplaytype'      => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
+                                                          GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, 
                                                           GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
                                                           GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
                                                           GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')),