mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 12:40:01 +01:00
MDL-13880 Overridden and excluded grades are now coloured with alternate row colours that override the default alternate row colours (gray). I also fixed the long-standing notice about aggregationposition. See attached patch.
This commit is contained in:
parent
b1a284b8c9
commit
5ebce7bb5c
@ -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)
|
||||
|
@ -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])) {
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user