Proper timezone handling for schedules

application/controllers/ScheduleController.php

@@ -4,14 +4,19 @@
 
 namespace Icinga\Module\Notifications\Controllers;
 
+use DateTime;
+use DateTimeZone;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\MoveRotationForm;
 use Icinga\Module\Notifications\Forms\RotationConfigForm;
 use Icinga\Module\Notifications\Forms\ScheduleForm;
 use Icinga\Module\Notifications\Model\Schedule;
-use Icinga\Module\Notifications\Widget\RecipientSuggestions;
+use Icinga\Module\Notifications\Web\Control\TimezonePicker;
 use Icinga\Module\Notifications\Widget\Detail\ScheduleDetail;
+use Icinga\Module\Notifications\Widget\RecipientSuggestions;
+use Icinga\Module\Notifications\Widget\TimezoneWarning;
+use Icinga\Web\Session;
 use ipl\Html\Form;
 use ipl\Html\Html;
 use ipl\Stdlib\Filter;
@@ -55,8 +60,18 @@ public function indexAction(): void
             })
             ->handleRequest($this->getServerRequest());
 
+        $timezonePicker = $this->createTimezonePicker($schedule->timezone, $id);
+
+        $this->addControl($timezonePicker);
         $this->addControl($scheduleControls);
-        $this->addContent(new ScheduleDetail($schedule, $scheduleControls));
+        $this->addContent(new ScheduleDetail(
+            $schedule,
+            $scheduleControls,
+            new DateTime('today', new DateTimeZone(
+                $timezonePicker->getValue(TimezonePicker::DEFAULT_TIMEZONE_PARAM)
+                    ?? $this->getDisplayTimezoneFromSession($schedule->timezone)
+            )),
+        ));
     }
 
     public function settingsAction(): void
