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

monthly budget, monthly report, unified report calculation (#2684)

Browse Source
This commit is contained in:
Kevin Papst
2021-08-06 18:38:41 +02:00
committed by GitHub
parent 21f785638c
commit cefd747e91
196 changed files with 5031 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Timesheet/DateTimeFactory.php
View File

@@ -48,9 +48,14 @@ class DateTimeFactory
return $this->timezone;
}
public function getStartOfMonth(): DateTime
public function getStartOfMonth(?DateTime $date = null): DateTime
{
$date = $this->createDateTime('first day of this month');
if (null === $date) {
$date = $this->createDateTime();
}
$date = clone $date;
$date->modify('first day of this month');
$date->setTime(0, 0, 0);
return $date;
@@ -81,7 +86,7 @@ class DateTimeFactory
public function getEndOfWeek(?DateTime $date = null): DateTime
{
if (null === $date) {
$date = $this->createDateTime('now');
$date = $this->createDateTime();
}
$lastDay = $this->startOnSunday ? 6 : 7;
@@ -89,9 +94,14 @@ class DateTimeFactory
return $this->createWeekDateTime($date->format('o'), $date->format('W'), $lastDay, 23, 59, 59);
}
public function getEndOfMonth(): DateTime
public function getEndOfMonth(?DateTime $date = null): DateTime
{
$date = $this->createDateTime('last day of this month');
if (null === $date) {
$date = $this->createDateTime();
}
$date = clone $date;
$date = $date->modify('last day of this month');
$date->setTime(23, 59, 59);
return $date;