Permalink
Browse files

Merge branch 'MDL-27703_user_report_sql_20' of git://github.com/andyj…

…davis/moodle into MOODLE_20_STABLE
  • Loading branch information...
2 parents f68144c + 327120b commit f50e703e21ee9edabfbf2ee0880b1095f92540d7 @nebgor nebgor committed Nov 22, 2011
Showing with 2 additions and 3 deletions.
  1. +2 −3 grade/report/user/lib.php
@@ -650,7 +650,7 @@ function calculate_averages() {
// Then left join with grade_grades and look for rows with null final grade (which includes grade items with no grade_grade)
$sql = "SELECT gi.id, COUNT(u.id) AS count
FROM {grade_items} gi
- JOIN {user} u
+ JOIN {user} u ON u.deleted = 0
JOIN ($enrolledsql) je ON je.id = u.id
JOIN (
SELECT DISTINCT ra.userid
@@ -659,10 +659,9 @@ function calculate_averages() {
AND ra.contextid " . get_related_contexts_string($this->context) . "
) rainner ON rainner.userid = u.id
LEFT JOIN {grade_grades} gg
- ON (gg.itemid = gi.id AND gg.userid = u.id AND gg.finalgrade IS NOT NULL AND gg.hidden = 0)
+ ON (gg.itemid = gi.id AND gg.userid = u.id AND gg.finalgrade IS NOT NULL AND gg.hidden = 0)
$groupsql
WHERE gi.courseid = :courseid
- AND u.deleted = 0
AND gg.finalgrade IS NULL
$groupwheresql
GROUP BY gi.id";

0 comments on commit f50e703

Please sign in to comment.