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

UI updates - new user menu, updated about and profile screen and more (#723)

Browse Source
This commit is contained in:
Kevin Papst
2019-04-25 17:50:28 +02:00
committed by GitHub
parent 28801bf1ea
commit 56fe14c451
83 changed files with 1067 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/API/TimesheetControllerTest.php
View File

@@ -38,7 +38,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
->setHourlyRate(true)
->setAmount(10)
->setUser($this->getUserByRole($em, $role))
->setStartDate((new \DateTime('-10 days'))->setTime(0, 0, 1))
->setStartDate((new \DateTime('first day of this month'))->setTime(0, 0, 1))
->setAllowEmptyDescriptions(false)
;
$this->importFixture($em, $fixture);
@@ -124,9 +124,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionWithQuery()
{
$begin = new \DateTime('-10 days');
$begin = new \DateTime('first day of this month');
$begin->setTime(0, 0, 0);
$end = new \DateTime();
$end = new \DateTime('last day of this month');
$end->setTime(23, 59, 59);
$query = [
@@ -162,14 +162,14 @@ class TimesheetControllerTest extends APIControllerBaseTest
->setExported(true)
->setAmount(7)
->setUser($this->getUserByRole($em, User::ROLE_USER))
->setStartDate(new \DateTime('-10 days'))
->setStartDate(new \DateTime('first day of this month'))
->setAllowEmptyDescriptions(false)
;
$this->importFixture($em, $fixture);
$begin = new \DateTime('-10 days');
$begin = new \DateTime('first day of this month');
$begin->setTime(0, 0, 0);
$end = new \DateTime();
$end = new \DateTime('last day of this month');
$end->setTime(23, 59, 59);
$query = [