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

Budget graph in project details (#3406)

Browse Source 
* do not copy description if restarting via calendar
* added support to display negative durations
* fix charts for larger numbers
This commit is contained in:
Kevin Papst
2022-07-13 17:21:36 +02:00
committed by GitHub
parent 245dd47082
commit 0dba83d8e9
26 changed files with 400 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/Twig/LocaleFormatExtensionsTest.php
View File

@@ -31,7 +31,7 @@ class LocaleFormatExtensionsTest extends TestCase
private $localeEn = ['en' => ['date' => 'Y-m-d', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeDe = ['de' => ['date' => 'd.m.Y', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeRu = ['ru' => ['date' => 'd.m.Y', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeFake = ['XX' => ['date' => 'd.m.Y', 'duration' => '%h - %m - %s Zeit', 'date_type' => 'yyyy-MM-dd']];
private $localeFake = ['XX' => ['date' => 'd.m.Y', 'duration' => '%h - %m Zeit', 'date_type' => 'yyyy-MM-dd']];
/**
* @param string|array $locale
@@ -62,7 +62,7 @@ class LocaleFormatExtensionsTest extends TestCase
{
$filters = [
'month_name', 'day_name', 'date_short', 'date_time', 'date_full', 'date_format', 'date_weekday', 'time', 'hour24',
'duration', 'chart_duration', 'duration_decimal', 'money', 'currency', 'country', 'language', 'amount'
'duration', 'chart_duration', 'chart_money', 'duration_decimal', 'money', 'currency', 'country', 'language', 'amount'
];
$i = 0;
@@ -458,11 +458,15 @@ class LocaleFormatExtensionsTest extends TestCase
// test extended format
$sut = $this->getSut($this->localeFake, 'XX');
$this->assertEquals('02 - 37 - 17 Zeit', $sut->duration($record->getDuration()));
$this->assertEquals('02 - 37 Zeit', $sut->duration($record->getDuration()));
// test negative duration
$sut = $this->getSut($this->localeEn, 'en');
$this->assertEquals('?', $sut->duration(-1));
$this->assertEquals('00:00 h', $sut->duration(0));
$this->assertEquals('00:00 h', $sut->duration(-1));
$this->assertEquals('00:00 h', $sut->duration(-59));
$this->assertEquals('-00:01 h', $sut->duration(-60));
$this->assertEquals('-01:36 h', $sut->duration(-5786));
// test zero duration
$sut = $this->getSut($this->localeEn, 'en');
@@ -584,4 +588,20 @@ class LocaleFormatExtensionsTest extends TestCase
return $record;
}
public function testChartMoney()
{
$sut = $this->getSut('en', $this->localeEn, false);
$this->assertEquals('-123456.78', $sut->moneyChart(-123456.78));
$this->assertEquals('123456.78', $sut->moneyChart(123456.78));
$this->assertEquals('123456.00', $sut->moneyChart(123456));
$this->assertEquals('456.00', $sut->moneyChart(456));
}
public function testCharDuration()
{
$sut = $this->getSut('en', $this->localeEn, false);
$this->assertEquals('34.29', $sut->durationChart(123456.78));
$this->assertEquals('-34.29', $sut->durationChart(-123456.78));
}
}