jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

improve sunday FDOW handling (#2862)

Browse Source
This commit is contained in:
Kevin Papst
2021-10-17 19:17:47 +02:00
committed by GitHub
parent fb265ed732
commit 6fdc304313
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Timesheet/DateTimeFactory.php
View File

@@ -65,32 +65,43 @@ class DateTimeFactory
public function getStartOfWeek(?DateTime $date = null): DateTime public function getStartOfWeek(?DateTime $date = null): DateTime
{ {
if (null === $date) { if (null === $date) {
$from = $this->createDateTime('now'); $date = $this->createDateTime('now');
} else { } else {
$from = clone $date; $date = clone $date;
} }
$year = $from->format('o');
$week = $from->format('W');
$firstDay = 1; $firstDay = 1;
if ($this->startOnSunday) { if ($this->startOnSunday) {
$from->modify('-1 week');
$year = $from->format('o');
$week = $from->format('W');
$firstDay = 7; $firstDay = 7;
// if today = sunday => increase week by one
if ($date->format('N') !== '7') {
$date->modify('-1 week');
}
} }
return $this->createWeekDateTime($year, $week, $firstDay, 0, 0, 0); return $this->createWeekDateTime($date->format('o'), $date->format('W'), $firstDay, 0, 0, 0);
} }
public function getEndOfWeek(?DateTime $date = null): DateTime public function getEndOfWeek(?DateTime $date = null): DateTime
{ {
if (null === $date) { if (null === $date) {
$date = $this->createDateTime(); $date = $this->createDateTime();
} else {
$date = clone $date;
} }
$lastDay = $this->startOnSunday ? 6 : 7; $lastDay = 7;
if ($this->startOnSunday) {
$lastDay = 6;
// only change when today is not sunday
if ($date->format('N') === '7') {
$date->modify('+1 week');
}
}
return $this->createWeekDateTime($date->format('o'), $date->format('W'), $lastDay, 23, 59, 59); return $this->createWeekDateTime($date->format('o'), $date->format('W'), $lastDay, 23, 59, 59);
} }