mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-48142-master' of git://github.com/lameze/moodle
This commit is contained in:
commit
6750b66c39
58
badges/tests/events_test.php
Normal file
58
badges/tests/events_test.php
Normal file
@ -0,0 +1,58 @@
|
||||
<?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/>.
|
||||
/**
|
||||
* Badge events tests.
|
||||
*
|
||||
* @package core_badges
|
||||
* @copyright 2015 onwards Simey Lameze <simey@moodle.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
global $CFG;
|
||||
require_once($CFG->dirroot . '/badges/tests/badgeslib_test.php');
|
||||
|
||||
/**
|
||||
* Badge events tests class.
|
||||
*
|
||||
* @package core_badges
|
||||
* @copyright 2015 onwards Simey Lameze <simey@moodle.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class core_badges_events_testcase extends core_badges_badgeslib_testcase {
|
||||
|
||||
/**
|
||||
* Test badge awarded event.
|
||||
*/
|
||||
public function test_badge_awarded() {
|
||||
|
||||
$systemcontext = context_system::instance();
|
||||
|
||||
$sink = $this->redirectEvents();
|
||||
|
||||
$badge = new badge($this->badgeid);
|
||||
$badge->issue($this->user->id, true);
|
||||
$badge->is_issued($this->user->id);
|
||||
$events = $sink->get_events();
|
||||
$this->assertCount(1, $events);
|
||||
$event = reset($events);
|
||||
$this->assertInstanceOf('\core\event\badge_awarded', $event);
|
||||
$this->assertEquals($this->badgeid, $event->objectid);
|
||||
$this->assertEquals($this->user->id, $event->relateduserid);
|
||||
$this->assertEquals($systemcontext, $event->get_context());
|
||||
|
||||
$sink->close();
|
||||
}
|
||||
}
|
@ -246,6 +246,7 @@ $string['error:requesttimeout'] = 'The connection request timed out before it co
|
||||
$string['error:requesterror'] = 'The connection request failed (error code {$a}).';
|
||||
$string['error:save'] = 'Cannot save the badge.';
|
||||
$string['error:userdeleted'] = '{$a->user} (This user no longer exists in {$a->site})';
|
||||
$string['eventbadgeawarded'] = 'Badge awarded';
|
||||
$string['evidence'] = 'Evidence';
|
||||
$string['existingrecipients'] = 'Existing badge recipients';
|
||||
$string['expired'] = 'Expired';
|
||||
|
@ -398,6 +398,15 @@ class badge {
|
||||
$result = $DB->insert_record('badge_issued', $issued, true);
|
||||
|
||||
if ($result) {
|
||||
// Trigger badge awarded event.
|
||||
$eventdata = array (
|
||||
'context' => $this->get_context(),
|
||||
'objectid' => $this->id,
|
||||
'relateduserid' => $userid,
|
||||
'other' => array('expiredate' => $issued->dateexpire, 'badgeissuedid' => $result)
|
||||
);
|
||||
\core\event\badge_awarded::create($eventdata)->trigger();
|
||||
|
||||
// Lock the badge, so that its criteria could not be changed any more.
|
||||
if ($this->status == BADGE_STATUS_ACTIVE) {
|
||||
$this->set_status(BADGE_STATUS_ACTIVE_LOCKED);
|
||||
|
97
lib/classes/event/badge_awarded.php
Normal file
97
lib/classes/event/badge_awarded.php
Normal file
@ -0,0 +1,97 @@
|
||||
<?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/>.
|
||||
|
||||
/**
|
||||
* Badge awarded event.
|
||||
*
|
||||
* @property-read array $other {
|
||||
* Extra information about event.
|
||||
*
|
||||
* - int expiredate: Badge expire timestamp.
|
||||
* - int badgeissuedid: Badge issued ID.
|
||||
* }
|
||||
*
|
||||
* @package core
|
||||
* @copyright 2015 James Ballard
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
namespace core\event;
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
/**
|
||||
* Event triggered after a badge is awarded to a user.
|
||||
*
|
||||
* @package core
|
||||
* @since Moodle 2.9
|
||||
* @copyright 2015 James Ballard
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class badge_awarded extends base {
|
||||
|
||||
/**
|
||||
* Set basic properties for the event.
|
||||
*/
|
||||
protected function init() {
|
||||
$this->data['objecttable'] = 'badge';
|
||||
$this->data['crud'] = 'c';
|
||||
$this->data['edulevel'] = self::LEVEL_TEACHING;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns localised general event name.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function get_name() {
|
||||
return get_string('eventbadgeawarded', 'badges');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns non-localised event description with id's for admin use only.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function get_description() {
|
||||
return "The user with the id '$this->relateduserid' has been awarded the badge with id '".$this->objectid."'.";
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns relevant URL.
|
||||
* @return \moodle_url
|
||||
*/
|
||||
public function get_url() {
|
||||
return new \moodle_url('/badges/overview.php', array('id' => $this->objectid));
|
||||
}
|
||||
|
||||
/**
|
||||
* Custom validations.
|
||||
*
|
||||
* @throws \coding_exception
|
||||
* @return void
|
||||
*/
|
||||
protected function validate_data() {
|
||||
parent::validate_data();
|
||||
|
||||
if (!isset($this->relateduserid)) {
|
||||
throw new \coding_exception('The \'relateduserid\' must be set.');
|
||||
}
|
||||
|
||||
if (!isset($this->objectid)) {
|
||||
throw new \coding_exception('The \'objectid\' must be set.');
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user