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,
]);

15
tests/Invoice/Renderer/AbstractRendererTest.php
View File

@@ -23,6 +23,7 @@ use App\Model\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
use App\Twig\DateExtensions;
use App\Twig\Extensions;
use App\Utils\LocaleSettings;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -56,16 +57,22 @@ abstract class AbstractRendererTest extends KernelTestCase
protected function getAbstractRenderer(string $classname)
{
$requestStack = new RequestStack();
$dateSettings = [];
$languages = [];
$languages = [
'en' => [
'date' => 'Y.m.d',
'duration' => '%%h:%%m h'
]
];
$request = new Request();
$request->setLocale('en');
$requestStack->push($request);
$localeSettings = new LocaleSettings($requestStack, $languages);
$translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
$dateExtension = new DateExtensions($requestStack, $dateSettings);
$extensions = new Extensions($requestStack, $languages);
$dateExtension = new DateExtensions($localeSettings);
$extensions = new Extensions($requestStack, $localeSettings);
return new $classname($translator, $dateExtension, $extensions);
}

11
tests/Twig/DateExtensionsTest.php
View File

@@ -10,6 +10,7 @@
namespace App\Tests\Twig;
use App\Twig\DateExtensions;
use App\Utils\LocaleSettings;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -32,7 +33,9 @@ class DateExtensionsTest extends TestCase
$requestStack = new RequestStack();
$requestStack->push($request);
return new DateExtensions($requestStack, $dateSettings);
$localeSettings = new LocaleSettings($requestStack, $dateSettings);
return new DateExtensions($localeSettings);
}
public function testGetFilters()
@@ -57,9 +60,9 @@ class DateExtensionsTest extends TestCase
public function testDateShort($locale, \DateTime $date, $result)
{
$sut = $this->getSut($locale, [
'de' => ['date_short' => 'd.m.Y'],
'en' => ['date_short' => 'Y-m-d'],
'ru' => ['date_short' => 'd.m.Y'],
'de' => ['date' => 'd.m.Y'],
'en' => ['date' => 'Y-m-d'],
'ru' => ['date' => 'd.m.Y'],
]);
$this->assertEquals($result, $sut->dateShort($date));
}

26
tests/Twig/ExtensionsTest.php
View File

