Permalink
Browse files

Merge branch 'MDL-37781-workshop-schedule_23' of git://github.com/mud…

…rd8mz/moodle into MOODLE_23_STABLE
  • Loading branch information...
2 parents 7c67ab3 + 5e5dfab commit e20455a5ae9bc594ead43dffe1934bea4d5747b8 @damyon damyon committed Feb 4, 2013
@@ -0,0 +1,40 @@
+<?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/>.
+
+/**
+ * Defines event handlers
+ *
+ * @package workshopallocation_scheduled
+ * @subpackage mod_workshop
+ * @category event
+ * @copyright 2013 David Mudrak <david@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$handlers = array(
+
+ // The workshop main page is displayed to the user
+ 'workshop_viewed' => array(
+ 'handlerfile' => '/mod/workshop/allocation/scheduled/lib.php',
+ 'handlerfunction' => 'workshopallocation_scheduled_workshop_viewed',
+ 'schedule' => 'instant',
+ 'internal' => 1,
+ ),
+
+);
@@ -285,3 +285,50 @@ function workshopallocation_scheduled_cron() {
// todo inform the teachers about the results
}
}
+
+////////////////////////////////////////////////////////////////////////////////
+// Events API
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Handler for the 'workshop_viewed' event
+ *
+ * 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 forcron to execute.
+ * Displaying the workshop main view.php can trigger the scheduled allocation, too.
+ *
+ * @param stdClass $event event data
+ * @return bool
+ */
+function workshopallocation_scheduled_workshop_viewed($event) {
+ global $DB;
+
+ $workshop = $event->workshop;
+ $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;
+}
@@ -27,7 +27,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'workshopallocation_scheduled';
-$plugin->version = 2012061700;
+$plugin->version = 2012061701;
$plugin->requires = 2012061700;
$plugin->dependencies = array(
'workshopallocation_random' => 2012061700,
View
@@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
-$module->version = 2012061700; // the current module version (YYYYMMDDXX)
+$module->version = 2012061701; // the current module version (YYYYMMDDXX)
$module->requires = 2012061700; // requires this Moodle version
$module->component = 'mod_workshop'; // full name of the plugin (used for diagnostics)
$module->cron = 60; // give as a chance every minute
View
@@ -59,6 +59,24 @@
$completion = new completion_info($course);
$completion->set_module_viewed($cm);
+// Fire the event
+events_trigger('workshop_viewed', (object)array(
+ 'workshop' => $workshop,
+ 'user' => $USER,
+));
+
+// If the phase is to be switched, do it asap. This just has to happen after triggering
+// the event so that the scheduled allocator had a chance to allocate submissions.
+if ($workshop->phase == workshop::PHASE_SUBMISSION and $workshop->phaseswitchassessment
+ and $workshop->submissionend > 0 and $workshop->submissionend < time()) {
+ $workshop->switch_phase(workshop::PHASE_ASSESSMENT);
+ $workshop->log('update switch phase', $workshop->view_url(), $workshop->phase);
+ // Disable the automatic switching now so that it is not executed again by accident
+ // if the teacher changes the phase back to the submission one.
+ $DB->set_field('workshop', 'phaseswitchassessment', 0, array('id' => $workshop->id));
+ $workshop->phaseswitchassessment = 0;
+}
+
if (!is_null($editmode) && $PAGE->user_allowed_editing()) {
$USER->editing = $editmode;
}

0 comments on commit e20455a

Please sign in to comment.