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

convert timesheets to UTC with support for user timezone (#372)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-08 18:24:33 +01:00
committed by GitHub
parent 8dcc18dde3
commit d00596d297
58 changed files with 1637 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Timesheet/Calculator/RateCalculatorTest.php
View File

@@ -163,10 +163,13 @@ class RateCalculatorTest extends TestCase
*/
public function testCalculateWithRules($rules, $expectedFactor)
{
$seconds = 41837;
$seconds = 31837;
$end = new \DateTime();
$end->setTimezone(new \DateTimeZone('UTC'));
$end->setTime(12, 0, 0);
$start = clone $end;
$start->setTimezone(new \DateTimeZone('UTC'));
$start->setTimestamp($end->getTimestamp() - $seconds);
$record = new Timesheet();
@@ -191,6 +194,7 @@ class RateCalculatorTest extends TestCase
public function getRuleDefinitions()
{
$start = new \DateTime();
$start->setTimezone(new \DateTimeZone('UTC'));
$start->setTime(12, 0, 0);
$day = $start->format('l');
@@ -219,7 +223,7 @@ class RateCalculatorTest extends TestCase
'factor' => 2.0
],
'weekdays' => [
'days' => ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'],
'days' => ['MonDay', 'tUEsdAy', 'WEdnesday', 'THursday', 'friDay', 'SATURday', 'sunDAY'],
'factor' => 1.5
],
],