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

fix statistics in user profile for first year not starting in january (#2712)

Browse Source
This commit is contained in:
Kevin Papst
2021-08-10 14:39:52 +02:00
committed by GitHub
parent b31ded22b9
commit 7873bd812e
3 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Timesheet/DateTimeFactory.php
View File

@@ -52,9 +52,10 @@ class DateTimeFactory
{
if (null === $date) {
$date = $this->createDateTime();
} else {
$date = clone $date;
}
$date = clone $date;
$date->modify('first day of this month');
$date->setTime(0, 0, 0);
@@ -64,11 +65,11 @@ class DateTimeFactory
public function getStartOfWeek(?DateTime $date = null): DateTime
{
if (null === $date) {
$date = $this->createDateTime('now');
$from = $this->createDateTime('now');
} else {
$from = clone $date;
}
$from = clone $date;
$year = $from->format('o');
$week = $from->format('W');
$firstDay = 1;
@@ -118,9 +119,7 @@ class DateTimeFactory
public function createDateTime(string $datetime = 'now'): DateTime
{
$date = new DateTime($datetime, $this->getTimezone());
return $date;
return new DateTime($datetime, $this->getTimezone());
}
/**
@@ -130,7 +129,18 @@ class DateTimeFactory
*/
public function createDateTimeFromFormat(string $format, ?string $datetime = 'now')
{
$date = DateTime::createFromFormat($format, $datetime, $this->getTimezone());
return DateTime::createFromFormat($format, $datetime, $this->getTimezone());
}
public function createStartOfYear(?DateTime $date = null): DateTime
{
if (null === $date) {
$date = $this->createDateTime();
} else {
$date = clone $date;
}
$date->modify('first day of january 00:00:00');
return $date;
}