Move tabs to more

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,53 @@
+> **Note:** Please fill out all relevant sections and remove irrelevant ones.
+### 🔀 Purpose of this PR:
+
+- [ ] Fixes a bug
+- [ ] Updates for a new Moodle version
+- [ ] Adds a new feature of functionality
+- [ ] Improves or enhances existing features
+- [ ] Refactoring: restructures code for better performance or maintainability
+- [ ] Testing: add missing or improve existing tests
+- [ ] Miscellaneous: code cleaning (without functional changes), documentation, configuration, ...
+
+---
+
+### 📝 Description:
+
+Please describe the purpose of this PR in a few sentences.
+
+- What feature or bug does it address?
+- Why is this change or addition necessary?
+- What is the expected behavior after the change?
+
+---
+
+### 📋 Checklist
+
+Please confirm the following (check all that apply):
+
+- [ ] I have `phpunit` and/or `behat` tests that cover my changes or additions.
+- [ ] Code passes the code checker without errors and warnings.
+- [ ] Code passes the moodle-ci/cd pipeline on all supported Moodle versions or the ones the plugin supports.
+- [ ] Code does not have `var_dump()` or `var_export` or any other debugging statements (or commented out code) that
+  should not appear on the productive branch.
+- [ ] Code only uses language strings instead of hard-coded strings.
+- [ ] If there are changes in the database: I updated/created the necessary upgrade steps in `db/upgrade.php` and
+  updated the `version.php`.
+- [ ] If there are changes in javascript: I build new `.min` files with the `grunt amd` command.
+- [ ] If it is a Moodle update PR: I read the release notes, updated the `version.php` and the `CHANGES.md`.
+  I ran all tests thoroughly checking for errors. I checked if bootstrap had any changes/deprecations that require
+  changes in the plugins UI.
+
+---
+
+### 🔍 Related Issues
+
+- Related to #[IssueNumber]
+
+---
+
+### 🧾📸🌐 Additional Information (like screenshots, documentation, links, etc.)
+
+Any other relevant information.
+
+---

amd/src/delselected.js

@@ -26,7 +26,7 @@
  */
 export const SELECTORS = {
     DELACTION: 'div.commandbar a#delselected',
-    SELECTBOX: 'table#slotmanager input.slotselect',
+    SELECTBOX: 'table#slotmanager input.slotselect.form-check-input.mt-0',
 };
 
 /**

backup/moodle2/backup_scheduler_stepslib.php

@@ -36,30 +36,56 @@ class backup_scheduler_activity_structure_step extends backup_activity_structure
      * @return backup_nested_element
      */
     protected function define_structure() {
+        global $DB;
 
         // To know if we are including userinfo.
         $userinfo = $this->get_setting_value('userinfo');
 
+        $task = $this->get_task();
+
+        $backupinfo = $DB->get_record(
+            'backup_controllers',
+            ['backupid' => $task->get_backupid()],
+            'type, purpose, interactive',
+            MUST_EXIST
+        );
+
+        $isduplicate = $backupinfo->type === backup::TYPE_1ACTIVITY
+        && (int) $backupinfo->purpose === backup::MODE_IMPORT
+        && (bool) $backupinfo->interactive === backup::INTERACTIVE_NO;
+
+        $copyslots = false;
+        if ($isduplicate) {
+            $copyslots = (bool) $DB->get_field(
+                'scheduler',
+                'copyslotsonduplicate',
+                ['id' => $task->get_activityid()],
+                MUST_EXIST
+            );
+        }
+
+        $includeslots = $userinfo || $copyslots;
+
         // Define each element separated.
         $scheduler = new backup_nested_element('scheduler', ['id'], [
             'name', 'intro', 'introformat', 'schedulermode', 'maxbookings',
             'guardtime', 'defaultslotduration', 'allownotifications', 'staffrolename',
-            'scale', 'gradingstrategy', 'bookingrouping', 'usenotes',
+            'scale', 'gradingstrategy', 'bookingrouping', 'bookingtype', 'usenotes',
             'usebookingform', 'bookinginstructions', 'bookinginstructionsformat',
             'usestudentnotes', 'requireupload', 'uploadmaxfiles', 'uploadmaxsize',
-            'usecaptcha', 'timemodified', ]);
+            'usecaptcha', 'timemodified', 'groupcreation', 'copyslotsonduplicate', ]);
 
         $slots = new backup_nested_element('slots');
 
         $slot = new backup_nested_element('slot', ['id'], [
-            'starttime', 'duration', 'teacherid', 'appointmentlocation',
+            'starttime', 'duration', 'teacherid', 'appointmentlocation', 'meetingurl',
             'timemodified', 'notes', 'notesformat', 'exclusivity',
-            'emaildate', 'hideuntil', ]);
+            'emaildate', 'hideuntil', 'coursegroupid', ]);
 
         $appointments = new backup_nested_element('appointments');
 
         $appointment = new backup_nested_element('appointment', ['id'], [
-            'studentid', 'attended', 'grade',
+            'studentid', 'bookinggroupid', 'attended', 'grade',
             'appointmentnote', 'appointmentnoteformat', 'teachernote', 'teachernoteformat',
             'studentnote', 'studentnoteformat', 'timecreated', 'timemodified', ]);
 
