MDL-51715 lib/grade: Zero out aggregationweight for novalue and dropped

set_usedinaggregation was setting aggregationweight to zero in these
cases for non-category grades, but not for category grades.
This commit is contained in:
Colin Campbell
2016-01-19 10:40:05 +00:00
committed by Dan Poltawski
parent 0c6c844cb8
commit 26933d15b0
+12 -10
View File
@@ -838,11 +838,12 @@ class grade_category extends grade_object {
$itemlist['userid'] = $userid;
$DB->set_field_select('grade_grades',
'aggregationstatus',
'novalue',
"itemid $itemsql AND userid = :userid",
$itemlist);
$sql = "UPDATE {grade_grades}
SET aggregationstatus = 'novalue',
aggregationweight = 0
WHERE itemid $itemsql AND userid = :userid";
$DB->execute($sql, $itemlist);
}
// Dropped.
@@ -851,11 +852,12 @@ class grade_category extends grade_object {
$itemlist['userid'] = $userid;
$DB->set_field_select('grade_grades',
'aggregationstatus',
'dropped',
"itemid $itemsql AND userid = :userid",
$itemlist);
$sql = "UPDATE {grade_grades}
SET aggregationstatus = 'dropped',
aggregationweight = 0
WHERE itemid $itemsql AND userid = :userid";
$DB->execute($sql, $itemlist);
}
// Extra credit.