L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report

Browse Source 
Conflicts:
	grade/report/grader/lib.php
This commit is contained in:
Tony Butler
2014-01-06 10:38:27 +08:00
committed by Dan Poltawski
parent ba5255f4f1
commit df9f225353
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/grader/lib.php
+4 -1
View File
@@ -471,9 +471,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 = get_course_context($this->context);
$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);