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

apply users timezone to toolbar queries (#716)

Browse Source
This commit is contained in:
Kevin Papst
2019-04-22 16:21:22 +02:00
committed by GitHub
parent 46cb021260
commit 215d4fc8bf
11 changed files with 69 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controller/TimesheetControllerTrait.php
View File

@@ -126,7 +126,7 @@ trait TimesheetControllerTrait
$start = $request->get('begin');
if ($start !== null) {
$start = \DateTime::createFromFormat('Y-m-d', $start);
$start = $this->dateTime->createDateTimeFromFormat('Y-m-d', $start);
if ($start !== false) {
$start->setTime(10, 0, 0); // TODO make me configurable
$entry->setBegin($start);
@@ -135,7 +135,7 @@ trait TimesheetControllerTrait
$end = $request->get('end');
if ($end !== null) {
$end = \DateTime::createFromFormat('Y-m-d', $end);
$end = $this->dateTime->createDateTimeFromFormat('Y-m-d', $end);
if ($end !== false) {
$end->setTime(18, 0, 0); // TODO make me configurable
$entry->setEnd($end);
@@ -144,7 +144,7 @@ trait TimesheetControllerTrait
$from = $request->get('from');
if ($from !== null) {
$from = new \DateTime($from);
$from = $this->dateTime->createDateTime($from);
if ($from !== false) {
$entry->setBegin($from);
}
@@ -152,7 +152,7 @@ trait TimesheetControllerTrait
$to = $request->get('to');
if ($to !== null) {
$to = new \DateTime($to);
$to = $this->dateTime->createDateTime($to);
if ($to !== false) {
$entry->setEnd($to);
}