Changed grade_item so that its grademax is count(scale_items) and grademin is 1,...

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index ccf797c7065897b6994b6c54cf7ac3346d715d55..6adddb038a57d66c5350e8eb213b9180dc7ab037 100644 (file)
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -749,8 +749,11 @@ class grade_item extends grade_object {
         if (!empty($this->scaleid)) {
             $this->scale = grade_scale::fetch(array('id'=>$this->scaleid));
             $this->scale->load_items();
-            $this->grademax = count($this->scale->scale_items) - 1;
-            $this->grademin = 0;
+
+            // Until scales are uniformly set to min=0 max=count(scaleitems)-1 throughout Moodle, we
+            // stay with the current min=1 max=count(scaleitems)
+            $this->grademax = count($this->scale->scale_items);
+            $this->grademin = 1;
         } else {
             $this->scale = null;
         }

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 586344bab7e571d17192970a4c9aa1e72bdb1318..1854d0cda943b89f17f9e4d576752de4ee04213b 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -576,11 +576,12 @@ function grade_get_legacy_grade_item($modinstance, $grademax, $scaleid) {
         } else if ($scaleid) {
             $grade_item->gradetype = GRADE_TYPE_SCALE;
             $grade_item->scaleid   = $scaleid;
+            $grade_item->grademin  = 1;
 
         } else {
-           $grade_item->gradetype  = GRADE_TYPE_VALUE;
-           $grade_item->grademax   = $grademax;
-           $grade_item->grademin   = 0;
+            $grade_item->gradetype  = GRADE_TYPE_VALUE;
+            $grade_item->grademax   = $grademax;
+            $grade_item->grademin   = 0;
         }
 
         $grade_item->itemname = $modinstance->name;
@@ -606,7 +607,7 @@ function grade_get_legacy_grade_item($modinstance, $grademax, $scaleid) {
     } else if ($scaleid) {
         $params['gradetype'] = GRADE_TYPE_SCALE;
         $params['scaleid']   = $scaleid;
-
+        $grade_item->grademin  = 1; 
     } else {
         $params['gradetype'] = GRADE_TYPE_VALUE;
         $params['grademax']  = $grademax;