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-18993 implemented frull support for droplow and keephigh in sum aggregation type

Browse Source
This commit is contained in:
skodak 2009-04-29 08:55:25 +00:00
parent 85db95e708
commit 59080eee21
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/grade/grade_category.php
View File

@ -720,22 +720,25 @@ class grade_category extends grade_object {
return;
}
$max = 0;
//find max grade
//find max grade possible
$maxes = array();
foreach ($items as $item) {
if ($item->aggregationcoef > 0) {
// extra credit from this activity - does not affect total
continue;
}
if ($item->gradetype == GRADE_TYPE_VALUE) {
$max += $item->grademax;
$maxes[] = $item->grademax;
} else if ($item->gradetype == GRADE_TYPE_SCALE) {
$max += $item->grademax; // 0 = nograde, 1 = first scale item, 2 = second scale item
$maxes[] = $item->grademax; // 0 = nograde, 1 = first scale item, 2 = second scale item
}
}
// apply droplow and keephigh
$this->apply_limit_rules($maxes);
$max = array_sum($maxes);
if ($this->grade_item->grademax != $max or $this->grade_item->grademin != 0 or $this->grade_item->gradetype != GRADE_TYPE_VALUE){
// update db if anything changed
if ($this->grade_item->grademax != $max or $this->grade_item->grademin != 0 or $this->grade_item->gradetype != GRADE_TYPE_VALUE) {
$this->grade_item->grademax = $max;
$this->grade_item->grademin = 0;
$this->grade_item->gradetype = GRADE_TYPE_VALUE;
@ -800,6 +803,10 @@ class grade_category extends grade_object {
arsort($grade_values, SORT_NUMERIC);
if (!empty($this->droplow)) {
for ($i = 0; $i < $this->droplow; $i++) {
if (empty($grade_values)) {
// nothing to remove
return;
}
array_pop($grade_values);
}
} elseif (!empty($this->keephigh)) {