From 20f9e4b9e34729c3ec2d7a292e498e02e9733b59 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 9 Feb 2018 11:33:55 +1300 Subject: [PATCH] Revert "Fix #290 cross-db compatible method to only include sessions with absenteereport set." This reverts commit 23c3ee7282d8e2360387eb87f62405dc62d130ac. --- locallib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locallib.php b/locallib.php index b56f6c2..d725447 100644 --- a/locallib.php +++ b/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, SUM(stg.grade) / SUM(stm.maxgrade) AS percent 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 {course_modules} cm ON cm.instance = a.id 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 ON (stm.setnumber = ats.statusset AND stm.attendanceid = ats.attendanceid) {$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, n.emailsubject, n.emailcontent, n.emailcontentformat, n.warnafter, n.maxwarn, n.emailuser, n.thirdpartyemails, cm.id, c.id, {$unames2}, ns.userid