MDL-13880 Overridden and excluded grades are now coloured with alternate row colours...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 0625854449f66682eff8b40971e4b3846ba65e7f..799d12d47bd4bdff5dec95247e87562e78198825 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -749,11 +749,15 @@ class grade_report_grader extends grade_report {
                 if ($grade->is_overridden()) {
                     $cellclasses .= ' overridden';
                 }
+                
+                if ($grade->is_excluded()) {
+                    $cellclasses .= ' excluded';
+                }
 
                 $studentshtml .= '<td class="'.$cellclasses.'">';
 
                 if ($grade->is_excluded()) {
-                    $studentshtml .= get_string('excluded', 'grades'); // TODO: improve visual representation of excluded grades
+                    $studentshtml .= get_string('excluded', 'grades') . ' ';
                 }
 
                 // Do not show any icons if no grade (no record in DB to match)

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 9c1e7c94c6fed2dd89dbb4ee373fe2ec88ac19e2..3033f23e1ce181b9763d5b1302f5b1419f6e6e37 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -153,7 +153,9 @@ class grader_report_preferences_form extends moodleform {
                     $type = 'select';
                     // MDL-11478
                     // get default aggregationposition from grade_settings
-                    $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
+                    if (!empty($CFG->{$full_pref})) {
+                        $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
+                    }
                     
                     if ($pref == 'aggregationposition') {
                         if (!empty($options[$course_value])) {

diff --git a/grade/report/grader/styles.php b/grade/report/grader/styles.php
index 956bd3f9fc2e803a4b41c60a3bcf8484579ba5a1..14ab278fefa91489c6b4915f5753b7a8e4ae34f5 100644 (file)
--- a/grade/report/grader/styles.php
+++ b/grade/report/grader/styles.php
@@ -21,7 +21,7 @@
 }
 
 .grade-report-grader table#user-grades td.overridden {
-  background-color: #dddddd;
+  background-color: #EFD9B3;
 }
 
 .grade-report-grader table#user-grades tr.avg td.cell {
@@ -32,6 +32,22 @@
     background-color: #efefef;
 }
 
+.grade-report-grader table#user-grades tr.even td.overridden {
+  background-color: #F3E4C0; 
+}
+
+.grade-report-grader table#user-grades tr.odd td.overridden {
+  background-color: #EFD9A4;
+}
+
+.grade-report-grader table#user-grades tr.even td.excluded {
+  background-color: #EABFFF; 
+}
+
+.grade-report-grader table#user-grades tr.odd td.excluded {
+  background-color: #E5AFFF;
+}
+
 .grade-report-grader table#user-grades tr.odd th.header { 
     background-color: #efefef;
     background-image: none;