Skip to content

Commit

Permalink
Showing 3 changed files with 157 additions and 129 deletions.
2 changes: 1 addition & 1 deletion cohort/assign.php
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
*/

require_once('../config.php');
require_once($CFG->dirroot.'/cohort/lib.php');
require_once($CFG->dirroot.'/cohort/locallib.php');

$id = required_param('id', PARAM_INT);

130 changes: 2 additions & 128 deletions cohort/lib.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@@ -18,13 +17,12 @@
/**
* Cohort related management functions, this file needs to be included manually.
*
* @package core
* @subpackage cohort
* @package core_cohort
* @copyright 2010 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

require_once($CFG->dirroot . '/user/selector/lib.php');
defined('MOODLE_INTERNAL') || die();

/**
* Add new cohort.
@@ -248,127 +246,3 @@ function cohort_get_cohorts($contextid, $page = 0, $perpage = 25, $search = '')

return array('totalcohorts' => $totalcohorts, 'cohorts' => $cohorts);
}

/**
* Cohort assignment candidates
*/
class cohort_candidate_selector extends user_selector_base {
protected $cohortid;

public function __construct($name, $options) {
$this->cohortid = $options['cohortid'];
parent::__construct($name, $options);
}

/**
* Candidate users
* @param <type> $search
* @return array
*/
public function find_users($search) {
global $DB;
//by default wherecondition retrieves all users except the deleted, not confirmed and guest
list($wherecondition, $params) = $this->search_sql($search, 'u');
$params['cohortid'] = $this->cohortid;

$fields = 'SELECT ' . $this->required_fields_sql('u');
$countfields = 'SELECT COUNT(1)';

$sql = " FROM {user} u
LEFT JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
WHERE cm.id IS NULL AND $wherecondition";

$order = ' ORDER BY u.lastname ASC, u.firstname ASC';

if (!$this->is_validating()) {
$potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
if ($potentialmemberscount > 100) {
return $this->too_many_results($search, $potentialmemberscount);
}
}

$availableusers = $DB->get_records_sql($fields . $sql . $order, $params);

if (empty($availableusers)) {
return array();
}


if ($search) {
$groupname = get_string('potusersmatching', 'cohort', $search);
} else {
$groupname = get_string('potusers', 'cohort');
}

return array($groupname => $availableusers);
}

protected function get_options() {
$options = parent::get_options();
$options['cohortid'] = $this->cohortid;
$options['file'] = 'cohort/lib.php';
return $options;
}
}

/**
* Cohort assignment candidates
*/
class cohort_existing_selector extends user_selector_base {
protected $cohortid;

public function __construct($name, $options) {
$this->cohortid = $options['cohortid'];
parent::__construct($name, $options);
}

/**
* Candidate users
* @param <type> $search
* @return array
*/
public function find_users($search) {
global $DB;
//by default wherecondition retrieves all users except the deleted, not confirmed and guest
list($wherecondition, $params) = $this->search_sql($search, 'u');
$params['cohortid'] = $this->cohortid;

$fields = 'SELECT ' . $this->required_fields_sql('u');
$countfields = 'SELECT COUNT(1)';

$sql = " FROM {user} u
JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
WHERE $wherecondition";

$order = ' ORDER BY u.lastname ASC, u.firstname ASC';

if (!$this->is_validating()) {
$potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
if ($potentialmemberscount > 100) {
return $this->too_many_results($search, $potentialmemberscount);
}
}

$availableusers = $DB->get_records_sql($fields . $sql . $order, $params);

if (empty($availableusers)) {
return array();
}


if ($search) {
$groupname = get_string('currentusersmatching', 'cohort', $search);
} else {
$groupname = get_string('currentusers', 'cohort');
}

return array($groupname => $availableusers);
}

protected function get_options() {
$options = parent::get_options();
$options['cohortid'] = $this->cohortid;
$options['file'] = 'cohort/lib.php';
return $options;
}
}
154 changes: 154 additions & 0 deletions cohort/locallib.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* Cohort UI related functions and classes.
*
* @package core_cohort
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

require_once($CFG->dirroot . '/cohot/lib.php');
require_once($CFG->dirroot . '/user/selector/lib.php');

/**
* Cohort assignment candidates
*/
class cohort_candidate_selector extends user_selector_base {
protected $cohortid;

public function __construct($name, $options) {
$this->cohortid = $options['cohortid'];
parent::__construct($name, $options);
}

/**
* Candidate users
* @param <type> $search
* @return array
*/
public function find_users($search) {
global $DB;
//by default wherecondition retrieves all users except the deleted, not confirmed and guest
list($wherecondition, $params) = $this->search_sql($search, 'u');
$params['cohortid'] = $this->cohortid;

$fields = 'SELECT ' . $this->required_fields_sql('u');
$countfields = 'SELECT COUNT(1)';

$sql = " FROM {user} u
LEFT JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
WHERE cm.id IS NULL AND $wherecondition";

$order = ' ORDER BY u.lastname ASC, u.firstname ASC';

if (!$this->is_validating()) {
$potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
if ($potentialmemberscount > 100) {
return $this->too_many_results($search, $potentialmemberscount);
}
}

$availableusers = $DB->get_records_sql($fields . $sql . $order, $params);

if (empty($availableusers)) {
return array();
}


if ($search) {
$groupname = get_string('potusersmatching', 'cohort', $search);
} else {
$groupname = get_string('potusers', 'cohort');
}

return array($groupname => $availableusers);
}

protected function get_options() {
$options = parent::get_options();
$options['cohortid'] = $this->cohortid;
$options['file'] = 'cohort/locallib.php';
return $options;
}
}


/**
* Cohort assignment candidates
*/
class cohort_existing_selector extends user_selector_base {
protected $cohortid;

public function __construct($name, $options) {
$this->cohortid = $options['cohortid'];
parent::__construct($name, $options);
}

/**
* Candidate users
* @param <type> $search
* @return array
*/
public function find_users($search) {
global $DB;
//by default wherecondition retrieves all users except the deleted, not confirmed and guest
list($wherecondition, $params) = $this->search_sql($search, 'u');
$params['cohortid'] = $this->cohortid;

$fields = 'SELECT ' . $this->required_fields_sql('u');
$countfields = 'SELECT COUNT(1)';

$sql = " FROM {user} u
JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
WHERE $wherecondition";

$order = ' ORDER BY u.lastname ASC, u.firstname ASC';

if (!$this->is_validating()) {
$potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
if ($potentialmemberscount > 100) {
return $this->too_many_results($search, $potentialmemberscount);
}
}

$availableusers = $DB->get_records_sql($fields . $sql . $order, $params);

if (empty($availableusers)) {
return array();
}


if ($search) {
$groupname = get_string('currentusersmatching', 'cohort', $search);
} else {
$groupname = get_string('currentusers', 'cohort');
}

return array($groupname => $availableusers);
}

protected function get_options() {
$options = parent::get_options();
$options['cohortid'] = $this->cohortid;
$options['file'] = 'cohort/locallib.php';
return $options;
}
}

0 comments on commit 607fdf6

Please sign in to comment.