Fix incorrect flyout text (#396)

Author: BastianLedererIcinga

library/Notifications/Widget/Timeline/EntryFlyout.php

@@ -275,12 +275,19 @@ protected function generateAndSetRotationInfo(): static
             );
         }
 
-        if ($dateFormatter->format(new DateTime()) < $firstHandoff) {
+        $startTime = match ($this->mode) {
+            '24-7'    => $this->rotationOptions['at'],
+            'partial' => $this->rotationOptions['from'],
+            'multi'   => $this->rotationOptions['from_at'],
+        };
+
+        if (new DateTime() < DateTime::createFromFormat('Y-m-d H:i', $this->firstHandoff . ' ' . $startTime)) {
             $startText = $this->translate('Starts on %s');
         } else {
             $startText = $this->translate('Started on %s');
         }
 
+        $startTime = $timeFormatter->format(DateTime::createFromFormat('H:i', $startTime));
         $firstHandoffInfo = new HtmlElement(
             'span',
             Attributes::create(['class' => 'rotation-info-start']),
@@ -290,6 +297,11 @@ protected function generateAndSetRotationInfo(): static
             )
         );
 
+        if ($this->mode === "24-7") {
+            // Include handoff daytime in 24-7 rotations
+            $handoff .= sprintf($this->translate(' at %s'), $startTime);
+        }
+
         $handoffInterval = new HtmlElement(
             'span',
             Attributes::create(['class' => ['rotation-info-interval']]),
@@ -303,7 +315,6 @@ protected function generateAndSetRotationInfo(): static
 
         if ($this->mode === "partial") {
             $days = $this->rotationOptions["days"];
-            $from = $timeFormatter->format(DateTime::createFromFormat('H:i', $this->rotationOptions["from"]));
             $to = $timeFormatter->format(DateTime::createFromFormat('H:i', $this->rotationOptions["to"]));
             if ($days[count($days) - 1] - $days[0] === (count($days) - 1) && count($days) > 1) {
                 $daysText = sprintf(
@@ -326,14 +337,13 @@ protected function generateAndSetRotationInfo(): static
                     new HtmlElement(
                         'span',
                         Attributes::create(['class' => ['rotation-info-days']]),
-                        Text::create(sprintf('%s %s - %s, ', $daysText, $from, $to))
+                        Text::create(sprintf('%s %s - %s, ', $daysText, $startTime, $to))
                     ),
                     $handoffInterval
                 )
             )->addHtml($firstHandoffInfo);
         } elseif ($this->mode === "multi") {
             $fromDay = $weekdayNames[$this->rotationOptions["from_day"]];
-            $fromAt = $timeFormatter->format(DateTime::createFromFormat('H:i', $this->rotationOptions["from_at"]));
             $toDay = $weekdayNames[$this->rotationOptions["to_day"]];
             $toAt = $timeFormatter->format(DateTime::createFromFormat('H:i', $this->rotationOptions["to_at"]));
 
@@ -344,7 +354,7 @@ protected function generateAndSetRotationInfo(): static
                     new HtmlElement(
                         'span',
                         Attributes::create(['class' => ['rotation-info-days']]),
-                        Text::create(sprintf('%s %s - %s %s, ', $fromDay, $fromAt, $toDay, $toAt))
+                        Text::create(sprintf('%s %s - %s %s, ', $fromDay, $startTime, $toDay, $toAt))
                     ),
                     $handoffInterval
                 )