@@ -92,7 +107,8 @@ public function addAction(): void
     {
         $this->setTitle($this->translate('New Schedule'));
         $form = (new ScheduleForm(Database::get()))
-            ->setAction($this->getRequest()->getUrl()->getAbsoluteUrl())
+            ->setShowTimezoneSuggestionInput()
+            ->setAction($this->getRequest()->getUrl()->setParam('showCompact')->getAbsoluteUrl())
             ->on(Form::ON_SUCCESS, function (ScheduleForm $form) {
                 $scheduleId = $form->addSchedule();
 
@@ -108,9 +124,15 @@ public function addAction(): void
     public function addRotationAction(): void
     {
         $scheduleId = (int) $this->params->getRequired('schedule');
+        $scheduleTimezone = $this->getScheduleTimezone($scheduleId);
+        $displayTimezone = $this->getDisplayTimezoneFromSession($scheduleTimezone);
         $this->setTitle($this->translate('Add Rotation'));
 
-        $form = new RotationConfigForm($scheduleId, Database::get());
+        if ($displayTimezone !== $scheduleTimezone) {
+            $this->addContent(new TimezoneWarning($scheduleTimezone));
+        }
+
+        $form = new RotationConfigForm($scheduleId, Database::get(), $displayTimezone, $scheduleTimezone);
         $form->setAction($this->getRequest()->getUrl()->setParam('showCompact')->getAbsoluteUrl());
         $form->setSuggestionUrl(Url::fromPath('notifications/schedule/suggest-recipient'));
         $form->on(RotationConfigForm::ON_SENT, function ($form) {
@@ -141,9 +163,15 @@ public function editRotationAction(): void
     {
         $id = (int) $this->params->getRequired('id');
         $scheduleId = (int) $this->params->getRequired('schedule');
+        $scheduleTimezone = $this->getScheduleTimezone($scheduleId);
+        $displayTimezone = $this->getDisplayTimezoneFromSession($scheduleTimezone);
         $this->setTitle($this->translate('Edit Rotation'));
 
-        $form = new RotationConfigForm($scheduleId, Database::get());
+        if ($displayTimezone !== $scheduleTimezone) {
+            $this->addContent(new TimezoneWarning($scheduleTimezone));
+        }
+
+        $form = new RotationConfigForm($scheduleId, Database::get(), $displayTimezone, $scheduleTimezone);
         $form->disableModeSelection();
         $form->setShowRemoveButton();
         $form->loadRotation($id);
@@ -204,4 +232,71 @@ public function suggestRecipientAction(): void
 
         $this->getDocument()->addHtml($suggestions);
     }
+
+    /**
+     * Get the timezone of a schedule
+     *
+     * @param int $scheduleId The ID of the schedule
+     *
+     * @return string The timezone of the schedule
+     */
+    protected function getScheduleTimezone(int $scheduleId): string
+    {
+        return Schedule::on(Database::get())
+            ->filter(Filter::equal('schedule.id', $scheduleId))
+            ->first()
+            ->timezone;
+    }
+
+    /**
+     * Create a timezone picker control
+     *
+     * @param string $scheduleTimezone The schedule timezone is used as default if no timezone is in the session
+     * @param int    $scheduleId       The schedule id
+     *
+     * @return TimezonePicker The timezone picker control
+     */
+    protected function createTimezonePicker(string $scheduleTimezone, int $scheduleId): TimezonePicker
+    {
+        $defaultTimezoneParam = TimezonePicker::DEFAULT_TIMEZONE_PARAM;
+        return (new TimezonePicker())
+            ->populate([
+                $defaultTimezoneParam => $this->params->get($defaultTimezoneParam)
+                    ?? $this->getDisplayTimezoneFromSession($scheduleTimezone)
+            ])
+            ->on(
+                TimezonePicker::ON_SUBMIT,
+                function (TimezonePicker $timezonePicker) use ($defaultTimezoneParam, $scheduleId, $scheduleTimezone) {
+                    $this->writeDisplayTimezoneToSession($timezonePicker->getValue($defaultTimezoneParam));
+                    $this->redirectNow(Links::schedule($scheduleId)->with([
+                        $defaultTimezoneParam => $timezonePicker->getValue($defaultTimezoneParam)
+                    ]));
+                }
+            )
+            ->handleRequest($this->getServerRequest());
+    }
+
+    /**
+     * Get the display timezone from the session
+     *
+     * @param string|null $defaultTimezone
+     *
+     * @return string
+     */
+    protected function getDisplayTimezoneFromSession(?string $defaultTimezone = null): string
+    {
+        return Session::getSession()->getNamespace('notifications')->get('schedule.display_timezone', $defaultTimezone);
+    }
+
+    /**
+     * Write the display timezone to the session
+     *
+     * @param string $displayTimezone
+     *
+     * @return void
+     */
+    protected function writeDisplayTimezoneToSession(string $displayTimezone): void
+    {
+        Session::getSession()->getNamespace('notifications')->set('schedule.display_timezone', $displayTimezone);
+    }
 }

application/controllers/SchedulesController.php

@@ -4,16 +4,12 @@
 
 namespace Icinga\Module\Notifications\Controllers;
 
-use DateTime;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Model\Schedule;
 use Icinga\Module\Notifications\View\ScheduleRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
-use Icinga\Module\Notifications\Widget\TimeGrid\DaysHeader;
-use ipl\Html\Attributes;
-use ipl\Html\HtmlElement;
 use ipl\Stdlib\Filter;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
@@ -78,12 +74,6 @@ public function indexAction(): void
             ))->openInModal()
         );
 
-        $this->addContent(new HtmlElement(
-            'div',
-            Attributes::create(['class' => 'schedules-header']),
-            new DaysHeader((new DateTime())->setTime(0, 0), 7)
-        ));
-
         $this->addContent(new ObjectList($schedules, new ScheduleRenderer()));
 
         if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {

application/controllers/SuggestController.php

@@ -0,0 +1,35 @@
+<?php
+
+/* Icinga Notifications Web | (c) 2025 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Notifications\Controllers;
+
+use DateTime;
+use DateTimeZone;
+use IntlTimeZone;
+use ipl\Web\Compat\CompatController;
+use ipl\Web\FormElement\SearchSuggestions;
+use Throwable;
+
+class SuggestController extends CompatController
+{
+    public function timezoneAction(): void
+    {
+        $suggestions = new SearchSuggestions((function () use (&$suggestions) {
+            foreach (IntlTimeZone::createEnumeration() as $tz) {
+                try {
+                    if (
+                        (new DateTime('now', new DateTimeZone($tz)))->getTimezone()->getLocation()
+                        && $suggestions->matchSearch($tz)
+                    ) {
+                        yield ['search' => $tz];
+                    }
+                } catch (Throwable) {
+                    continue;
+                }
+            }
+        })());
+
+        $this->getDocument()->addHtml($suggestions->forRequest($this->getServerRequest()));
+    }
+}

application/forms/RotationConfigForm.php

@@ -6,6 +6,7 @@
 
 use DateInterval;
 use DateTime;
+use DateTimeZone;
 use Generator;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\Http\HttpNotFoundException;
@@ -80,6 +81,12 @@ class RotationConfigForm extends CompatForm
     /** @var int The rotation id */
     protected $rotationId;
 
+    /** @var string The timezone to display the timeline in */
+    protected $displayTimezone;
+
+    /** @var string The timezone the schedule is created in */
+    protected $scheduleTimezone;
+
     /**
      * Set the label for the submit button
      *
@@ -187,11 +194,15 @@ public function hasBeenWiped(): bool
      *
      * @param int $scheduleId
      * @param Connection $db
+     * @param string $displayTimezone
+     * @param string $scheduleTimezone
      */
-    public function __construct(int $scheduleId, Connection $db)
+    public function __construct(int $scheduleId, Connection $db, string $displayTimezone, string $scheduleTimezone)
     {
         $this->db = $db;
         $this->scheduleId = $scheduleId;
+        $this->displayTimezone = $displayTimezone;
+        $this->scheduleTimezone = $scheduleTimezone;
 
         $this->applyDefaultElementDecorators();
     }
@@ -227,7 +238,11 @@ public function loadRotation(int $rotationId): self
                         throw new LogicException('Invalid mode');
                 }
 
-                $handoff = DateTime::createFromFormat('Y-m-d H:i', $rotation->first_handoff . ' ' . $time);
+                $handoff = DateTime::createFromFormat(
+                    'Y-m-d H:i',
+                    $rotation->first_handoff . ' ' . $time,
+                    new DateTimeZone($this->scheduleTimezone)
+                );
                 if ($handoff === false) {
                     throw new ConfigurationError('Invalid date format');
                 }
@@ -258,7 +273,9 @@ public function loadRotation(int $rotationId): self
                 ->orderBy('until_time', SORT_DESC)
                 ->first();
             if ($previousShift !== null) {
-                $this->previousShift = $previousShift->until_time;
+                $this->previousShift = $previousShift->until_time->setTimezone(
+                    new DateTimeZone($this->scheduleTimezone)
+                );
             }
 
             /** @var ?Rotation $newerRotation */
@@ -452,6 +469,9 @@ public function editRotation(int $rotationId): void
                 ->filter(Filter::equal('timeperiod.owned_by_rotation_id', $rotationId));
 
             foreach ($timeperiodEntries as $timeperiodEntry) {
+                $timeperiodEntry->start_time->setTimezone(new DateTimeZone($this->scheduleTimezone));
+                $timeperiodEntry->end_time->setTimezone(new DateTimeZone($this->scheduleTimezone));
+
                 /** @var TimeperiodEntry $timeperiodEntry */
                 $rrule = $timeperiodEntry->toRecurrenceRule();
                 $shiftDuration = $timeperiodEntry->start_time->diff($timeperiodEntry->end_time);
@@ -819,9 +839,10 @@ protected function assemblePartialDayOptions(FieldsetElement $options): DateTime
             ->replaceDecorator('Description', DescriptionDecorator::class, ['class' => 'description']);
 
         $selectedFromTime = $from->getValue();
+        $nextDayTimeOptions = [];
         foreach ($timeOptions as $key => $value) {
-            unset($timeOptions[$key]); // unset to re-add it at the end of array
-            $timeOptions[$key] = sprintf('%s (%s)', $value, $this->translate('Next Day'));
+            unset($timeOptions[$key]);
+            $nextDayTimeOptions[$key] = $value;
 
             if ($selectedFromTime === $key) {
                 break;
@@ -830,7 +851,9 @@ protected function assemblePartialDayOptions(FieldsetElement $options): DateTime
 
         $to = $options->createElement('select', 'to', [
             'required' => true,
-            'options' => $timeOptions
+            'options' => empty($timeOptions)
+                ? [$this->translate('Next Day') => $nextDayTimeOptions]
+                : [$this->translate('Same Day') => $timeOptions, $this->translate('Next Day') => $nextDayTimeOptions]
         ]);
         $options->registerElement($to);
 
@@ -1226,11 +1249,35 @@ function ($value, $validator) use ($earliestHandoff, $firstHandoff, $latestHando
                             (new \IntlDateFormatter(
                                 \Locale::getDefault(),
                                 \IntlDateFormatter::MEDIUM,
-                                \IntlDateFormatter::SHORT
+                                \IntlDateFormatter::SHORT,
+                                $this->scheduleTimezone
                             ))->format($actualFirstHandoff)
                         );
                     }
-                })
+                }),
+                new HtmlElement('br'),
+                $this->displayTimezone !== $this->scheduleTimezone ? DeferredText::create(function () {
+                    $ruleGenerator = $this->yieldRecurrenceRules(1);
+                    if (! $ruleGenerator->valid()) {
+                        return '';
+                    }
+
+                    $actualFirstHandoff = $ruleGenerator->current()[0]->getStartDate();
+                    if ($actualFirstHandoff < new DateTime()) {
+                        return '';
+                    } else {
+                        return sprintf(
+                            $this->translate('In your chosen display timezone (%s) this is the %s'),
+                            $this->displayTimezone,
+                            (new \IntlDateFormatter(
+                                \Locale::getDefault(),
+                                \IntlDateFormatter::MEDIUM,
+                                \IntlDateFormatter::SHORT,
+                                $this->displayTimezone
+                            ))->format($actualFirstHandoff)
+                        );
+                    }
+                }) : new HtmlDocument()
             ));
         }
 
