Skip to content

fix handling of multi day rotation entries that end the same day they started #393

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

Merged
merged 6 commits into from
Nov 10, 2025
Merged

fix handling of multi day rotation entries that end the same day they started #393

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5d13f5
fix handling of multi day rotation entries that end the same day they…
BastianLedererIcinga Nov 5, 2025
02bef6e
fix start time of first entries
BastianLedererIcinga Nov 6, 2025
d7b516a
fix first entries to always start at 12 am when they start the same d…
BastianLedererIcinga Nov 6, 2025
3261826
fix entries that end at 12:00 AM
BastianLedererIcinga Nov 7, 2025
e1ab27a
fix missing entry in cases where from- and to-day are equal
BastianLedererIcinga Nov 10, 2025
fc0b7b5
small change to firstHandoff normalization
BastianLedererIcinga Nov 10, 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
19 changes: 13 additions & 6 deletions application/forms/RotationConfigForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,6 +1431,8 @@ private function yieldRecurrenceRules(int $count): Generator
if (
$fromDay < $toDay && ($firstHandoffDay < $fromDay || $firstHandoffDay > $toDay)
|| $toDay < $fromDay && ($firstHandoffDay < $fromDay && $firstHandoffDay > $toDay)
|| $firstHandoffDay === $toDay && $toDay !== $fromDay
&& $firstHandoff >= $this->parseDateAndTime($this->getValue('first_handoff'), $options['to_at'])
) {
// Normalize the first handoff to the first day of the shift in case it's outside the range
$firstHandoff->add(new DateInterval(sprintf(
Expand All @@ -1442,19 +1444,24 @@ private function yieldRecurrenceRules(int $count): Generator
} elseif ($firstHandoffDay !== $fromDay) {
// In case the first handoff is in the range, but doesn't start at the first day of the rotation,
// the first shift is shorter than the regular interval and separately injected into the rule seq
$firstRule = new Rule(null, $firstHandoff);
$firstRule->setUntil($firstHandoff);
$firstEntryStart = clone $firstHandoff;
if ($firstHandoffDay === $toDay) {
$firstEntryStart->setTime(0, 0);
}

$firstRule = new Rule(null, $firstEntryStart);
$firstRule->setUntil($firstEntryStart);

$firstShiftEnd = (clone $firstHandoff)->add(new DateInterval(sprintf(
$firstShiftEnd = (clone $firstEntryStart)->add(new DateInterval(sprintf(
'P%dD',
$toDay > $firstHandoffDay
$toDay >= $firstHandoffDay
? $toDay - $firstHandoffDay
: 7 - $firstHandoffDay + $toDay
)));
if ($this->nextHandoff !== null && $firstShiftEnd > $this->nextHandoff) {
$firstShiftDuration = $firstHandoff->diff($this->nextHandoff);
$firstShiftDuration = $firstEntryStart->diff($this->nextHandoff);
} else {
$firstShiftDuration = $firstHandoff->diff(
$firstShiftDuration = $firstEntryStart->diff(
$this->parseDateAndTime($firstShiftEnd->format('Y-m-d'), $options['to_at'])
);
}
Expand Down
Loading