RotationConfigForm: Add end of day time option to multi day mode

Author: sukhwinder33445

application/forms/RotationConfigForm.php

@@ -895,18 +895,14 @@ protected function assembleMultiDayOptions(FieldsetElement $options): DateTime
             $toDays[$i] = sprintf('%s (%s)', $day, $this->translate('Next week'));
         }
 
-        $options->addElement('hidden', 'to_day');
-        $options->addElement('hidden', 'to_at');
-
-        $options->addElement('select', 'to_day_ignored', [
+        $options->addElement('select', 'to_day', [
             'class' => 'autosubmit',
             'required' => true,
-            'ignore' => true,
             'options' => $toDays,
-            'value' => $options->getValue('to_day', 7),
+            'value' => 7,
             'label' => $this->translate('To', 'notifications.rotation')
         ]);
-        $to = $options->getElement('to_day_ignored');
+        $to = $options->getElement('to_day');
 
         $options->addElement('number', 'interval', [
             'required' => true,
@@ -923,14 +919,22 @@ protected function assembleMultiDayOptions(FieldsetElement $options): DateTime
             'options' => $timeOptions
         ]);
         $options->registerElement($fromAt);
+        $selectedFromAt = $fromAt->getValue();
+
+        $removeOutOfRangeToAtOptions = function() use ($selectedFromAt, $timeOptions) {
+            return array_slice(
+                $timeOptions,
+                0,
+                array_search($selectedFromAt, array_keys($timeOptions), true) + 1,
+                true
+            );
+        };
 
         $timeOptionsFirstKey = array_key_first($timeOptions);
         $selectedToDay = (int) $to->getValue();
         $endOfDay = 'endOfDay';
         if ($selectedFromDay === $selectedToDay) {
-            $selectedFromAt = $fromAt->getValue();
-            $keyIndex = array_search($selectedFromAt, array_keys($timeOptions));
-            $timeOptions = array_slice($timeOptions, 0, $keyIndex + 1, true);
+            $timeOptions = $removeOutOfRangeToAtOptions();
         } else {
             $timeOptions[$endOfDay] = sprintf(
                 '%s (%s)',
@@ -939,24 +943,23 @@ protected function assembleMultiDayOptions(FieldsetElement $options): DateTime
             );
         }
 
-        $toAt = $options->createElement('select', 'to_at_ignored', [
+        $toAt = $options->createElement('select', 'to_at', [
             'class' => 'autosubmit',
             'required' => true,
-            'ignore' => true,
-            'options' => $timeOptions,
-            'value' => $options->getValue('to_at'),
+            'options' => $timeOptions
         ]);
         $options->registerElement($toAt);
 
-        $selectedToAt = $toAt->getValue();
-
-        if ($selectedToAt === $endOfDay) {
+        if ($toAt->getValue() === $endOfDay) {
             $selectedToDay = $selectedToDay === 7 ? 1 : $selectedToDay + 1;
-            $selectedToAt = $timeOptionsFirstKey;
-        }
 
-        $options->getElement('to_day')->setValue($selectedToDay);
-        $options->getElement('to_at')->setValue($selectedToAt);
+            if ($selectedFromDay === $selectedToDay) {
+                $toAt->setOptions($removeOutOfRangeToAtOptions());
+            }
+
+            $to->setValue($selectedToDay);
+            $toAt->setValue($timeOptionsFirstKey);
+        }
 
         $from->prependWrapper(
             (new HtmlDocument())->addHtml(