mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-47110 Grades: Change how updated weights notifications are detected.

Browse Source 
Part of: MDL-46576
This commit is contained in:
Damyon Wiese 2014-10-02 22:18:59 +08:00 committed by Adrian Greeve
parent f70da024c8
commit e61f25a4f8
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
grade/edit/tree/index.php
View File

@ -68,8 +68,18 @@ if (!is_null($category) && !is_null($aggregationtype) && confirm_sesskey()) {
}
//first make sure we have proper final grades - we need it for locking changes
$normalisationmessage = null;
$originalweights = grade_helper::fetch_all_natural_weights_for_course($courseid);
grade_regrade_final_grades($courseid);
$alteredweights = grade_helper::fetch_all_natural_weights_for_course($courseid);
if (array_diff($originalweights, $alteredweights)) {
$normalisationmessage = get_string('weightsadjusted', 'grades');
}
// get the grading tree object
// note: total must be first for moving to work correctly, if you want it last moving code must be rewritten!
$gtree = new grade_tree($courseid, false, false);
@ -170,8 +180,6 @@ switch ($action) {
//Ideally we could do the updates through $grade_edit_tree to avoid recreating it
$recreatetree = false;
$normalisationmessage = null;
if ($data = data_submitted() and confirm_sesskey()) {
// Perform bulk actions first
if (!empty($data->bulkmove)) {
@ -226,21 +234,13 @@ if ($data = data_submitted() and confirm_sesskey()) {
}
}
$originalweights = grade_helper::fetch_all_natural_weights_for_course($courseid);
grade_regrade_final_grades($courseid);
// Check to see if any weights were automatically adjusted.
// Run through the data to obtain all of the weight categories.
foreach ($data as $key => $notused) {
// We only want the weight entries.
if (preg_match('/^(weight)_([0-9]+)$/', $key, $matches)) {
// Fetch the weight for the grade item.
$gradeitemweight = grade_item::fetch(array('id' => $matches[2], 'courseid' => $courseid))->aggregationcoef2;
// Compare what was entered from the form with what was actually entered into the database.
if ($data->$matches[0] != ($gradeitemweight * 100)) {
// Send a notification that the weights were automatically adjusted.
$normalisationmessage = get_string('weightsadjusted', 'grades');
break;
}
}
$alteredweights = grade_helper::fetch_all_natural_weights_for_course($courseid);
if (array_diff($originalweights, $alteredweights)) {
$normalisationmessage = get_string('weightsadjusted', 'grades');
}
}

17
grade/lib.php
View File

@ -2871,5 +2871,22 @@ abstract class grade_helper {
return $fields;
}
/**
* This helper method gets a snapshot of all the weights for a course.
* It is used as a quick method to see if any wieghts have been automatically adjusted.
* @param int $courseid
* @return array of itemid -> aggregationcoef2
*/
public static function fetch_all_natural_weights_for_course($courseid) {
global $DB;
$result = array();
$records = $DB->get_records('grade_items', array('courseid'=>$courseid), 'id', 'id, aggregationcoef2');
foreach ($records as $record) {
$result[$record->id] = $record->aggregationcoef2;
}
return $result;
}
}

3
lib/grade/grade_category.php
View File

@ -1317,8 +1317,7 @@ class grade_category extends grade_object {
}
// If all items besides the extra credit grade item are overridden then set extra credit to zero.
if (!$automaticgradeitemspresent && $gradeitemdetail['extracredit'] >= 1 && !$gradeitemdetail['weightoverride']) {
$setotherweightstozero = true;
}
$setotherweightstozero = true;
}
}