gradebook user report fix for total grade

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index e6cbbb3f807e6d5e970a937fb883439aecf51597..bc6db1a9b2725f4db958e3f7cca11e19c9b07ab4 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -15,9 +15,9 @@ if ($data = data_submitted()) {
         }
         // clean
         $postedgrade = clean_param($postedgrade, PARAM_NUMBER);
-    
+
         $gradeinfo = explode("_", $varname);
-    
+
         $grade = new object();
         $grade->userid = $gradeinfo[1];
         $gradeitemid = $gradeinfo[2];
@@ -32,7 +32,6 @@ if ($data = data_submitted()) {
 if (!empty($grades)) {
     foreach ($grades as $gradeitemid => $itemgrades) {
         foreach ($itemgrades as $gradedata) {
-            echo "gradeitemid is $gradeitemid";
             $gradeitem = new grade_item(array('id'=>$gradeitemid), true);
             $gradeitem->update_raw_grade($gradedata->userid, $gradedata->rawgrade);  
         }
@@ -297,7 +296,7 @@ foreach ($tree as $topcat) {
                       . $item['object']->id .'">'. $item['object']->itemname 
                       . '</a>' . $arrow; 
             
-            // Print icons
+            // Print icons            
             $itemhtml .= grade_get_icons($item['object'], $gtree) . '</th>';
             $items[] = $item;
         }

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index 88128c89c057746135d45871d5f9d609b8a023fe..e77584a374689cb7580029510a3cc2ceba1f3506 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -99,9 +99,9 @@ if ($gradetree = new grade_tree($courseid)) {
                 // processing scale grade
                 $scale = get_record('scale', 'id', $gradeitem->scaleid);
                 $scalevals = explode(",", $scale->scale);
-                $percentage = ($grade_grades->finalgrade -1) / count($scalevals);        
-                $gradesum += count($scalevals);
-                $gradetotal += $grade_grades->finalgrade;
+                $percentage = (($grade_grades->finalgrade) / count($scalevals) * 100).'%';      
+                $gradesum += $grade_grades->finalgrade;
+                $gradetotal += count($scalevals);
             } else {
                 // text grade
                 $percentage = '-';  
@@ -118,7 +118,8 @@ if ($gradetree = new grade_tree($courseid)) {
             } else {
                 $data[] = ' ';  
             }
-            $table->add_data($data);  
+
+            $table->add_data($data);
         }
     
         $table->add_data(array('', get_string('total'), $gradesum.'/'.$gradetotal));