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

added configurable formats for duration (#287)

Browse Source
This commit is contained in:
Kevin Papst
2018-09-01 17:54:17 +02:00
committed by GitHub
parent 55b7e192aa
commit ebe007eb78
10 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/Twig/ExtensionsTest.php
View File

@@ -21,8 +21,13 @@ 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']];
/**
* @param string $locales
* @param array $locales
* @param string $locale
* @return Extensions
*/
@@ -39,7 +44,7 @@ class ExtensionsTest extends TestCase
public function testGetFilters()
{
$filters = ['duration', 'money', 'currency', 'country', 'icon'];
$sut = $this->getSut('de');
$sut = $this->getSut($this->localeDe);
$twigFilters = $sut->getFilters();
$this->assertCount(count($filters), $twigFilters);
$i = 0;
@@ -52,7 +57,7 @@ class ExtensionsTest extends TestCase
public function testGetFunctions()
{
$functions = ['locales', 'is_visible_column'];
$sut = $this->getSut('de');
$sut = $this->getSut($this->localeDe);
$twigFunctions = $sut->getFunctions();
$this->assertCount(count($functions), $twigFunctions);
$i = 0;
@@ -70,7 +75,8 @@ class ExtensionsTest extends TestCase
['code' => 'ru', 'name' => 'русский'],
];
$sut = $this->getSut('en|de|ru');
$appLocales = array_merge($this->localeEn, $this->localeDe, $this->localeRu);
$sut = $this->getSut($appLocales);
$this->assertEquals($locales, $sut->getLocales());
}
@@ -82,7 +88,7 @@ class ExtensionsTest extends TestCase
'RUB' => 'RUB',
];
$sut = $this->getSut('en');
$sut = $this->getSut($this->localeEn);
foreach ($symbols as $name => $symbol) {
$this->assertEquals($symbol, $sut->currency($name));
}
@@ -96,7 +102,7 @@ class ExtensionsTest extends TestCase
'ES' => 'Spain',
];
$sut = $this->getSut('en');
$sut = $this->getSut($this->localeEn);
foreach ($countries as $locale => $name) {
$this->assertEquals($name, $sut->country($locale));
}
@@ -111,7 +117,7 @@ class ExtensionsTest extends TestCase
*/
public function testMoney($result, $amount, $currency, $locale)
{
$sut = $this->getSut('en', $locale);
$sut = $this->getSut($this->localeEn, $locale);
$this->assertEquals($result, $sut->money($amount, $currency));
}
@@ -137,12 +143,22 @@ class ExtensionsTest extends TestCase
{
$record = $this->getTimesheet(9437);
$sut = $this->getSut('en');
$sut = $this->getSut($this->localeEn);
$this->assertEquals('02:37 h', $sut->duration($record->getDuration()));
$this->assertEquals('02:37:17 h', $sut->duration($record->getDuration(), true));
$this->assertEquals('02:37:17 h', $sut->duration($record->getDuration(), '%h:%m:%s h'));
// test Timesheet object
$this->assertEquals('02:37 h', $sut->duration($record));
$this->assertEquals('02:37:17 h', $sut->duration($record, true));
$this->assertEquals('02:37:17', $sut->duration($record, '%h:%m:%s'));
// 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()));
}
protected function getTimesheet($seconds)
@@ -167,7 +183,7 @@ class ExtensionsTest extends TestCase
];
// test pre-defined icons
$sut = $this->getSut('en');
$sut = $this->getSut($this->localeEn);
foreach ($icons as $icon) {
$result = $sut->icon($icon);
$this->assertNotEmpty($result, 'Problem with icon definition: ' . $icon);