From: rkingdon <rkingdon>
Date: Tue, 17 Aug 2004 23:29:43 +0000 (+0000)
Subject: Correction to the Error banded assessment grade.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=46b64701ab8239c21016d7236e7a3b329c56077f;p=moodle.git

Correction to the Error banded assessment grade.
---

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 38207e90b2..f93e40afa0 100644
--- 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 5c33d7b154..b7afc9e9b1 100644
--- 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);