MDL-11484 Changed the display of overridden and locked grades. Merging from MOODLE_19...

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 2389b2ad3f4a296f1a98b04e164db805052502fa..e4b7fb55f19277fffb29e95cbe71822791f977d8 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1167,6 +1167,9 @@ class assignment_base {
             $grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, array_keys($ausers));
             foreach ($ausers as $auser) {
                 $final_grade = $grading_info->items[0]->grades[$auser->id];
+                $grademax = $grading_info->items[0]->grademax;
+                $final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2);
+                
             /// Calculate user status
                 $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified);
                 $picture = print_user_picture($auser, $course->id, $auser->picture, false, true);
@@ -1190,7 +1193,7 @@ class assignment_base {
                         $teachermodified = '<div id="tt'.$auser->id.'">'.userdate($auser->timemarked).'</div>';
 
                         if ($final_grade->locked or $final_grade->overridden) {
-                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->str_grade.'</div>';
+                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>';
                         } else if ($quickgrade) {
                             $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
                                                      'menu['.$auser->id.']', $auser->grade,
@@ -1203,7 +1206,7 @@ class assignment_base {
                     } else {
                         $teachermodified = '<div id="tt'.$auser->id.'">&nbsp;</div>';
                         if ($final_grade->locked or $final_grade->overridden) {
-                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->str_grade.'</div>';
+                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>';
                         } else if ($quickgrade) {
                             $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
                                                      'menu['.$auser->id.']', $auser->grade,
@@ -1230,7 +1233,7 @@ class assignment_base {
                     $status          = '<div id="st'.$auser->id.'">&nbsp;</div>';
 
                     if ($final_grade->locked or $final_grade->overridden) {
-                        $grade = '<div id="g'.$auser->id.'">'.$final_grade->str_grade.'</div>';
+                        $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade . '</div>';
                     } else if ($quickgrade) {   // allow editing
                         $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
                                                  'menu['.$auser->id.']', $auser->grade,