mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
- Loading branch information
Showing
9 changed files
with
321 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| <?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/>. | ||
|
|
||
| /** | ||
| * This file contains an event for an unknown service API call. | ||
| * | ||
| * @package mod_lti | ||
| * @copyright 2013 Adrian Greeve <adrian@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace mod_lti\event; | ||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| /** | ||
| * Event for when something happens with an unknown lti service API call. | ||
| * | ||
| * @package mod_lti | ||
| * @copyright 2013 Adrian Greeve <adrian@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class unknown_service_api_called extends \core\event\base { | ||
|
|
||
| /** Old data to be used for the legacy event. */ | ||
| protected $legacydata; | ||
|
|
||
| /** | ||
| * Set method for legacy data. | ||
| * | ||
| * @param stdClass $data legacy event data. | ||
| */ | ||
| public function set_legacy_data($data) { | ||
| $this->legacydata = $data; | ||
| } | ||
|
|
||
| /** | ||
| * Init method. | ||
| */ | ||
| protected function init() { | ||
| $this->data['objecttable'] = 'lti'; | ||
| $this->data['crud'] = 'r'; | ||
| $this->data['level'] = self::LEVEL_OTHER; | ||
| $this->data['context'] = \context_system::instance(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns localised description of what happened. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function get_description() { | ||
| return 'An unknown call to a service api was made.'; | ||
| } | ||
|
|
||
| /** | ||
| * Returns localised general event name. | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function get_name() { | ||
| return get_string('ltiunknownserviceapicall', 'mod_lti'); | ||
| } | ||
|
|
||
| /** | ||
| * Does this event replace a legacy event? | ||
| * | ||
| * @return null|string legacy event name | ||
| */ | ||
| public static function get_legacy_eventname() { | ||
| return 'lti_unknown_service_api_call'; | ||
| } | ||
|
|
||
| /** | ||
| * Legacy event data if get_legacy_eventname() is not empty. | ||
| * | ||
| * @return mixed | ||
| */ | ||
| protected function get_legacy_eventdata() { | ||
| return $this->legacydata; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?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/>. | ||
|
|
||
| /** | ||
| * Event observers for workshopallocation_scheduled. | ||
| * | ||
| * @package workshopallocation_scheduled | ||
| * @copyright 2013 Adrian Greeve <adrian@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace workshopallocation_scheduled; | ||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| /** | ||
| * Class for workshopallocation_scheduled observers. | ||
| * | ||
| * @package workshopallocation_scheduled | ||
| * @copyright 2013 Adrian Greeve <adrian@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class observer { | ||
|
|
||
| /** | ||
| * Triggered when the '\mod_workshop\event\course_module_viewed' event is triggered. | ||
| * | ||
| * This does the same job as {@link workshopallocation_scheduled_cron()} but for the | ||
| * single workshop. The idea is that we do not need to wait for cron to execute. | ||
| * Displaying the workshop main view.php can trigger the scheduled allocation, too. | ||
| * | ||
| * @param \mod_workshop\event\course_module_viewed $event | ||
| * @return bool | ||
| */ | ||
| public static function workshop_viewed($event) { | ||
| global $DB; | ||
|
|
||
| $workshop = $event->get_record_snapshot('workshop', $event->objectid); | ||
| $course = $event->get_record_snapshot('course', $event->courseid); | ||
| $cm = $event->get_record_snapshot('course_modules', $event->contextinstanceid); | ||
|
|
||
| $workshop = new \workshop($workshop, $cm, $course); | ||
| $now = time(); | ||
|
|
||
| // Non-expensive check to see if the scheduled allocation can even happen. | ||
| if ($workshop->phase == \workshop::PHASE_SUBMISSION and $workshop->submissionend > 0 and $workshop->submissionend < $now) { | ||
|
|
||
| // Make sure the scheduled allocation has been configured for this workshop, that it has not | ||
| // been executed yet and that the passed workshop record is still valid. | ||
| $sql = "SELECT a.id | ||
| FROM {workshopallocation_scheduled} a | ||
| JOIN {workshop} w ON a.workshopid = w.id | ||
| WHERE w.id = :workshopid | ||
| AND a.enabled = 1 | ||
| AND w.phase = :phase | ||
| AND w.submissionend > 0 | ||
| AND w.submissionend < :now | ||
| AND (a.timeallocated IS NULL OR a.timeallocated < w.submissionend)"; | ||
| $params = array('workshopid' => $workshop->id, 'phase' => \workshop::PHASE_SUBMISSION, 'now' => $now); | ||
|
|
||
| if ($DB->record_exists_sql($sql, $params)) { | ||
| // Allocate submissions for assessments. | ||
| $allocator = $workshop->allocator_instance('scheduled'); | ||
| $result = $allocator->execute(); | ||
| // Todo inform the teachers about the results. | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| <?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/>. | ||
|
|
||
| /** | ||
| * This file contains an event for when a workshop activity is viewed. | ||
| * | ||
| * @package mod_workshop | ||
| * @copyright 2013 Adrian Greeve <adrian@moodle.com> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace mod_workshop\event; | ||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| /** | ||
| * Event for when a workshop activity is viewed. | ||
| * | ||
| * @package mod_workshop | ||
| * @copyright 2013 Adrian Greeve | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class course_module_viewed extends \core\event\content_viewed { | ||
|
|
||
| /** | ||
| * Init method. | ||
| */ | ||
| protected function init() { | ||
| $this->data['crud'] = 'r'; | ||
| $this->data['level'] = self::LEVEL_PARTICIPATING; | ||
| $this->data['objecttable'] = 'workshop'; | ||
| } | ||
|
|
||
| /** | ||
| * Does this event replace a legacy event? | ||
| * | ||
| * @return string legacy event name | ||
| */ | ||
| public static function get_legacy_eventname() { | ||
| return 'workshop_viewed'; | ||
| } | ||
|
|
||
| /** | ||
| * Returns non-localised description of what happened. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function get_description() { | ||
| return 'User with id ' . $this->userid . ' viewed content ' . $this->get_url() . ' In phase ' . $this->other['content']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns localised general event name. | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function get_name() { | ||
| return get_string('workshopviewed', 'workshop'); | ||
| } | ||
|
|
||
| /** | ||
| * Returns relevant URL. | ||
| * @return \moodle_url | ||
| */ | ||
| public function get_url() { | ||
| $url = '/mod/workshop/view.php'; | ||
| return new \moodle_url($url, array('id'=>$this->context->instanceid)); | ||
| } | ||
|
|
||
| /** | ||
| * Legacy event data if get_legacy_eventname() is not empty. | ||
| * | ||
| * @return mixed | ||
| */ | ||
| protected function get_legacy_eventdata() { | ||
| global $USER; | ||
|
|
||
| $workshop = $this->get_record_snapshot('workshop', $this->objectid); | ||
| $course = $this->get_record_snapshot('course', $this->courseid); | ||
| $cm = $this->get_record_snapshot('course_modules', $this->context->instanceid); | ||
| $workshop = new \workshop($workshop, $cm, $course); | ||
| return (object)array('workshop' => $workshop, 'user' => $USER); | ||
| } | ||
|
|
||
| /** | ||
| * replace add_to_log() statement. | ||
| * | ||
| * @return array of parameters to be passed to legacy add_to_log() function. | ||
| */ | ||
| protected function get_legacy_logdata() { | ||
| $url = new \moodle_url('view.php', array('id' => $this->context->instanceid)); | ||
| return array($this->courseid, 'workshop', 'view', $url->out(), $this->objectid, $this->context->instanceid); | ||
| } | ||
| } |
Oops, something went wrong.