Fix "now" indicator in reservation calendar

fixes #15929
glpi-project · Apr 15, 2024 · 59187df · 59187df
1 parent c6ee99a
commit 59187df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/js/reservations.js b/js/reservations.js
@@ -44,6 +44,7 @@ var Reservations = function() {
     this.currentv    = null;
     this.defaultDate = null;
     this.can_reserve = true;
+    this.now         = null;
 
     var my = this;
 
@@ -60,13 +61,15 @@ var Reservations = function() {
         if (config.can_reserve != undefined) {
             my.can_reserve = config.can_reserve;
         }
+        my.now          = config.now || null;
     };
 
     my.displayPlanning = function() {
         my.calendar = new FullCalendar.Calendar(document.getElementById(my.dom_id), {
             schedulerLicenseKey: my.license_key,
             timeZone: 'UTC',
             nowIndicator: true,
+            now: my.now,// as we set the calendar as UTC, we need to reprecise the current datetime
             theme: true,
             editable: true,
             defaultDate: my.defaultDate,

diff --git a/src/Reservation.php b/src/Reservation.php
@@ -565,6 +565,7 @@ public static function showCalendar(int $ID = 0)
             Session::haveRight("reservation", ReservationItem::RESERVEANITEM)
             && count(self::getReservableItemtypes()) > 0
         ) ? "true" : "false";
+        $now = date("Y-m-d H:i:s");
         $js = <<<JAVASCRIPT
       $(function() {
          var reservation = new Reservations();
@@ -574,6 +575,7 @@ public static function showCalendar(int $ID = 0)
             rand: $rand,
             license_key: '$scheduler_key',
             can_reserve: $can_reserve,
+            now: '$now',
          });
          reservation.displayPlanning();
       });
@@ -1144,6 +1146,7 @@ public static function showForItem(CommonDBTM $item, $withtemplate = 0)
         if (isset($_REQUEST['defaultDate'])) {
             $defaultDate = $_REQUEST['defaultDate'];
         }
+        $now = date("Y-m-d H:i:s");
         $js = <<<JAVASCRIPT
       $(function() {
          var reservation = new Reservations();
@@ -1155,6 +1158,7 @@ public static function showForItem(CommonDBTM $item, $withtemplate = 0)
             currentv: 'listFull',
             defaultDate: '$defaultDate',
             license_key: '$scheduler_key',
+            now: '$now',
          });
          reservation.displayPlanning();
       });