Browse Source

Improve messages in cron, check end of session correctly.

MOODLE_33_STABLE
Dan Marsden 8 years ago
parent
commit
bb09dd2ff4
  1. 3
      classes/task/notify.php
  2. 2
      locallib.php

3
classes/task/notify.php

@ -48,6 +48,9 @@ class notify extends \core\task\scheduled_task {
if (empty($lastrun)) {
$lastrun = 0;
}
if (!empty($lastrun)) {
mtrace("Get warnings to send for sessions that have ended since: ".userdate($lastrun));
}
$orderby = 'ORDER BY cm.id, atl.studentid, n.warningpercent ASC';
$records = attendance_get_users_to_notify(array(), $orderby, $lastrun, true);

2
locallib.php

@ -763,7 +763,7 @@ function attendance_get_users_to_notify($courseids = array(), $orderby = '', $si
GROUP BY attendanceid, setnumber) stm
ON (stm.setnumber = ats.statusset AND stm.attendanceid = ats.attendanceid)
{$joingroup}
WHERE ats.sessdate >= {$sincetime} {$where}
WHERE (ats.sessdate + ats.duration) >= {$sincetime} {$where}
AND ats.lasttaken != 0
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,

Loading…
Cancel
Save