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

MDL-43020: Fix lesson scale warnings when deleting user attempts

Browse source
This commit is contained in:
Tim Lock 2013-11-25 15:08:19 +10:30
parent 74dd3bd6c7
commit 16c25753a8
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mod/lesson/lib.php
View file

@ -469,9 +469,19 @@ function lesson_grade_item_update($lesson, $grades=null) {
$params['gradetype'] = GRADE_TYPE_SCALE; $params['gradetype'] = GRADE_TYPE_SCALE;
$params['scaleid'] = -$lesson->grade; $params['scaleid'] = -$lesson->grade;
// When converting a score to a scale, use scale's grade maximum to calculate it. // Make sure current grade fetched correctly from $grades
$currentgrade = null;
if (!empty($grades)) { if (!empty($grades)) {
$grade = grade_get_grades($lesson->course, 'mod', 'lesson', $lesson->id, reset($grades)->userid); if (is_array($grades)) {
$currentgrade = reset($grades);
} else {
$currentgrade = $grades;
}
}
// When converting a score to a scale, use scale's grade maximum to calculate it.
if (!empty($currentgrade) && $currentgrade->rawgrade !== null) {
$grade = grade_get_grades($lesson->course, 'mod', 'lesson', $lesson->id, $currentgrade->userid);
$params['grademax'] = reset($grade->items)->grademax; $params['grademax'] = reset($grade->items)->grademax;
} }
} else { } else {