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

Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-06-05 00:42:59 +02:00
parent c76bd30885 38d06fea66
commit d291dfd0aa
1 changed files with 27 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/completionlib.php
+27 -127
View File
@@ -992,172 +992,72 @@ class completion_info {
* @return bool
*/
public function is_tracked_user($userid) {
global $DB;
$tracked = $this->generate_tracked_user_sql();
$sql = "SELECT u.id ";
$sql .= $tracked->sql;
$sql .= ' AND u.id = :userid';
$params = $tracked->data;
$params['userid'] = (int)$userid;
return $DB->record_exists_sql($sql, $params);
return is_enrolled(context_course::instance($this->course->id), $userid, '', true);
}
/**
* Return number of users whose progress is tracked in this course
* Returns the number of users whose progress is tracked in this course.
*
* Optionally supply a search's where clause, or a group id
* Optionally supply a search's where clause, or a group id.
*
* @param string $where Where clause sql
* @param array $where_params Where clause params
* @param string $where Where clause sql (use 'u.whatever' for user table fields)
* @param array $whereparams Where clause params
* @param int $groupid Group id
* @return int
* @return int Number of tracked users
*/
public function get_num_tracked_users($where = '', $where_params = array(), $groupid = 0) {
public function get_num_tracked_users($where = '', $whereparams = array(), $groupid = 0) {
global $DB;
$tracked = $this->generate_tracked_user_sql($groupid);
$sql = "SELECT COUNT(u.id) ";
$sql .= $tracked->sql;
list($enrolledsql, $enrolledparams) = get_enrolled_sql(
context_course::instance($this->course->id), '', $groupid, true);
$sql = 'SELECT COUNT(eu.id) FROM (' . $enrolledsql . ') eu JOIN {user} u ON u.id = eu.id';
if ($where) {
$sql .= " AND $where";
$sql .= " WHERE $where";
}
$params = array_merge($tracked->data, $where_params);
$params = array_merge($enrolledparams, $whereparams);
return $DB->count_records_sql($sql, $params);
}
/**
* Return array of users whose progress is tracked in this course
* Return array of users whose progress is tracked in this course.
*
* Optionally supply a search's where caluse, group id, sorting, paging
* Optionally supply a search's where clause, group id, sorting, paging.
*
* @param string $where Where clause sql (optional)
* @param array $where_params Where clause params (optional)
* @param integer $groupid Group ID to restrict to (optional)
* @param string $where Where clause sql, referring to 'u.' fields (optional)
* @param array $whereparams Where clause params (optional)
* @param int $groupid Group ID to restrict to (optional)
* @param string $sort Order by clause (optional)
* @param integer $limitfrom Result start (optional)
* @param integer $limitnum Result max size (optional)
* @param int $limitfrom Result start (optional)
* @param int $limitnum Result max size (optional)
* @param context $extracontext If set, includes extra user information fields
* as appropriate to display for current user in this context
* @return array
* @return array Array of user objects with standard user fields
*/
public function get_tracked_users($where = '', $where_params = array(), $groupid = 0,
public function get_tracked_users($where = '', $whereparams = array(), $groupid = 0,
$sort = '', $limitfrom = '', $limitnum = '', context $extracontext = null) {
global $DB;
$tracked = $this->generate_tracked_user_sql($groupid);
$params = $tracked->data;
list($enrolledsql, $params) = get_enrolled_sql(
context_course::instance($this->course->id), '', $groupid, true);
$sql = "
SELECT
u.id,
u.firstname,
u.lastname,
u.idnumber
";
$sql = 'SELECT u.id, u.firstname, u.lastname, u.idnumber';
if ($extracontext) {
$sql .= get_extra_user_fields_sql($extracontext, 'u', '', array('idnumber'));
}
$sql .= $tracked->sql;
$sql .= ' FROM (' . $enrolledsql . ') eu JOIN {user} u ON u.id = eu.id';
if ($where) {
$sql .= " AND $where";
$params = array_merge($params, $where_params);
$params = array_merge($params, $whereparams);
}
if ($sort) {
$sql .= " ORDER BY $sort";
}
$users = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum);
return $users ? $users : array(); // In case it returns false
}
/**
* Generate the SQL for finding tracked users in this course
*
* Returns an object containing the sql fragment and an array of
* bound data params.
*
* @param integer $groupid
* @return stdClass With two properties, sql (string), and data (array)
*/
public function generate_tracked_user_sql($groupid = 0) {
global $CFG;
$return = new stdClass();
$return->sql = '';
$return->data = array();
if (!empty($CFG->gradebookroles)) {
$roles = ' AND ra.roleid IN ('.$CFG->gradebookroles.')';
} else {
// This causes it to default to everyone (if there is no student role)
$roles = '';
}
// Build context sql
$context = get_context_instance(CONTEXT_COURSE, $this->course->id);
$parentcontexts = substr($context->path, 1); // kill leading slash
$parentcontexts = str_replace('/', ',', $parentcontexts);
if ($parentcontexts !== '') {
$parentcontexts = ' OR ra.contextid IN ('.$parentcontexts.' )';
}
$groupjoin = '';
$groupselect = '';
if ($groupid) {
$groupjoin = "JOIN {groups_members} gm
ON gm.userid = u.id";
$groupselect = " AND gm.groupid = :groupid ";
$return->data['groupid'] = $groupid;
}
$return->sql = "
FROM
{user} u
INNER JOIN
{role_assignments} ra
ON ra.userid = u.id
INNER JOIN
{role} r
ON r.id = ra.roleid
INNER JOIN
{user_enrolments} ue
ON ue.userid = u.id
INNER JOIN
{enrol} e
ON e.id = ue.enrolid
INNER JOIN
{course} c
ON c.id = e.courseid
$groupjoin
WHERE
(ra.contextid = :contextid $parentcontexts)
AND c.id = :courseid
AND ue.status = 0
AND e.status = 0
AND ue.timestart < :now1
AND (ue.timeend > :now2 OR ue.timeend = 0)
$groupselect
$roles
";
$now = time();
$return->data['now1'] = $now;
$return->data['now2'] = $now;
$return->data['contextid'] = $context->id;
$return->data['courseid'] = $this->course->id;
return $return;
return $DB->get_records_sql($sql, $params, $limitfrom, $limitnum);
}
/**