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

MDL-46960 badges: optimise interaction with completionlib

Browse Source
This commit is contained in:
Marina Glancy
2015-03-31 11:06:57 +08:00
parent 0cc9d709ab
commit d368ce21ff
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/criteria/award_criteria_activity.php
+6 -11
View File
@@ -37,7 +37,7 @@ class award_criteria_activity extends award_criteria {
public $criteriatype = BADGE_CRITERIA_TYPE_ACTIVITY;
private $courseid;
private $coursestartdate;
private $course;
public $required_param = 'module';
public $optional_params = array('bydate');
@@ -46,11 +46,10 @@ class award_criteria_activity extends award_criteria {
global $DB;
parent::__construct($record);
$course = $DB->get_record_sql('SELECT b.courseid, c.startdate
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
$this->courseid = $course->courseid;
$this->coursestartdate = $course->startdate;
$this->courseid = $this->course->id;
}
/**
@@ -107,13 +106,11 @@ class award_criteria_activity extends award_criteria {
*
*/
public function get_options(&$mform) {
global $DB;
$none = true;
$existing = array();
$missing = array();
$course = $DB->get_record('course', array('id' => $this->courseid));
$course = $this->course;
$info = new completion_info($course);
$mods = $info->get_activities();
$mids = array_keys($mods);
@@ -187,14 +184,12 @@ class award_criteria_activity extends award_criteria {
*/
public function review($userid, $filtered = false) {
$completionstates = array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS);
$course = new stdClass();
$course->id = $this->courseid;
if ($this->coursestartdate > time()) {
if ($this->course->startdate > time()) {
return false;
}
$info = new completion_info($course);
$info = new completion_info($this->course);
$overall = false;
foreach ($this->params as $param) {
badges/criteria/award_criteria_course.php
+5 -7
View File
@@ -39,7 +39,7 @@ class award_criteria_course extends award_criteria {
public $criteriatype = BADGE_CRITERIA_TYPE_COURSE;
private $courseid;
private $coursestartdate;
private $course;
public $required_param = 'course';
public $optional_params = array('grade', 'bydate');
@@ -48,11 +48,10 @@ class award_criteria_course extends award_criteria {
global $DB;
parent::__construct($record);
$course = $DB->get_record_sql('SELECT b.courseid, c.startdate
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
$this->courseid = $course->courseid;
$this->coursestartdate = $course->startdate;
$this->courseid = $this->course->id;
}
/**
@@ -180,10 +179,9 @@ class award_criteria_course extends award_criteria {
* @return bool Whether criteria is complete
*/
public function review($userid, $filtered = false) {
$course = new stdClass();
$course->id = $this->courseid;
$course = $this->course;
if ($this->coursestartdate > time()) {
if ($this->course->startdate > time()) {
return false;
}