mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

MDL-10480, implement average grade selection

Browse Source
This commit is contained in:
toyomoyo 2007-07-18 08:03:38 +00:00
parent 61f774e8f6
commit 3446013d45
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
grade/report/grader/lib.php
View File

@ -755,8 +755,16 @@ class grade_report_grader extends grade_report {
global $CFG, $USER;
$averagesdisplaytype = $this->get_pref('averagesdisplaytype');
$mean_pref = get_user_preferences('grade_report_meanselection', $CFG->grade_report_meanselection);
$groupavghtml = '';
if ($mean_pref == 2) {
// non empty grades
$meanstr = "AND NOT g.finalgrade IS NULL";
} else {
$meanstr = "";
}
if ($this->currentgroup && $this->get_pref('showgroups')) {
/** SQL for finding group sum */
@ -772,6 +780,7 @@ class grade_report_grader extends grade_report {
AND ra.roleid in ($this->gradebookroles)
AND ra.contextid ".get_related_contexts_string($this->context)."
AND NOT g.finalgradeIS NULL
$notnullstr
GROUP BY g.itemid";
$groupsum = array();
@ -844,8 +853,15 @@ class grade_report_grader extends grade_report {
$averagesdisplaytype = $this->get_pref('averagesdisplaytype');
$meanselection = $this->get_pref('meanselection');
$mean_pref = get_user_preferences('grade_report_meanselection', $CFG->grade_report_meanselection);
$gradeavghtml = '';
if ($mean_pref == 2) {
// non empty grades
$meanstr = "AND NOT g.finalgrade IS NULL";
} else {
$meanstr = "";
}
if ($this->get_pref('showaverages')) {
/** SQL for finding the SUM grades of all visible users ($CFG->gradebookroles) */
@ -858,7 +874,7 @@ class grade_report_grader extends grade_report {
WHERE gi.courseid = $this->courseid
AND ra.roleid in ($this->gradebookroles)
AND ra.contextid ".get_related_contexts_string($this->context)."
AND NOT g.finalgrade IS NULL
$meanstr
GROUP BY g.itemid";
$classsum = array();