moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged MDL-11484 Added some colors for overridden grades

Browse source
This commit is contained in:
moodler 2008-03-03 05:57:32 +00:00
parent 61a482fdb4
commit 0036b42fa3
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/assignment/lib.php
View file

@ -1169,7 +1169,11 @@ class assignment_base {
$final_grade = $grading_info->items[0]->grades[$auser->id]; $final_grade = $grading_info->items[0]->grades[$auser->id];
$grademax = $grading_info->items[0]->grademax; $grademax = $grading_info->items[0]->grademax;
$final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2); $final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2);
$locked_overridden = 'locked';
if ($final_grade->overridden) {
$locked_overridden = 'overridden';
}
/// Calculate user status /// Calculate user status
$auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified); $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified);
$picture = print_user_picture($auser, $course->id, $auser->picture, false, true); $picture = print_user_picture($auser, $course->id, $auser->picture, false, true);
@ -1193,7 +1197,7 @@ class assignment_base {
$teachermodified = '<div id="tt'.$auser->id.'">'.userdate($auser->timemarked).'</div>'; $teachermodified = '<div id="tt'.$auser->id.'">'.userdate($auser->timemarked).'</div>';
if ($final_grade->locked or $final_grade->overridden) { if ($final_grade->locked or $final_grade->overridden) {
$grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>'; $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
} else if ($quickgrade) { } else if ($quickgrade) {
$menu = choose_from_menu(make_grades_menu($this->assignment->grade), $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
'menu['.$auser->id.']', $auser->grade, 'menu['.$auser->id.']', $auser->grade,
@ -1206,7 +1210,7 @@ class assignment_base {
} else { } else {
$teachermodified = '<div id="tt'.$auser->id.'">&nbsp;</div>'; $teachermodified = '<div id="tt'.$auser->id.'">&nbsp;</div>';
if ($final_grade->locked or $final_grade->overridden) { if ($final_grade->locked or $final_grade->overridden) {
$grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>'; $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
} else if ($quickgrade) { } else if ($quickgrade) {
$menu = choose_from_menu(make_grades_menu($this->assignment->grade), $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
'menu['.$auser->id.']', $auser->grade, 'menu['.$auser->id.']', $auser->grade,

10
mod/assignment/styles.php
View file

@ -161,16 +161,16 @@
} }
#mod-assignment-submissions .qgprefs #optiontable { #mod-assignment-submissions .qgprefs #optiontable {
text-align:right; text-align:right;
margin-left:auto; margin-left:auto;
} }
#mod-assignment-submissions .fgcontrols { #mod-assignment-submissions .fgcontrols {
margin-top: 1em; margin-top: 1em;
text-align:center; text-align:center;
} }
#mod-assignment-submissions .fgcontrols .fastgbutton{ #mod-assignment-submissions .fgcontrols .fastgbutton{
margin-top: 0.5em; margin-top: 0.5em;
} }

4
theme/standard/styles_color.css
View file

@ -731,6 +731,10 @@ body#grade-index .grades .r1 {
background-color: #f0f0f0; background-color: #f0f0f0;
} }
td.grade div.overridden {
background-color: #DDDDDD;
}
/* grade edit */ /* grade edit */
.grade-edit-tree .moving { .grade-edit-tree .moving {