Browse Source

Revert "Fix #290 cross-db compatible method to only include sessions with absenteereport set."

This reverts commit 23c3ee7282.
MOODLE_35_STABLE
Dan Marsden 7 years ago
parent
commit
6f0b3c22e9
  1. 3
      locallib.php

3
locallib.php

@ -767,7 +767,6 @@ function attendance_get_users_to_notify($courseids = array(), $orderby = '', $al
COUNT(DISTINCT ns.id) as nscount, MAX(ns.timesent) as timesent, COUNT(DISTINCT ns.id) as nscount, MAX(ns.timesent) as timesent,
SUM(stg.grade) / SUM(stm.maxgrade) AS percent SUM(stg.grade) / SUM(stm.maxgrade) AS percent
FROM {attendance_sessions} ats FROM {attendance_sessions} ats
JOIN {attendance_sessions} ats2 ON ats2.id = ats.id AND ats2.absenteereport = 1
JOIN {attendance} a ON a.id = ats.attendanceid JOIN {attendance} a ON a.id = ats.attendanceid
JOIN {course_modules} cm ON cm.instance = a.id JOIN {course_modules} cm ON cm.instance = a.id
JOIN {course} c on c.id = cm.course JOIN {course} c on c.id = cm.course
@ -784,7 +783,7 @@ function attendance_get_users_to_notify($courseids = array(), $orderby = '', $al
GROUP BY attendanceid, setnumber) stm GROUP BY attendanceid, setnumber) stm
ON (stm.setnumber = ats.statusset AND stm.attendanceid = ats.attendanceid) ON (stm.setnumber = ats.statusset AND stm.attendanceid = ats.attendanceid)
{$joingroup} {$joingroup}
WHERE {$where} WHERE ats.absenteereport = 1 {$where}
GROUP BY uniqueid, a.id, a.name, a.course, c.fullname, atl.studentid, n.id, n.warningpercent, GROUP BY uniqueid, a.id, a.name, a.course, c.fullname, atl.studentid, n.id, n.warningpercent,
n.emailsubject, n.emailcontent, n.emailcontentformat, n.warnafter, n.maxwarn, n.emailsubject, n.emailcontent, n.emailcontentformat, n.warnafter, n.maxwarn,
n.emailuser, n.thirdpartyemails, cm.id, c.id, {$unames2}, ns.userid n.emailuser, n.thirdpartyemails, cm.id, c.id, {$unames2}, ns.userid

Loading…
Cancel
Save