moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-47911-master' of git://github.com/damyon/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-03-02 11:06:18 +00:00
commit a8c56d1c26
1 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

53
lib/grade/grade_category.php
View file

@ -767,6 +767,8 @@ class grade_category extends grade_object {
* Set the flags on the grade_grade items to indicate how individual grades are used * Set the flags on the grade_grade items to indicate how individual grades are used
* in the aggregation. * in the aggregation.
* *
* WARNING: This function is called a lot during gradebook recalculation, be very performance considerate.
*
* @param int $userid The user we have aggregated the grades for. * @param int $userid The user we have aggregated the grades for.
* @param array $usedweights An array with keys for each of the grade_item columns included in the aggregation. The value are the relative weight. * @param array $usedweights An array with keys for each of the grade_item columns included in the aggregation. The value are the relative weight.
* @param array $novalue An array with keys for each of the grade_item columns skipped because * @param array $novalue An array with keys for each of the grade_item columns skipped because
@ -779,44 +781,32 @@ class grade_category extends grade_object {
private function set_usedinaggregation($userid, $usedweights, $novalue, $dropped, $extracredit) { private function set_usedinaggregation($userid, $usedweights, $novalue, $dropped, $extracredit) {
global $DB; global $DB;
// First set them all to weight null and status = 'unknown'. // Reset aggregation to unknown and 0 for all grade items for this user and category.
if ($allitems = grade_item::fetch_all(array('categoryid'=>$this->id))) { $params = array('categoryid' => $this->id, 'userid' => $userid);
list($itemsql, $itemlist) = $DB->get_in_or_equal(array_keys($allitems), SQL_PARAMS_NAMED, 'g'); $itemssql = "SELECT id
FROM {grade_items}
WHERE categoryid = :categoryid";
$itemlist['userid'] = $userid; $sql = "UPDATE {grade_grades}
SET aggregationstatus = 'unknown',
aggregationweight = 0
WHERE userid = :userid
AND itemid IN ($itemssql)";
$DB->set_field_select('grade_grades', $DB->execute($sql, $params);
'aggregationstatus',
'unknown',
"itemid $itemsql AND userid = :userid",
$itemlist);
$DB->set_field_select('grade_grades',
'aggregationweight',
0,
"itemid $itemsql AND userid = :userid",
$itemlist);
}
// Included. // Included with weights.
if (!empty($usedweights)) { if (!empty($usedweights)) {
// The usedweights items are updated individually to record the weights. // The usedweights items are updated individually to record the weights.
foreach ($usedweights as $gradeitemid => $contribution) { foreach ($usedweights as $gradeitemid => $contribution) {
$DB->set_field_select('grade_grades', $sql = "UPDATE {grade_grades}
'aggregationweight', SET aggregationstatus = 'used',
$contribution, aggregationweight = :contribution
"itemid = :itemid AND userid = :userid", WHERE itemid = :itemid AND userid = :userid";
array('itemid'=>$gradeitemid, 'userid'=>$userid));
$params = array('contribution' => $contribution, 'itemid' => $gradeitemid, 'userid' => $userid);
$DB->execute($sql, $params);
} }
// Now set the status flag for all these weights.
list($itemsql, $itemlist) = $DB->get_in_or_equal(array_keys($usedweights), SQL_PARAMS_NAMED, 'g');
$itemlist['userid'] = $userid;
$DB->set_field_select('grade_grades',
'aggregationstatus',
'used',
"itemid $itemsql AND userid = :userid",
$itemlist);
} }
// No value. // No value.
@ -844,6 +834,7 @@ class grade_category extends grade_object {
"itemid $itemsql AND userid = :userid", "itemid $itemsql AND userid = :userid",
$itemlist); $itemlist);
} }
// Extra credit. // Extra credit.
if (!empty($extracredit)) { if (!empty($extracredit)) {
list($itemsql, $itemlist) = $DB->get_in_or_equal(array_keys($extracredit), SQL_PARAMS_NAMED, 'g'); list($itemsql, $itemlist) = $DB->get_in_or_equal(array_keys($extracredit), SQL_PARAMS_NAMED, 'g');