Adjust timezones for experimental parts

Author: jrauh01

application/forms/RotationConfigForm.php

@@ -230,7 +230,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->displayTimezone)
+                );
                 if ($handoff === false) {
                     throw new ConfigurationError('Invalid date format');
                 }
@@ -261,7 +265,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->displayTimezone)
+                );
             }
 
             /** @var ?Rotation $newerRotation */
@@ -455,6 +461,9 @@ public function editRotation(int $rotationId): void
                 ->filter(Filter::equal('timeperiod.owned_by_rotation_id', $rotationId));
 
             foreach ($timeperiodEntries as $timeperiodEntry) {
+                $timeperiodEntry->start_time->setTimezone($this->getScheduleTimezone());
+                $timeperiodEntry->end_time->setTimezone($this->getScheduleTimezone());
+
                 /** @var TimeperiodEntry $timeperiodEntry */
                 $rrule = $timeperiodEntry->toRecurrenceRule();
                 $shiftDuration = $timeperiodEntry->start_time->diff($timeperiodEntry->end_time);

library/Notifications/Widget/Timeline/Rotation.php

@@ -81,9 +81,11 @@ public function getPriority(): int
      */
     public function fetchTimeperiodEntries(DateTime $after, DateTime $until): Generator
     {
+        $scheduleTimezone = new DateTimeZone($this->model->schedule->execute()->current()->timezone);
+
         $actualHandoff = null;
         if (RotationConfigForm::EXPERIMENTAL_OVERRIDES) {
-            $actualHandoff = $this->model->actual_handoff;
+            $actualHandoff = $this->model->actual_handoff->setTimezone($scheduleTimezone);
         }
 
         $entries = $this->model->timeperiod->timeperiod_entry
@@ -99,7 +101,6 @@ public function fetchTimeperiodEntries(DateTime $after, DateTime $until): Genera
                 )
             ));
         foreach ($entries as $timeperiodEntry) {
-            $scheduleTimezone = new DateTimeZone($this->model->schedule->execute()->current()->timezone);
             $timeperiodEntry->start_time->setTimezone($scheduleTimezone);
             $timeperiodEntry->end_time->setTimezone($scheduleTimezone);