@@ -1293,12 +1340,13 @@ private function parseDateAndTime(?string $date = null, ?string $time = null): D
         }
 
         if (! $format) {
-            return (new DateTime())->setTime(0, 0);
+            return new DateTime('today', new DateTimeZone($this->scheduleTimezone));
         }
 
-        $datetime = DateTime::createFromFormat($format, $expression);
+        $datetime = DateTime::createFromFormat($format, $expression, new DateTimeZone($this->scheduleTimezone));
+
         if ($datetime === false) {
-            $datetime = (new DateTime())->setTime(0, 0);
+            $datetime = new DateTime('today', $this->scheduleTimezone);
         } elseif ($time === null) {
             $datetime->setTime(0, 0);
         }
@@ -1316,11 +1364,12 @@ private function getTimeOptions(): array
         $formatter = new \IntlDateFormatter(
             \Locale::getDefault(),
             \IntlDateFormatter::NONE,
-            \IntlDateFormatter::SHORT
+            \IntlDateFormatter::SHORT,
+            $this->scheduleTimezone
         );
 
         $options = [];
-        $dt = new DateTime();
+        $dt = new DateTime('now', new DateTimeZone($this->scheduleTimezone));
         for ($hour = 0; $hour < 24; $hour++) {
             for ($minute = 0; $minute < 60; $minute += 30) {
                 $dt->setTime($hour, $minute);