From 0aff7a5517b2964d72657003353ec2b2c871c184 Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Mon, 16 Dec 2013 15:30:56 +0000 Subject: [PATCH] MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report --- grade/report/grader/lib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index f68ba227dad..f4a357ce906 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -473,9 +473,12 @@ class grade_report_grader extends grade_report { AND ue.status = :uestatus AND e.status = :estatus AND e.courseid = :courseid + AND ue.timestart < :now1 AND (ue.timeend = 0 OR ue.timeend > :now2) GROUP BY ue.userid"; $coursecontext = $this->context->get_course_context(true); - $params = array_merge($uparams, array('estatus'=>ENROL_INSTANCE_ENABLED, 'uestatus'=>ENROL_USER_ACTIVE, 'courseid'=>$coursecontext->instanceid)); + $time = time(); + $params = array_merge($uparams, array('estatus' => ENROL_INSTANCE_ENABLED, 'uestatus' => ENROL_USER_ACTIVE, + 'courseid' => $coursecontext->instanceid, 'now1' => $time, 'now2' => $time)); $useractiveenrolments = $DB->get_records_sql($sql, $params); $defaultgradeshowactiveenrol = !empty($CFG->grade_report_showonlyactiveenrol);