@@ -75,18 +101,26 @@ protected function define_structure() {
         $scheduler->set_source_table('scheduler', ['id' => backup::VAR_ACTIVITYID]);
         $scheduler->annotate_ids('grouping', 'bookingrouping');
 
-        // Include appointments only if we back up user information.
-        if ($userinfo) {
+        // Include slots when backing up user data or explicitly copying slots.
+        if ($includeslots) {
             $slot->set_source_table('scheduler_slots', ['schedulerid' => backup::VAR_PARENTID]);
+        }
+
+        // Include bookings and personal appointment data only with user data.
+        if ($userinfo) {
             $appointment->set_source_table('scheduler_appointment', ['slotid' => backup::VAR_PARENTID]);
         }
 
         // Define id annotations.
         $scheduler->annotate_ids('scale', 'scale');
 
+        if ($includeslots) {
+            $slot->annotate_ids('group', 'coursegroupid');
+        }
         if ($userinfo) {
             $slot->annotate_ids('user', 'teacherid');
             $appointment->annotate_ids('user', 'studentid');
+            $appointment->annotate_ids('group', 'bookinggroupid');
         }
 
         // Define file annotations.

backup/moodle2/restore_scheduler_stepslib.php

@@ -30,14 +30,51 @@
  */
 class restore_scheduler_activity_structure_step extends restore_activity_structure_step
 {
+    /** @var bool Whether this is a duplication within the same course. */
+    protected $isduplicate = false;
+
+    /** @var bool Whether slots may be copied without appointment data. */
+    protected $copyslots = false;
+
     /**
      * define_structure
      *
      * @return array
      */
     protected function define_structure() {
+        global $DB;
+
+        $userinfo = $this->get_setting_value('userinfo');
+        $task = $this->get_task();
+
+        $restoreinfo = $DB->get_record(
+            'backup_controllers',
+            ['backupid' => $task->get_restoreid()],
+            'type, purpose, interactive',
+            MUST_EXIST
+        );
+
+        $this->isduplicate =
+                $restoreinfo->type === backup::TYPE_1ACTIVITY
+                && (int) $restoreinfo->purpose === backup::MODE_IMPORT
+                && (bool) $restoreinfo->interactive === backup::INTERACTIVE_NO
+                && $task->is_samesite()
+                && (int) $task->get_old_courseid() === (int) $this->get_courseid();
+
+        $paths = [new restore_path_element('scheduler', '/activity/scheduler')];
+        if ($userinfo || $this->isduplicate) {
+            $paths[] = new restore_path_element('scheduler_slot', '/activity/scheduler/slots/slot');
+        }
+
+        if ($userinfo) {
+            $paths[] = new restore_path_element(
+                'scheduler_appointment',
+                '/activity/scheduler/slots/slot/appointments/appointment'
+            );
+        }
+
+        return $this->prepare_activity_structure($paths);
 
-        $paths = [];
         $userinfo = $this->get_setting_value('userinfo');
 
         $scheduler = new restore_path_element('scheduler', '/activity/scheduler');
@@ -80,10 +117,27 @@ protected function process_scheduler($data) {
             $data->gradingstrategy = 0;
         }
 
+        if (!isset($data->bookingtype)) {
+            $data->bookingtype = get_config('mod_scheduler', 'mixindivgroup') ? 1 : 2;
+        }
+
         if ($data->bookingrouping > 0) {
-            $data->bookingrouping = $this->get_mappingid('grouping', $data->bookingrouping);
+            if ($this->isduplicate) {
+                $DB->get_record(
+                    'groupings',
+                    ['id' => $data->bookingrouping, 'courseid' => $this->get_courseid()],
+                    'id',
+                    MUST_EXIST
+                );
+            } else {
+                $data->bookingrouping = $this->get_mappingid('grouping', $data->bookingrouping);
+            }
         }
 
+        $data->groupcreation = (int) ($data->groupcreation ?? 0);
+        $data->copyslotsonduplicate = (int) ($data->copyslotsonduplicate ?? 0);
+        $this->copyslots = $this->isduplicate && !empty($data->copyslotsonduplicate);
+
         // Insert the scheduler record.
         $newitemid = $DB->insert_record('scheduler', $data);
         // Immediately after inserting "activity" record, call this.
@@ -98,16 +152,50 @@ protected function process_scheduler($data) {
     protected function process_scheduler_slot($data) {
         global $DB;
 
+        $userinfo = $this->get_setting_value('userinfo');
+        if (!$userinfo && !$this->copyslots) {
+            return self::SKIP_ALL_CHILDREN;
+        }
         $data = (object)$data;
+        $data->meetingurl = $data->meetingurl ?? '';
         $oldid = $data->id;
 
         $data->schedulerid = $this->get_new_parentid('scheduler');
         $data->starttime = $this->apply_date_offset($data->starttime);
         $data->timemodified = $this->apply_date_offset($data->timemodified);
         $data->emaildate = $this->apply_date_offset($data->emaildate);
         $data->hideuntil = $this->apply_date_offset($data->hideuntil);
-
-        $data->teacherid = $this->get_mappingid('user', $data->teacherid);
+        if ($this->copyslots && !$userinfo) {
+            // Same-site, same-course duplication retains existing references.
+            if (!empty($data->teacherid)) {
+                $DB->get_record(
+                    'user',
+                    ['id' => $data->teacherid, 'deleted' => 0],
+                    'id',
+                    MUST_EXIST
+                );
+            }
+
+            $data->coursegroupid = (int) ($data->coursegroupid ?? 0);
+
+            if ($data->coursegroupid > 0) {
+                $DB->get_record(
+                    'groups',
+                    [
+                                'id' => $data->coursegroupid,
+                                'courseid' => $this->get_courseid(),
+                        ],
+                    'id',
+                    MUST_EXIST
+                );
+            }
+        } else {
+            $data->teacherid = $this->get_mappingid('user', $data->teacherid);
+
+            $data->coursegroupid = !empty($data->coursegroupid)
+                    ? $this->get_mappingid('group', $data->coursegroupid, 0)
+                    : 0;
+        }
 
         $newitemid = $DB->insert_record('scheduler_slots', $data);
         $this->set_mapping('scheduler_slot', $oldid, $newitemid, true);
@@ -131,6 +219,9 @@ protected function process_scheduler_appointment($data) {
 
         $data->studentid = $this->get_mappingid('user', $data->studentid);
 
+        $data->bookinggroupid = !empty($data->bookinggroupid)
+            ? $this->get_mappingid('group', $data->bookinggroupid, 0) : 0;
+
         $newitemid = $DB->insert_record('scheduler_appointment', $data);
         $this->set_mapping('scheduler_appointment', $oldid, $newitemid, true);
     }