@@ -11,6 +11,7 @@ namespace App\Tests\Twig;
use App\Entity\Timesheet;
use App\Twig\Extensions;
use App\Utils\LocaleSettings;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -21,10 +22,10 @@ use Twig\TwigFilter;
*/
class ExtensionsTest extends TestCase
{
private $localeEn = ['en' => ['date_short' => 'Y-m-d', 'duration' => '%h:%m:%s h', 'duration_short' => '%h:%m h']];
private $localeDe = ['de' => ['date_short' => 'd.m.Y', 'duration' => '%h:%m:%s Stunden', 'duration_short' => '%h:%m h']];
private $localeRu = ['ru' => ['date_short' => 'd.m.Y', 'duration' => '%h:%m:%s h', 'duration_short' => '%h:%m h']];
private $localeFake = ['XX' => ['date_short' => 'd.m.Y', 'duration' => '%h Stunden, %m Minuten und %s Sekunden', 'duration_short' => '%h - %m - %s Zeit']];
private $localeEn = ['en' => ['date' => 'Y-m-d', 'duration' => '%h:%m h']];
private $localeDe = ['de' => ['date' => 'd.m.Y', 'duration' => '%h:%m h']];
private $localeRu = ['ru' => ['date' => 'd.m.Y', 'duration' => '%h:%m h']];
private $localeFake = ['XX' => ['date' => 'd.m.Y', 'duration' => '%h - %m - %s Zeit']];
/**
* @param array $locales
@@ -38,7 +39,9 @@ class ExtensionsTest extends TestCase
$requestStack = new RequestStack();
$requestStack->push($request);
return new Extensions($requestStack, $locales);
$localeSettings = new LocaleSettings($requestStack, $locales);
return new Extensions($requestStack, $localeSettings);
}
public function testGetFilters()
@@ -154,22 +157,17 @@ class ExtensionsTest extends TestCase
// test extended format
$sut = $this->getSut($this->localeFake, 'XX');
$this->assertEquals('02 - 37 - 17 Zeit', $sut->duration($record->getDuration(), 'short'));
$this->assertEquals('02 Stunden, 37 Minuten und 17 Sekunden', $sut->duration($record->getDuration(), 'full'));
// test fallback format
$sut = $this->getSut($this->localeEn, 'XX');
$this->assertEquals('02:37 h', $sut->duration($record->getDuration()));
$this->assertEquals('02 - 37 - 17 Zeit', $sut->duration($record->getDuration()));
// test negative duration
$sut = $this->getSut($this->localeEn, 'XX');
$sut = $this->getSut($this->localeEn, 'en');
$this->assertEquals('?', $sut->duration('-1'));
// test zero duration
$sut = $this->getSut($this->localeEn, 'XX');
$sut = $this->getSut($this->localeEn, 'en');
$this->assertEquals('00:00 h', $sut->duration('0'));
$sut = $this->getSut($this->localeEn, 'XX');
$sut = $this->getSut($this->localeEn, 'en');
$this->assertNull($sut->duration(null));
}

192
tests/Utils/LocaleSettingsTest.php Normal file
View File

@@ -0,0 +1,192 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Utils;
use App\Utils\LocaleSettings;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
/**
* @covers \App\Utils\LocaleSettings
*/
class LocaleSettingsTest extends TestCase
{
protected function getRequestStack(string $locale)
{
$request = new Request();
$request->setLocale($locale);
$requestStack = new RequestStack();
$requestStack->push($request);
return $requestStack;
}
protected function getSut(string $locale, array $settings)
{
return new LocaleSettings($this->getRequestStack($locale), $settings);
}
protected function getDefaultSettings()
{
return [
'de' => [
'date_time_type' => 'dd.MM.yyyy HH:mm',
'date_time_picker' => 'DD.MM.YYYY HH:mm',
'date_type' => 'dd.MM.yyyy',
'date_picker' => 'DD.MM.YYYY',
'date' => 'd.m.Y',
'duration' => '%h:%m h',
],
'en' => [
'date_time_type' => 'yyyy-MM-dd HH:mm',
'date_time_picker' => 'YYYY-MM-DD HH:mm',
'date_type' => 'yyyy-MM-dd',
'date_picker' => 'YYYY-MM-DD',
'date' => 'Y-m-d',
'duration' => '%h:%m h',
],
'pt_BR' => [
'date_time_type' => 'dd-MM-yyyy HH:mm',
'date_time_picker' => 'DD-MM-YYYY HH:mm',
'date_type' => 'dd-MM-yyyy',
'date_picker' => 'DD-MM-YYYY',
'date' => 'd-m-Y',
'duration' => '%h:%m h',
],
'it' => [
'date_time_type' => 'dd.MM.yyyy HH:mm',
'date_time_picker' => 'DD.MM.YYYY HH:mm',
'date_type' => 'dd.MM.yyyy',
'date_picker' => 'DD.MM.YYYY',
'date' => 'd.m.Y',
'duration' => '%h:%m h',
],
'fr' => [
'date_time_type' => 'dd/MM/yyyy HH:mm',
'date_time_picker' => 'DD/MM/YYYY HH:mm',
'date_type' => 'dd/MM/yyyy',
'date_picker' => 'DD/MM/YYYY',
'date' => 'd/m/Y',
'duration' => '%h h %m',
],
'es' => [
'date_time_type' => 'dd.MM.yyyy HH:mm',
'date_time_picker' => 'DD.MM.YYYY HH:mm',
'date_type' => 'dd.MM.yyyy',
'date_picker' => 'DD.MM.YYYY',
'date' => 'd.m.Y',
'duration' => '%h:%m h',
],
'ru' => [
'date_time_type' => 'dd.MM.yyyy HH:mm',
'date_time_picker' => 'DD.MM.YYYY HH:mm',
'date_type' => 'dd.MM.yyyy',
'date_picker' => 'DD.MM.YYYY',
'date' => 'd.m.Y',
'duration' => '%h:%m h',
],
'ar' => [
'date_time_type' => 'yyyy-MM-dd HH:mm',
'date_time_picker' => 'YYYY-MM-DD HH:mm',
'date_type' => 'yyyy-MM-dd',
'date_picker' => 'YYYY-MM-DD',
'date' => 'Y-m-d',
'duration' => '%h:%m h',
],
'hu' => [
'date_time_type' => 'yyyy.MM.dd HH:mm',
'date_time_picker' => 'YYYY.MM.DD HH:mm',
'date_type' => 'yyyy.MM.dd',
'date_picker' => 'YYYY.MM.DD',
'date' => 'Y.m.d.',
'duration' => '%h:%m h',
],
];
}
public function testGetLocale()
{
$sut = $this->getSut('en', []);
$this->assertEquals('en', $sut->getLocale());
$sut = $this->getSut('ar', []);
$this->assertEquals('ar', $sut->getLocale());
}
public function testGetAvailableLanguages()
{
$sut = $this->getSut('en', []);
$this->assertEquals([], $sut->getAvailableLanguages());
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals(['de', 'en', 'pt_BR', 'it', 'fr', 'es', 'ru', 'ar', 'hu'], $sut->getAvailableLanguages());
}
/**
* @expectedException \InvalidArgumentException
*/
public function testInvalidLocaleWithDefaultLocale()
{
$sut = $this->getSut('en', []);
$sut->getDateFormat();
}
/**
* @expectedException \InvalidArgumentException
*/
public function testInvalidLocaleWithGivenLocale()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$sut->getDateFormat('xx');
}
public function testGetDurationFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('%h:%m h', $sut->getDurationFormat());
$this->assertEquals('%h:%m h', $sut->getDurationFormat('de'));
}
public function testGetDateFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('Y-m-d', $sut->getDateFormat());
$this->assertEquals('d.m.Y', $sut->getDateFormat('de'));
}
public function testGetDateTypeFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('yyyy-MM-dd', $sut->getDateTypeFormat());
$this->assertEquals('dd.MM.yyyy', $sut->getDateTypeFormat('de'));
}
public function testGetDatePickerFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('YYYY-MM-DD', $sut->getDatePickerFormat());
$this->assertEquals('DD.MM.YYYY', $sut->getDatePickerFormat('de'));
}
public function testGetDateTimeTypeFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('yyyy-MM-dd HH:mm', $sut->getDateTimeTypeFormat());
$this->assertEquals('dd.MM.yyyy HH:mm', $sut->getDateTimeTypeFormat('de'));
}
public function testGetDateTimePickerFormat()
{
$sut = $this->getSut('en', $this->getDefaultSettings());
$this->assertEquals('YYYY-MM-DD HH:mm', $sut->getDateTimePickerFormat());
$this->assertEquals('DD.MM.YYYY HH:mm', $sut->getDateTimePickerFormat('de'));
}
}