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

fix datetime modify to now (#3511)

Browse Source
This commit is contained in:
Kevin Papst
2022-09-03 01:11:48 +02:00
committed by GitHub
parent 1763a2efff
commit 3f4f63dc33
5 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Timesheet/TrackingMode/DurationFixedBeginMode.php
View File

@@ -55,7 +55,11 @@ final class DurationFixedBeginMode implements TrackingModeInterface
}
$newBegin = clone $timesheet->getBegin();
$newBegin->modify($this->configuration->getTimesheetDefaultBeginTime());
// this prevents the problem that "now" is being ignored in modify()
$beginTime = (new DateTime($this->configuration->getTimesheetDefaultBeginTime(), $newBegin->getTimezone()))->format('H:i:s');
$newBegin->modify($beginTime);
$timesheet->setBegin($newBegin);
}

7
src/Timesheet/TrackingMode/DurationOnlyMode.php
View File

@@ -63,7 +63,12 @@ final class DurationOnlyMode extends AbstractTrackingMode
}
$newBegin = clone $timesheet->getBegin();
$newBegin->modify($this->configuration->getTimesheetDefaultBeginTime());
// this prevents the problem that "now" is being ignored in modify()
$beginTime = $this->configuration->getTimesheetDefaultBeginTime();
$beginTime = (new DateTime($this->configuration->getTimesheetDefaultBeginTime(), $newBegin->getTimezone()))->format('H:i:s');
$newBegin->modify($beginTime);
$timesheet->setBegin($newBegin);
parent::create($timesheet, $request);