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

added daterange-picker and localized date-inputs (#540)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-03 21:24:30 +01:00
committed by GitHub
parent aae9183de6
commit 062735c9e3
37 changed files with 1058 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Controller/Admin/TimesheetControllerTest.php
View File

@@ -11,6 +11,7 @@ namespace App\Tests\Controller\Admin;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Form\Type\DateRangeType;
use App\Tests\Controller\ControllerBaseTest;
use App\Tests\DataFixtures\TimesheetFixtures;
@@ -55,13 +56,14 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->request($client, '/team/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
$dateRange = (new \DateTime('-10 days'))->format('Y-m-d') . DateRangeType::DATE_SPACER . (new \DateTime())->format('Y-m-d');
$form = $client->getCrawler()->filter('form.navbar-form')->form();
$client->submit($form, [
'state' => 1,
'user' => 1,
'pageSize' => 25,
'begin' => (new \DateTime('-10 days'))->format('Y-m-d'),
'end' => (new \DateTime())->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => null,
]);
@@ -90,13 +92,14 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->request($client, '/team/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
$dateRange = (new \DateTime('-10 days'))->format('Y-m-d') . DateRangeType::DATE_SPACER . (new \DateTime())->format('Y-m-d');
$form = $client->getCrawler()->filter('form.navbar-form')->form();
$form->getFormNode()->setAttribute('action', $this->createUrl('/team/timesheet/export'));
$client->submit($form, [
'state' => 1,
'pageSize' => 25,
'begin' => (new \DateTime('-10 days'))->format('Y-m-d'),
'end' => (new \DateTime())->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => null,
]);

9
tests/Controller/InvoiceControllerTest.php
View File

@@ -11,6 +11,7 @@ namespace App\Tests\Controller;
use App\Entity\InvoiceTemplate;
use App\Entity\User;
use App\Form\Type\DateRangeType;
use App\Tests\DataFixtures\InvoiceFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
@@ -137,12 +138,13 @@ class InvoiceControllerTest extends ControllerBaseTest
$this->request($client, '/invoice/');
$this->assertTrue($client->getResponse()->isSuccessful());
$dateRange = $begin->format('Y-m-d') . DateRangeType::DATE_SPACER . $end->format('Y-m-d');
$form = $client->getCrawler()->filter('#invoice-print-form')->form();
$client->submit($form, [
'template' => 1,
'user' => '',
'begin' => $begin->format('Y-m-d'),
'end' => $end->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => 1,
]);
@@ -163,8 +165,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$client->submit($form, [
'template' => 1,
'user' => '',
'begin' => $begin->format('Y-m-d'),
'end' => $end->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => 1,
'project' => 1,
]);

11
tests/Controller/TimesheetControllerTest.php
View File

@@ -11,6 +11,7 @@ namespace App\Tests\Controller;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Form\Type\DateRangeType;
use App\Tests\DataFixtures\TimesheetFixtures;
/**
@@ -54,12 +55,13 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->request($client, '/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
$dateRange = (new \DateTime('-10 days'))->format('Y-m-d') . DateRangeType::DATE_SPACER . (new \DateTime())->format('Y-m-d');
$form = $client->getCrawler()->filter('form.navbar-form')->form();
$client->submit($form, [
'state' => 1,
'pageSize' => 25,
'begin' => (new \DateTime('-10 days'))->format('Y-m-d'),
'end' => (new \DateTime())->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => null,
]);
@@ -83,13 +85,14 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->request($client, '/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
$dateRange = (new \DateTime('-10 days'))->format('Y-m-d') . DateRangeType::DATE_SPACER . (new \DateTime())->format('Y-m-d');
$form = $client->getCrawler()->filter('form.navbar-form')->form();
$form->getFormNode()->setAttribute('action', $this->createUrl('/timesheet/export'));
$client->submit($form, [
'state' => 1,
'pageSize' => 25,
'begin' => (new \DateTime('-10 days'))->format('Y-m-d'),
'end' => (new \DateTime())->format('Y-m-d'),
'daterange' => $dateRange,
'customer' => null,
]);