L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-47275 Grades: Sum of grades bug in max grade with extra credit

Browse Source 
Sum of grades is not calculating max grade with extra credit for students
This commit is contained in:
Damyon Wiese
2014-11-03 16:56:48 +08:00
committed by Marina Glancy
parent 8bf49b7377
commit 1dd7fab104
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/tests/behat/grade_aggregation.feature
+5 -2
View File
@@ -299,8 +299,11 @@ Feature: We can use calculated grade totals
And I follow "Edit Course 1"
And I set the field "Aggregation" to "Sum of grades"
And I press "Save changes"
And I click on "Edit assign Test assignment nine" "link"
And I set the field "Extra credit" to "1"
And I press "Save changes"
And I turn editing mode off
Then I should see "150.00 (18.99 %)" in the ".course" "css_element"
Then I should see "150.00 (19.23 %)" in the ".course" "css_element"
And I follow "Course grade settings"
And I set the field "Hide totals if they contain hidden items" to "Show totals excluding hidden items"
And I press "Save changes"
@@ -309,4 +312,4 @@ Feature: We can use calculated grade totals
And I follow "Course 1"
And I follow "Grades"
And I set the field "Grade report" to "Overview report"
And I should see "110.00 (16.92 %)" in the "overview-grade" "table"
And I should see "110.00 (17.19 %)" in the "overview-grade" "table"
lib/grade/grade_category.php
+4 -2
View File
@@ -772,8 +772,10 @@ class grade_category extends grade_object {
$sum = 0;
foreach ($grade_values as $itemid => $grade_value) {
$sum += $grade_value * ($items[$itemid]->grademax - $items[$itemid]->grademin);
$grademin += $items[$itemid]->grademin;
$grademax += $items[$itemid]->grademax;
if ($items[$itemid]->aggregationcoef == 0) {
$grademin += $items[$itemid]->grademin;
$grademax += $items[$itemid]->grademax;
}
}
$agg_grade = $sum / ($grademax - $grademin);