Skip to content

Add missing option for end of day (Multiday) #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add missing option for end of day (Multiday) #339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e2258
RotationConfigForm: Add `end of day` time option to multi day mode
sukhwinder33445 Jun 18, 2025
f277e6b
RotationConfigForm: Add end of day time option to multi day mode
sukhwinder33445 Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions application/forms/RotationConfigForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,11 +919,28 @@ 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
);
};

if ($selectedFromDay === (int) $to->getValue()) {
$selectedFromAt = $fromAt->getValue();
$keyIndex = array_search($selectedFromAt, array_keys($timeOptions));
$timeOptions = array_slice($timeOptions, 0, $keyIndex + 1, true);
$timeOptionsFirstKey = array_key_first($timeOptions);
$selectedToDay = (int) $to->getValue();
$endOfDay = 'endOfDay';
if ($selectedFromDay === $selectedToDay) {
$timeOptions = $removeOutOfRangeToAtOptions();
} else {
$timeOptions[$endOfDay] = sprintf(
'%s (%s)',
$timeOptions[$timeOptionsFirstKey],
$this->translate('End of day')
);
}

$toAt = $options->createElement('select', 'to_at', [
Expand All @@ -933,6 +950,17 @@ protected function assembleMultiDayOptions(FieldsetElement $options): DateTime
]);
$options->registerElement($toAt);

if ($toAt->getValue() === $endOfDay) {
$selectedToDay = $selectedToDay === 7 ? 1 : $selectedToDay + 1;

if ($selectedFromDay === $selectedToDay) {
$toAt->setOptions($removeOutOfRangeToAtOptions());
}

$to->setValue($selectedToDay);
$toAt->setValue($timeOptionsFirstKey);
}

$from->prependWrapper(
(new HtmlDocument())->addHtml(
$from,
Expand Down
Loading