Feature/calendar dev

.gitignore

@@ -0,0 +1,12 @@
+.DS_Store
+Thumbs.db
+*.log
+*.tmp
+*.swp
+*.swo
+.env*
+.idea/
+.vscode/
+node_modules/
+vendor/
+*.cache

admin/checklist.php

@@ -23,6 +23,7 @@
  */
 
 use mod_bookit\form\settings_checklist_form;
+use mod_bookit\local\install_helper;
 use mod_bookit\local\tabs;
 
 require_once(__DIR__ . '/../../../config.php');
@@ -41,6 +42,10 @@
 $returnurl = new moodle_url('/mod/bookit/admin/checklist.php');
 
 require_capability('mod/bookit:managemasterchecklist', $context); // XXX TODO: use other capability.
+if (!install_helper::is_checklist_enabled()) {
+    $settingsurl = new moodle_url('/admin/settings.php', ['section' => 'modsettingbookit']);
+    redirect($settingsurl, get_string('optional_part_disabled', 'mod_bookit'), null, \core\output\notification::NOTIFY_WARNING);
+}
 
 $mform = new settings_checklist_form();
 

admin/install_helper_run.php

@@ -28,19 +28,65 @@
 require_once($CFG->libdir . '/adminlib.php');
 
 require_admin();
+require_sesskey();
 
-// Mark installation helper as finished first to avoid session mutation issues.
-set_config('installhelperfinished', 1, 'mod_bookit');
+/**
+ * Resolve the combined setup outcome across baseline and role import reports.
+ *
+ * @param string[] $statuses
+ * @return string
+ */
+function mod_bookit_resolve_install_helper_status(array $statuses): string {
+    $statuses = array_values(array_unique($statuses));
+    if (in_array('failed', $statuses, true)) {
+        return count($statuses) > 1 ? 'partial' : 'failed';
+    }
+    if (in_array('partial', $statuses, true)) {
+        return 'partial';
+    }
+    if (in_array('success', $statuses, true)) {
+        return 'success';
+    }
+    return 'idempotent';
+}
 
-// Run the installation helper.
-$rolesimported = install_helper::import_default_roles(false, false);
-$usersimported = install_helper::import_default_users(false, false);
-$result = install_helper::create_default_checklists(false, false); // Creates rooms as well.
-$resourcesresult = install_helper::create_default_resources(false, false);
-$weekplanresult = install_helper::create_default_weekplan(false, false);
-$courseresult = install_helper::create_default_course_and_activity(false, false);
-$eventsresult = install_helper::create_default_events(false, false);
+$rolereport = install_helper::import_default_roles_with_report(false, false);
+$baselinereport = install_helper::ensure_fresh_install_baseline(false);
+$status = mod_bookit_resolve_install_helper_status([
+    $rolereport['status'],
+    $baselinereport['status'],
+]);
+
+if (in_array($baselinereport['status'], ['success', 'idempotent'], true)) {
+    set_config('installhelperfinished', 1, 'mod_bookit');
+} else {
+    set_config('installhelperfinished', 0, 'mod_bookit');
+}
+
+$details = array_merge($rolereport['errors'], $baselinereport['errors']);
+$baselinecreated = 0;
+$baselineverified = 0;
+foreach ($baselinereport['operations'] as $operation) {
+    if (($operation['status'] ?? '') === 'created') {
+        $baselinecreated++;
+    } else if (($operation['status'] ?? '') === 'idempotent') {
+        $baselineverified++;
+    }
+}
 
 // Redirect back to settings.
-$returnurl = new moodle_url('/admin/settings.php', ['section' => 'modsettingbookit']);
-redirect($returnurl, 'Installation helper completed successfully.');
+$params = [
+    'section' => 'modsettingbookit',
+    'installhelperstatus' => $status,
+    'rolesimported' => count($rolereport['imported']),
+    'rolesskipped' => count($rolereport['skipped']),
+    'baselinecreated' => $baselinecreated,
+    'baselineverified' => $baselineverified,
+    'installhelpererrors' => count($details),
+];
+if (!empty($details)) {
+    $params['installhelperdetails'] = implode(' | ', $details);
+}
+
+$returnurl = new moodle_url('/admin/settings.php', $params);
+redirect($returnurl);

admin/master_checklist.php

@@ -25,6 +25,7 @@
 
 use mod_bookit\local\manager\checklist_manager;
 use mod_bookit\local\entity\masterchecklist\bookit_checklist_master;
+use mod_bookit\local\install_helper;
 use mod_bookit\local\tabs;
 
 require_once(__DIR__ . '/../../../config.php');
@@ -34,6 +35,10 @@
 
 require_login();
 require_capability('mod/bookit:managemasterchecklist', $context);
+if (!install_helper::is_checklist_enabled()) {
+    $settingsurl = new moodle_url('/admin/settings.php', ['section' => 'modsettingbookit']);
+    redirect($settingsurl, get_string('optional_part_disabled', 'mod_bookit'), null, \core\output\notification::NOTIFY_WARNING);
+}
 
 $PAGE->set_context($context);
 $PAGE->set_url(new moodle_url('/mod/bookit/admin/master_checklist.php'));

admin/resources.php

@@ -23,6 +23,7 @@
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+use mod_bookit\local\install_helper;
 use mod_bookit\local\tabs;
 
 require_once(__DIR__ . '/../../../config.php');
@@ -32,6 +33,10 @@
 
 require_login();
 require_capability('mod/bookit:managebasics', $context);
+if (!install_helper::is_resources_enabled()) {
+    $settingsurl = new moodle_url('/admin/settings.php', ['section' => 'modsettingbookit']);
+    redirect($settingsurl, get_string('optional_part_disabled', 'mod_bookit'), null, \core\output\notification::NOTIFY_WARNING);
+}
 
 $PAGE->set_context($context);
 $PAGE->set_url(new moodle_url('/mod/bookit/admin/resources.php', ['id' => 'resources']));

admin/view_room.php

@@ -57,12 +57,15 @@
 $PAGE->requires->js(new moodle_url('/mod/bookit/thirdpartylibs/event-calendar/event-calendar.min.js'), true);
 $PAGE->requires->css(new moodle_url('/mod/bookit/thirdpartylibs/event-calendar/event-calendar.min.css'));
 $PAGE->requires->css(new moodle_url('/mod/bookit/thirdpartylibs/event-calendar/custom-calendar.min.css'));
-$eventsource = (new moodle_url('/mod/bookit/events_available.php', ['roomid' => $room->get('id')]))->out(false);
+$roomreadconfig = [
+    'methodname' => 'mod_bookit_get_room_availability',
+    'roomid' => (int)$room->get('id'),
+];
 $PAGE->requires->js_call_amd(
     'mod_bookit/available_calendar',
     'init',
     [
-        $eventsource,
+        $roomreadconfig,
         [],
         current_language(),
     ]