Correction to the Error banded assessment grade.

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 38207e90b2abaa537597895194132ff3f9b27f8f..f93e40afa0f6dfbeabac91130756f36f00009f02 100644 (file)
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@@ -786,7 +786,7 @@
                                if (!$element->id = insert_record("exercise_grades", $element)) {
                                        error("Could not insert exercise element!");
                                }
-                               $grade = ($elements[$form->grade[0]]->maxscore + $form->grade[1]);
+                               $grade = ($elements[$form->grade[0]]->maxscore + $form->grade[1]) * 100 / $exercise->grade;
                                // check the grade for sanity!
                                if ($grade >100.0) {
                                        $grade = 100.0;
@@ -974,7 +974,7 @@
                                if (!$element->id = insert_record("exercise_grades", $element)) {
                                        error("Could not insert exercise element!");
                                }
-                               $grade = ($elements[intval($error + 0.5)]->maxscore + $form->grade[$i]);
+                               $grade = ($elements[intval($error + 0.5)]->maxscore + $form->grade[$i]) * 100 / $exercise->grade;
                                echo "<P><B>".get_string("weightederrorcount", "exercise", intval($error + 0.5))."</B>\n";
                                break;
                        
@@ -997,7 +997,7 @@
                                if (!$element->id = insert_record("exercise_grades", $element)) {
                                        error("Could not insert exercise element!");
                                }
-                               $grade = ($elements[$form->grade[0]]->maxscore + $form->grade[1]);
+                               $grade = ($elements[$form->grade[0]]->maxscore + $form->grade[1]) * 100 / $exercise->grade;
                                break;
 
                        case 4: // rubric grading (identical to accumulative grading)

diff --git a/mod/exercise/locallib.php b/mod/exercise/locallib.php
index 5c33d7b1547df92f6af886de9bcd7618fc0e9576..b7afc9e9b1de0b7e747c28210060865cf9954c90 100644 (file)
--- a/mod/exercise/locallib.php
+++ b/mod/exercise/locallib.php
@@ -1353,7 +1353,7 @@ function exercise_list_ungraded_assessments($exercise, $stype) {
                     }
                 else {
                     $action = "<A HREF=\"assessments.php?action=gradeassessment&id=$cm->id&stype=$stype&aid=$assessment->id\">".
-                        get_string("grade", "exercise")."</A>";
+                        get_string("grade")."</A>";
                     }
                 $submission = get_record("exercise_submissions", "id", $assessment->submissionid);
                 $submissionowner = get_record("user", "id", $submission->userid);