3 files changed, 8 insertions, 23 deletions

diff --git a/src/view/CalendarBuilder.php b/src/view/CalendarBuilder.php
index 65592f8..bdabcd2 100644
--- a/src/view/CalendarBuilder.php
+++ b/src/view/CalendarBuilder.php
@@ -11,6 +11,8 @@ class CalendarBuilder extends AbstractBuilder
     {
         parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
+
+        $calendar_js_file = $_SESSION['admin'] ? 'calendar_admin' : 'calendar';
         
         if(file_exists($viewFile))
         {
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index 16bf2b6..76d8d9d 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -64,9 +64,9 @@ class HeadBuilder extends AbstractBuilder
     {
         return '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";
     }
-    static function insertJS(string $name): string
+    static function insertJS(string $name, bool $module = false): string
     {
-        return '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
+        return '<script ' . ($module ? 'type="module"' : '') . ' src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
     }
 
     static function versionedFileURL(string $type, string $filename): string
diff --git a/src/view/templates/calendar.php b/src/view/templates/calendar.php
index 685bd56..18f68f2 100644
--- a/src/view/templates/calendar.php
+++ b/src/view/templates/calendar.php
@@ -1,25 +1,8 @@
-<?php
-declare(strict_types=1);
-
-$calendar_js_files = [
-    'fullcalendar/packages/core/index.global.min',
-    'fullcalendar/packages/daygrid/index.global.min',
-    'fullcalendar/packages/timegrid/index.global.min',
-    'fullcalendar/packages/list/index.global.min',
-    'fullcalendar/packages/interaction/index.global.min',
-    'fullcalendar/packages/core/locales/fr.global.min'
-];
-if($_SESSION['admin'] === true){
-    $calendar_js_files[] = 'calendar_admin';
-}
-else{
-    $calendar_js_files[] = 'calendar';
-}
-?>
+<?php declare(strict_types=1); ?>
 <section class="calendar" id="<?= $this->id_node ?>">
-<?php foreach($calendar_js_files as $file){
-    echo HeadBuilder::insertJS($file);
-} ?>
+    <?= HeadBuilder::insertJS('fullcalendar/index.global.min') ?>
+    <?= HeadBuilder::insertJS('fullcalendar/fr.global.min') ?>
+    <?= HeadBuilder::insertJS($calendar_js_file) ?>
         <h3><?= $title ?></h3>
         <div id="calendar_zone">
         <div id="calendar"></div>