MDL-43071 assign: Fix offline grades import for scale grading.

moodle · Nov 26, 2013 · 3bc1bd6 · 3bc1bd6
1 parent 20776b4
commit 3bc1bd6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/mod/assign/feedback/offline/importgradesform.php b/mod/assign/feedback/offline/importgradesform.php
@@ -67,9 +67,8 @@ public function definition() {
 
         $scaleoptions = null;
         if ($assignment->get_instance()->grade < 0) {
-            $scale = $DB->get_record('scale', array('id'=>-($assignment->get_instance()->grade)));
-            if ($scale) {
-                $scaleoptions = explode(',', $scale->scale);
+            if ($scale = $DB->get_record('scale', array('id'=>-($assignment->get_instance()->grade)))) {
+                $scaleoptions = make_menu_from_list($scale->scale);
             }
         }
         if (!$gradeimporter->init()) {
@@ -104,7 +103,7 @@ public function definition() {
                 // This is a scale - we need to convert any grades to indexes in the scale.
                 $scaleindex = array_search($grade, $scaleoptions);
                 if ($scaleindex !== false) {
-                    $grade = $scaleindex + 1;
+                    $grade = $scaleindex;
                 } else {
                     $grade = '';
                 }
@@ -132,8 +131,13 @@ public function definition() {
 
             if (!$skip) {
                 $update = true;
+                if (!empty($scaleoptions)) {
+                    $formattedgrade = $scaleoptions[$grade];
+                } else {
+                    $formattedgrade = format_float($grade, 2);
+                }
                 $updates[] = get_string('gradeupdate', 'assignfeedback_offline',
-                                            array('grade'=>format_float($grade, 2), 'student'=>$userdesc));
+                                            array('grade'=>$formattedgrade, 'student'=>$userdesc));
             }
 
             if ($ignoremodified || !$stalemodificationdate) {

diff --git a/mod/assign/feedback/offline/locallib.php b/mod/assign/feedback/offline/locallib.php
@@ -107,9 +107,8 @@ public function process_import_grades($draftid, $importid, $ignoremodified) {
         // Does this assignment use a scale?
         $scaleoptions = null;
         if ($this->assignment->get_instance()->grade < 0) {
-            $scale = $DB->get_record('scale', array('id'=>-($this->assignment->get_instance()->grade)));
-            if ($scale) {
-                $scaleoptions = explode(',', $scale->scale);
+            if ($scale = $DB->get_record('scale', array('id'=>-($this->assignment->get_instance()->grade)))) {
+                $scaleoptions = make_menu_from_list($scale->scale);
             }
         }
         // We may need to upgrade the gradebook comments after this update.
@@ -127,7 +126,7 @@ public function process_import_grades($draftid, $importid, $ignoremodified) {
                 // This is a scale - we need to convert any grades to indexes in the scale.
                 $scaleindex = array_search($record->grade, $scaleoptions);
                 if ($scaleindex !== false) {
-                    $record->grade = $scaleindex + 1;
+                    $record->grade = $scaleindex;
                 } else {
                     $record->grade = '';
                 }