Several improvements (watching slots, import via CSV, mobile support, ...)

amd/src/revoke.js

@@ -0,0 +1,103 @@
+// 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/>.
+
+/**
+ * Revoke an appointment.
+ *
+ * This module allows for revoking an appointment from a student list.
+ *
+ * @module     mod_scheduler/revoke
+ * @copyright  2019 Royal College of Art
+ * @author     Frédéric Massart <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define(['jquery', 'core/ajax', 'core/notification', 'core/str'], function($, Ajax, Notification, Str) {
+
+    var actionSelector = '.otherstudent a.revoke-student';
+    var studentWrapperSelector = '.otherstudent';
+
+    /**
+     * Revoker.
+     *
+     * @param {jQuery} root The root wrapper as jQuery element.
+     * @param {Number} cmid The cmid.
+     */
+    function Revoker(root, cmid) {
+        this.cmid = cmid;
+
+        root.on('click', actionSelector, function(e) {
+            e.preventDefault();
+            var wrapper = $(e.target).closest(studentWrapperSelector);
+            this.triggerRevoke(wrapper);
+        }.bind(this));
+    }
+
+    /**
+     * Trigger the revoke from a node.
+     *
+     * @param {jQuery} studentWrapper The student wrapper node.
+     */
+    Revoker.prototype.triggerRevoke = function(studentWrapper) {
+        var appId = parseInt(studentWrapper.data('appointmentid'), 10);
+        if (!appId) {
+            return;
+        }
+
+        Str.get_strings([
+            {key: 'confirmation', component: 'core_admin'},
+            {key: 'confirmsinglerevoke', component: 'mod_scheduler'},
+            {key: 'yes', component: 'core'},
+            {key: 'no', component: 'core'}
+        ]).then(function(str) {
+            Notification.confirm(str[0], str[1], str[2], str[3], function() {
+                // The user confirmed.
+                studentWrapper.hide();
+                this.revokeAppointment(appId).then(function() {
+                    studentWrapper.remove();
+                    return;
+                }).fail(function(e) {
+                    studentWrapper.show();
+                    Notification.exception(e);
+                });
+            }.bind(this), function() {
+                // The user cancelled.
+            });
+        }.bind(this)).fail(Notification.exception);
+    };
+
+    /**
+     * Revoke an appointment.
+     *
+     * @param {Number} appId The appointment ID.
+     * @return {Deferred}
+     */
+    Revoker.prototype.revokeAppointment = function(appId) {
+        return Ajax.call([{
+            methodname: 'mod_scheduler_revoke_appointment',
+            args: {
+                cmid: this.cmid,
+                appointmentid: appId
+            }
+        }])[0];
+    };
+
+    return {
+        init: function(wrapperSelector, cmid) {
+            new Revoker($(wrapperSelector), cmid);
+        }
+    };
+
+});

backup/moodle2/backup_scheduler_stepslib.php

@@ -47,7 +47,7 @@ protected function define_structure() {
             'scale', 'gradingstrategy', 'bookingrouping', 'usenotes',
             'usebookingform', 'bookinginstructions', 'bookinginstructionsformat',
             'usestudentnotes', 'requireupload', 'uploadmaxfiles', 'uploadmaxsize',
-            'usecaptcha', 'timemodified'));
+            'usecaptcha', 'timemodified', 'completionattended', 'canwatch'));
 
         $slots = new backup_nested_element('slots');
 
@@ -63,13 +63,19 @@ protected function define_structure() {
             'appointmentnote', 'appointmentnoteformat', 'teachernote', 'teachernoteformat',
             'studentnote', 'studentnoteformat', 'timecreated', 'timemodified'));
 
+        $watchers = new backup_nested_element('watchers');
+        $watcher = new backup_nested_element('watcher', ['id'], ['slotid', 'userid']);
+
         // Build the tree.
 
         $scheduler->add_child($slots);
         $slots->add_child($slot);
 
         $slot->add_child($appointments);
+        $slot->add_child($watchers);
+
         $appointments->add_child($appointment);
+        $watchers->add_child($watcher);
 
         // Define sources.
         $scheduler->set_source_table('scheduler', array('id' => backup::VAR_ACTIVITYID));
@@ -79,6 +85,7 @@ protected function define_structure() {
         if ($userinfo) {
             $slot->set_source_table('scheduler_slots', array('schedulerid' => backup::VAR_PARENTID));
             $appointment->set_source_table('scheduler_appointment', array('slotid' => backup::VAR_PARENTID));
+            $watcher->set_source_table('scheduler_watcher', ['slotid' => backup::VAR_PARENTID]);
         }
 
         // Define id annotations.
@@ -87,6 +94,7 @@ protected function define_structure() {
         if ($userinfo) {
             $slot->annotate_ids('user', 'teacherid');
             $appointment->annotate_ids('user', 'studentid');
+            $watcher->annotate_ids('user', 'userid');
         }
 
         // Define file annotations.

backup/moodle2/restore_scheduler_stepslib.php

@@ -50,6 +50,7 @@ protected function define_structure() {
             $appointment = new restore_path_element('scheduler_appointment',
                                                     '/activity/scheduler/slots/slot/appointments/appointment');
             $paths[] = $appointment;
+            $paths[] = new restore_path_element('scheduler_watcher', '/activity/scheduler/slots/slot/watchers/watcher');
         }
 
         // Return the paths wrapped into standard activity structure.
@@ -133,6 +134,23 @@ protected function process_scheduler_appointment($data) {
         $this->set_mapping('scheduler_appointment', $oldid, $newitemid, true);
     }
 
+    /**
+     * Process watcher.
+     *
+     * @param stdClass $data
+     */
+    protected function process_scheduler_watcher($data) {
+        global $DB;
+
+        $data = (object)$data;
+        $oldid = $data->id;
+
+        $data->slotid = $this->get_new_parentid('scheduler_slot');
+        $data->userid = $this->get_mappingid('user', $data->userid);
+
+        $newitemid = $DB->insert_record('scheduler_watcher', $data);
+    }
+
     /**
      * after_execute
      */

bookingform.php

@@ -74,9 +74,7 @@ protected function definition() {
                                    'context' => $scheduler->get_context(),
                                    'collapsed' => true);
 
-        $this->uploadoptions = array('subdirs' => 0,
-                                     'maxbytes' => $scheduler->uploadmaxsize,
-                                     'maxfiles' => $scheduler->uploadmaxfiles);
+        $this->uploadoptions = mod_scheduler_get_student_upload_options($scheduler);
 
         // Text field for student-supplied data.
         if ($scheduler->uses_studentnotes()) {
@@ -157,24 +155,4 @@ public function prepare_booking_data(appointment $appointment) {
         return $newdata;
     }
 
-    /**
-     * save_booking_data
-     *
-     * @param stdClass $formdata
-     * @param appointment $appointment
-     */
-    public function save_booking_data(stdClass $formdata, appointment $appointment) {
-        $scheduler = $appointment->get_scheduler();
-        if ($scheduler->uses_studentnotes() && isset($formdata->studentnote_editor)) {
-            $editor = $formdata->studentnote_editor;
-            $appointment->studentnote = $editor['text'];
-            $appointment->studentnoteformat = $editor['format'];
-        }
-        if ($scheduler->uses_studentfiles()) {
-            file_save_draft_area_files($formdata->studentfiles, $scheduler->context->id,
-                                       'mod_scheduler', 'studentfiles', $appointment->id,
-                                       $this->uploadoptions);
-        }
-        $appointment->save();
-    }
 }