Cleaned up a bit

diff --git a/course/grade.php b/course/grade.php
index c7a9d03d248abb3744430ce91368fb9e7a4383b0..26274c221ff1ba08b42ebf7a650543c7b6a7fc12 100644 (file)
--- a/course/grade.php
+++ b/course/grade.php
@@ -25,6 +25,7 @@
     $grades = array();      // Collect all grades in this array
     $maxgrades = array();   // Collect all max grades in this array
     $totalgrade = 0;
+    $totalmaxgrade = 0;
 
 
 /// Collect modules data
@@ -55,15 +56,21 @@
                                 $columnhtml[] = "$image ".
                                              "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
                                              "$instance->name".
-                                             "</A>$maxgrade";
+                                             "</A>";
     
-                                $grades[]  = $modgrades->grades[$USER->id]; // may be empty, that's ok
-
-                                $maxgrades[] = $modgrades->maxgrade;
-
-                                if (!empty($modgrades->maxgrade)) {
+                                if (empty($modgrades->grades[$USER->id])) {
+                                    $grades[]  = "";
+                                } else {
+                                    $grades[]  = $modgrades->grades[$USER->id];
                                     $totalgrade += (float)$modgrades->grades[$USER->id];
                                 }
+
+                                if (empty($modgrades->maxgrade)) {
+                                    $maxgrades[] = "";
+                                } else {
+                                    $maxgrades[]    = $modgrades->maxgrade;
+                                    $totalmaxgrade += $modgrades->maxgrade;
+                                }
                             }
                         }
                     }
@@ -88,7 +95,7 @@
         $table->data[] = array($columnhtml[$key], $maxgrades[$key], $grade);
     }
 
-    $table->data[] = array("", get_string("total"), $totalgrade);
+    $table->data[] = array(get_string("total"), $totalmaxgrade, $totalgrade);
 
     print_table($table);