mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-02 06:22:59 +02:00
Code Issues Projects Releases Wiki Activity

MDL-47056 core_grades: Prevent items being displayed as 'Error'

Browse Source 
Before this patch we would be marking some items as 'needsupdate'
during an update. Leaving them aside and not effectively updating
them.

Part of: MDL-46576
This commit is contained in:
Frederic Massart 2014-09-16 15:51:12 +08:00 committed by Adrian Greeve
parent 32ee0f83ae
commit fcf6e01517
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/grade/grade_category.php
View File

@ -417,6 +417,16 @@ class grade_category extends grade_object {
$grade_item->force_regrading();
}
/**
* Something that should be called before we start regrading the whole course.
*
* @return void
*/
public function pre_regrade_final_grades() {
$this->auto_update_max();
$this->auto_update_weights();
}
/**
* Generates and saves final grades in associated category grade item.
* These immediate children must already have their own final grades.
@ -458,12 +468,6 @@ class grade_category extends grade_object {
$items = $DB->get_records_sql($sql, $params);
}
// needed mostly for SUM agg type
$this->auto_update_max($items);
// Needed for Natural aggregation type.
$this->auto_update_weights();
$grade_inst = new grade_grade();
$fields = 'g.'.implode(',g.', $grade_inst->required_fields);
@ -930,7 +934,7 @@ class grade_category extends grade_object {
case GRADE_AGGREGATE_SUM: // Add up all the items.
$num = count($grade_values);
$total = $this->grade_item->grademax;
$total = $category_item->grademax;
$sum = 0;
foreach ($grade_values as $itemid => $grade_value) {
$sum += ($grade_value / $items[$itemid]->grademax) * ($items[$itemid]->aggregationcoef2*1) * $total;
@ -977,16 +981,30 @@ class grade_category extends grade_object {
}
/**
* Some aggregation types may automatically update max grade
* Some aggregation types may need to update their max grade.
*
* @param array $items sub items
* @return void
*/
private function auto_update_max($items) {
private function auto_update_max() {
global $DB;
if ($this->aggregation != GRADE_AGGREGATE_SUM) {
// not needed at all
return;
}
// Find grade items of immediate children (category or grade items) and force site settings.
$this->load_grade_item();
$depends_on = $this->grade_item->depends_on();
$items = false;
if (!empty($depends_on)) {
list($usql, $params) = $DB->get_in_or_equal($depends_on);
$sql = "SELECT *
FROM {grade_items}
WHERE id $usql";
$items = $DB->get_records_sql($sql, $params);
}
if (!$items) {
if ($this->grade_item->grademax != 0 or $this->grade_item->gradetype != GRADE_TYPE_VALUE) {
@ -1030,6 +1048,8 @@ class grade_category extends grade_object {
/**
* Recalculate the weights of the grade items in this category.
*
* @return void
*/
private function auto_update_weights() {
if ($this->aggregation != GRADE_AGGREGATE_SUM) {

7
lib/gradelib.php
View File

@ -1044,6 +1044,13 @@ function grade_regrade_final_grades($courseid, $userid=null, $updated_item=null)
}
}
// Categories might have to run some processing before we fetch the grade items.
// This gives them a final opportunity to update and mark their children to be updated.
$cats = grade_category::fetch_all(array('courseid' => $courseid));
foreach ($cats as $cat) {
$cat->pre_regrade_final_grades();
}
$grade_items = grade_item::fetch_all(array('courseid'=>$courseid));
$depends_on = array();