MDL-17248 fixed incorrect sum when scales involved

moodle · Apr 27, 2009 · 0ba3cbe · 0ba3cbe
1 parent bd2fb93
commit 0ba3cbe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -3147,6 +3147,11 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101546.03);
     }
 
+    if ($result && $oldversion < 2007101546.04) {
+        // force full regrading - the max grade for sum aggregation was not correct when scales involved
+        set_field('grade_items', 'needsupdate', 1, 'needsupdate', 0);
+    }
+
     return $result;
 }
 

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
@@ -725,7 +725,7 @@ function auto_update_max($items) {
             if ($item->gradetype == GRADE_TYPE_VALUE) {
                 $max += $item->grademax;
             } else if ($item->gradetype == GRADE_TYPE_SCALE) {
-                $max += $item->grademax - 1; // scales min is 1
+                $max += $item->grademax; // 0 = nograde, 1 = first scale item, 2 = second scale item
             }
         }
 

diff --git a/version.php b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101546.03;  // YYYYMMDD      = date of the 1.9 branch (don't change)
+    $version = 2007101546.04;  // YYYYMMDD      = date of the 1.9 branch (don't change)
                             //         X     = release number 1.9.[0,1,2,3,4,5...]
                             //          Y.YY = micro-increments between releases