Merge branch 'MDL-48146_27' of git://github.com/timhunt/moodle into M…

…OODLE_27_STABLE
moodle · Nov 18, 2014 · c2aac9f · c2aac9f
2 parents b734d64 + 00102db
commit c2aac9f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
@@ -120,7 +120,12 @@ protected function definition() {
         $this->standard_grading_coursemodule_elements();
 
         $mform->removeElement('grade');
-        $mform->addElement('hidden', 'grade', $quizconfig->maximumgrade);
+        if (property_exists($this->current, 'grade')) {
+            $currentgrade = $this->current->grade;
+        } else {
+            $currentgrade = $quizconfig->maximumgrade;
+        }
+        $mform->addElement('hidden', 'grade', $currentgrade);
         $mform->setType('grade', PARAM_FLOAT);
 
         // Number of attempts.
@@ -487,7 +492,7 @@ public function data_preprocessing(&$toform) {
 
                 if ($feedback->mingrade > 0) {
                     $toform['feedbackboundaries['.$key.']'] =
-                            (100.0 * $feedback->mingrade / $toform['grade']) . '%';
+                            round(100.0 * $feedback->mingrade / $toform['grade'], 6) . '%';
                 }
                 $key++;
             }