configurable csv/xlsx export templates (#5531)
This commit is contained in:
@@ -13,7 +13,8 @@ use App\Entity\User;
|
||||
use App\Export\Base\CsvRenderer;
|
||||
use App\Export\Base\SpreadsheetRenderer;
|
||||
use App\Tests\Export\Renderer\AbstractRendererTestCase;
|
||||
use App\Tests\Export\Renderer\MetaFieldColumnSubscriber;
|
||||
use App\Tests\Mocks\MetaFieldColumnSubscriberMock;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcher;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
@@ -37,12 +38,13 @@ class CsvRendererTest extends AbstractRendererTestCase
|
||||
$security->expects($this->any())->method('getUser')->willReturn($user);
|
||||
$security->expects($this->any())->method('isGranted')->willReturn(true);
|
||||
|
||||
$translator = $this->createMock(TranslatorInterface::class);
|
||||
$translator = $this->getContainer()->get(TranslatorInterface::class);
|
||||
self::assertInstanceOf(TranslatorInterface::class, $translator);
|
||||
|
||||
$dispatcher = new EventDispatcher();
|
||||
$dispatcher->addSubscriber(new MetaFieldColumnSubscriber());
|
||||
$dispatcher->addSubscriber(new MetaFieldColumnSubscriberMock());
|
||||
|
||||
return new CsvRenderer(new SpreadsheetRenderer($dispatcher, $security), $translator);
|
||||
return new CsvRenderer(new SpreadsheetRenderer($dispatcher, $security, $this->createMock(LoggerInterface::class)), $translator);
|
||||
}
|
||||
|
||||
public function testConfiguration(): void
|
||||
@@ -50,23 +52,43 @@ class CsvRendererTest extends AbstractRendererTestCase
|
||||
$sut = $this->getAbstractRenderer();
|
||||
|
||||
self::assertEquals('csv', $sut->getId());
|
||||
self::assertEquals('csv', $sut->getTitle());
|
||||
self::assertEquals('default', $sut->getTitle());
|
||||
|
||||
$sut->setTitle('foo-bar');
|
||||
self::assertEquals('foo-bar', $sut->getTitle());
|
||||
|
||||
$sut->setId('bar-id');
|
||||
self::assertEquals('bar-id', $sut->getId());
|
||||
}
|
||||
|
||||
public static function getTestModel(): array
|
||||
{
|
||||
$en = [
|
||||
'Date', 'From', 'To', 'Duration', 'Currency', 'Price', 'Internal price', 'Hourly price', 'Fixed price', 'Name',
|
||||
'User', 'Staff number', 'Customer', 'Project', 'Activity', 'Description', 'Billable', 'Tags',
|
||||
'Type', 'category', 'Account', 'Project number', 'VAT-ID', 'Order number',
|
||||
'Working place', 'Working place', 'Working place', 'Working place', 'Working place', 'Working place', 'mypref',
|
||||
];
|
||||
$de = [
|
||||
'Datum', 'Von', 'Bis', 'Dauer', 'Währung', 'Preis', 'Interner Preis', 'Preis pro Stunde', 'Festpreis', 'Name',
|
||||
'Benutzer', 'Personalnummer', 'Kunde', 'Projekt', 'Tätigkeit', 'Beschreibung', 'Abrechenbar', 'Schlagworte',
|
||||
'Typ', 'category', 'Kundennummer', 'Projektnummer', 'Umsatzsteuer-ID', 'Bestellnummer',
|
||||
'Working place', 'Working place', 'Working place', 'Working place', 'Working place', 'Working place', 'mypref',
|
||||
];
|
||||
|
||||
return [
|
||||
['400', '2437.12', '1947.99', 7, 6, 1, 2, 2, false],
|
||||
['400', '2437.12', '1947.99', 7, 6, 1, 2, 2, true]
|
||||
['400', '2437.12', '1947.99', 7, 6, 1, 2, 2, false, null, $en],
|
||||
['400', '2437.12', '1947.99', 7, 6, 1, 2, 2, true, 'de', $de]
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getTestModel
|
||||
*/
|
||||
public function testRender(string $totalDuration, string $totalRate, string $expectedRate, int $expectedRows, int $expectedDescriptions, int $expectedUser1, int $expectedUser2, int $expectedUser3, bool $exportDecimal): void
|
||||
public function testRender(string $totalDuration, string $totalRate, string $expectedRate, int $expectedRows, int $expectedDescriptions, int $expectedUser1, int $expectedUser2, int $expectedUser3, bool $exportDecimal, ?string $locale, array $header): void
|
||||
{
|
||||
$sut = $this->getAbstractRenderer($exportDecimal);
|
||||
$sut->setLocale($locale);
|
||||
|
||||
/** @var BinaryFileResponse $response */
|
||||
$response = $this->render($sut);
|
||||
@@ -102,11 +124,13 @@ class CsvRendererTest extends AbstractRendererTestCase
|
||||
$all[] = str_getcsv($row);
|
||||
}
|
||||
|
||||
self::assertEquals($header, $all[0]);
|
||||
|
||||
$expected = [
|
||||
'2019-06-16',
|
||||
'12:00',
|
||||
'12:06',
|
||||
($exportDecimal ? '0.11' : '0:06:40'),
|
||||
($exportDecimal ? '0.11' : '0:06'),
|
||||
//'0.11',
|
||||
'EUR',
|
||||
'0',
|
||||
@@ -134,13 +158,14 @@ class CsvRendererTest extends AbstractRendererTestCase
|
||||
'',
|
||||
'project-foo2',
|
||||
'activity-bar',
|
||||
'',
|
||||
];
|
||||
|
||||
$expected2 = [
|
||||
'2019-06-16',
|
||||
'12:00',
|
||||
'12:06',
|
||||
($exportDecimal ? '0.11' : '0:06:40'),
|
||||
($exportDecimal ? '0.11' : '0:06'),
|
||||
//'0.11',
|
||||
'EUR',
|
||||
'0',
|
||||
@@ -168,6 +193,7 @@ class CsvRendererTest extends AbstractRendererTestCase
|
||||
'',
|
||||
'project-foo2',
|
||||
'activity-bar',
|
||||
'',
|
||||
];
|
||||
|
||||
self::assertEquals(7, \count($all));
|
||||
|
||||
56
tests/Export/Base/PdfRendererTest.php
Normal file
56
tests/Export/Base/PdfRendererTest.php
Normal file
@@ -0,0 +1,56 @@
|
||||
<?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\Export\Base;
|
||||
|
||||
use App\Export\Base\PDFRenderer;
|
||||
use App\Pdf\HtmlToPdfConverter;
|
||||
use App\Project\ProjectStatisticService;
|
||||
use App\Tests\Export\Renderer\AbstractRendererTestCase;
|
||||
use Twig\Environment;
|
||||
|
||||
/**
|
||||
* @covers \App\Export\Base\PDFRenderer
|
||||
* @covers \App\Export\Base\RendererTrait
|
||||
* @covers \App\Pdf\PdfRendererTrait
|
||||
* @group integration
|
||||
*/
|
||||
class PdfRendererTest extends AbstractRendererTestCase
|
||||
{
|
||||
protected function getAbstractRenderer(bool $exportDecimal = false): PDFRenderer
|
||||
{
|
||||
$twig = $this->createMock(Environment::class);
|
||||
$converter = $this->createMock(HtmlToPdfConverter::class);
|
||||
$projectStatisticService = $this->createMock(ProjectStatisticService::class);
|
||||
|
||||
return new PDFRenderer($twig, $converter, $projectStatisticService);
|
||||
}
|
||||
|
||||
public function testConfiguration(): void
|
||||
{
|
||||
$sut = $this->getAbstractRenderer();
|
||||
|
||||
self::assertEquals('pdf', $sut->getId());
|
||||
self::assertEquals('pdf', $sut->getTitle());
|
||||
|
||||
$sut->setTitle('foo-bar');
|
||||
self::assertEquals('foo-bar', $sut->getTitle());
|
||||
|
||||
$sut->setId('bar-id');
|
||||
self::assertEquals('bar-id', $sut->getId());
|
||||
|
||||
self::assertEquals([], $sut->getPdfOptions());
|
||||
$sut->setPdfOption('foo', 'bar');
|
||||
self::assertEquals(['foo' => 'bar'], $sut->getPdfOptions());
|
||||
$sut->setPdfOption('foo', 'bar2');
|
||||
self::assertEquals(['foo' => 'bar2'], $sut->getPdfOptions());
|
||||
$sut->setPdfOption('hello', 'world');
|
||||
self::assertEquals(['foo' => 'bar2', 'hello' => 'world'], $sut->getPdfOptions());
|
||||
}
|
||||
}
|
||||
@@ -12,10 +12,15 @@ namespace App\Tests\Export\Base;
|
||||
use App\Entity\ExportableItem;
|
||||
use App\Export\Base\SpreadsheetRenderer;
|
||||
use App\Export\Package\SpreadsheetPackage;
|
||||
use App\Export\Template;
|
||||
use App\Repository\Query\TimesheetQuery;
|
||||
use App\Tests\Export\Package\MemoryPackage;
|
||||
use App\Tests\Export\Renderer\AbstractRendererTestCase;
|
||||
use App\Tests\Mocks\MetaFieldColumnSubscriberMock;
|
||||
use Psr\EventDispatcher\EventDispatcherInterface;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcher;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
/**
|
||||
@@ -31,7 +36,7 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
|
||||
$spreadsheetPackage = $this->createMock(SpreadsheetPackage::class);
|
||||
$spreadsheetPackage->expects(self::once())->method('setColumns');
|
||||
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security);
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security, $this->createMock(LoggerInterface::class));
|
||||
$renderer->writeSpreadsheet($spreadsheetPackage, [], new TimesheetQuery());
|
||||
}
|
||||
|
||||
@@ -60,7 +65,7 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
|
||||
$exportItem->method('getType')->willReturn('type');
|
||||
$exportItem->method('getCategory')->willReturn('category');
|
||||
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security);
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security, $this->createMock(LoggerInterface::class));
|
||||
$renderer->writeSpreadsheet($spreadsheetPackage, [$exportItem], new TimesheetQuery());
|
||||
}
|
||||
|
||||
@@ -93,4 +98,96 @@ class SpreadsheetRendererTest extends AbstractRendererTestCase
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security);
|
||||
$renderer->writeSpreadsheet($spreadsheetPackage, [$exportItem, $exportItem], new TimesheetQuery());
|
||||
}
|
||||
|
||||
public static function getTestData(): iterable
|
||||
{
|
||||
yield [null, [
|
||||
'date' => 'date',
|
||||
'begin' => 'begin',
|
||||
'end' => 'end',
|
||||
'duration' => 'duration',
|
||||
'currency' => 'currency',
|
||||
'rate' => 'rate',
|
||||
'internalRate' => 'internalRate',
|
||||
'hourlyRate' => 'hourlyRate',
|
||||
'fixedRate' => 'fixedRate',
|
||||
'alias' => 'alias',
|
||||
'username' => 'username',
|
||||
'account_number' => 'account_number',
|
||||
'customer' => 'customer',
|
||||
'project' => 'project',
|
||||
'activity' => 'activity',
|
||||
'description' => 'description',
|
||||
'billable' => 'billable',
|
||||
'tags' => 'tags',
|
||||
'type' => 'type',
|
||||
'category' => 'category',
|
||||
'number' => 'number',
|
||||
'project_number' => 'project_number',
|
||||
'vat_id' => 'vat_id',
|
||||
'orderNumber' => 'orderNumber',
|
||||
'timesheet.meta.foo' => 'Working place',
|
||||
'timesheet.meta.foo2' => 'Working place',
|
||||
'customer.meta.customer-foo' => 'Working place',
|
||||
'project.meta.project-foo' => 'Working place',
|
||||
'project.meta.project-foo2' => 'Working place',
|
||||
'activity.meta.activity-foo' => 'Working place',
|
||||
'user.meta.mypref' => 'mypref',
|
||||
]];
|
||||
|
||||
$template = new Template('test', 'Testing');
|
||||
$template->setLocale('de');
|
||||
$template->setColumns(['date', 'user.name', 'duration_decimal', 'customer.name', 'exported', 'user.meta.mypref']);
|
||||
|
||||
yield [$template, [
|
||||
'date' => 'date',
|
||||
'duration' => 'duration',
|
||||
'username' => 'username',
|
||||
'customer' => 'customer',
|
||||
'exported' => 'exported',
|
||||
'user.meta.mypref' => 'mypref',
|
||||
]];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getTestData
|
||||
*/
|
||||
public function testWriteSpreadsheetCsv(?Template $template, array $expectedColumns): void
|
||||
{
|
||||
$dispatcher = new EventDispatcher();
|
||||
$dispatcher->addSubscriber(new MetaFieldColumnSubscriberMock());
|
||||
|
||||
$security = $this->createMock(Security::class);
|
||||
$spreadsheetPackage = new MemoryPackage();
|
||||
|
||||
$exportItem = $this->createMock(ExportableItem::class);
|
||||
$exportItem->method('getBegin')->willReturn(new \DateTime());
|
||||
$exportItem->method('getEnd')->willReturn(new \DateTime());
|
||||
$exportItem->method('getDuration')->willReturn(3600);
|
||||
$exportItem->method('getRate')->willReturn(100.0);
|
||||
$exportItem->method('getInternalRate')->willReturn(80.0);
|
||||
$exportItem->method('getHourlyRate')->willReturn(50.0);
|
||||
$exportItem->method('getFixedRate')->willReturn(200.0);
|
||||
$exportItem->method('getUser')->willReturn(null);
|
||||
$exportItem->method('getProject')->willReturn(null);
|
||||
$exportItem->method('getActivity')->willReturn(null);
|
||||
$exportItem->method('getDescription')->willReturn('Test description');
|
||||
$exportItem->method('isBillable')->willReturn(true);
|
||||
$exportItem->method('getTagsAsArray')->willReturn(['tag1', 'tag2']);
|
||||
$exportItem->method('getType')->willReturn('type');
|
||||
$exportItem->method('getCategory')->willReturn('category');
|
||||
|
||||
$renderer = new SpreadsheetRenderer($dispatcher, $security, $this->createMock(LoggerInterface::class));
|
||||
$renderer->setTemplate($template);
|
||||
$renderer->writeSpreadsheet($spreadsheetPackage, [$exportItem], new TimesheetQuery());
|
||||
|
||||
$columnNames = [];
|
||||
foreach ($spreadsheetPackage->getColumns() as $column) {
|
||||
$columnNames[$column->getName()] = $column->getHeader();
|
||||
}
|
||||
|
||||
self::assertEquals(null, $spreadsheetPackage->getFilename());
|
||||
self::assertEquals($expectedColumns, $columnNames);
|
||||
self::assertCount(2, $spreadsheetPackage->getRows());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ use App\Entity\User;
|
||||
use App\Export\Base\SpreadsheetRenderer;
|
||||
use App\Export\Base\XlsxRenderer;
|
||||
use App\Tests\Export\Renderer\AbstractRendererTestCase;
|
||||
use App\Tests\Export\Renderer\MetaFieldColumnSubscriber;
|
||||
use App\Tests\Mocks\MetaFieldColumnSubscriberMock;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcher;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
@@ -38,7 +38,7 @@ class XlsxRendererTest extends AbstractRendererTestCase
|
||||
$translator->method('trans')->willReturnArgument(0);
|
||||
|
||||
$dispatcher = new EventDispatcher();
|
||||
$dispatcher->addSubscriber(new MetaFieldColumnSubscriber());
|
||||
$dispatcher->addSubscriber(new MetaFieldColumnSubscriberMock());
|
||||
|
||||
return new XlsxRenderer(new SpreadsheetRenderer($dispatcher, $security), $translator);
|
||||
}
|
||||
@@ -46,9 +46,16 @@ class XlsxRendererTest extends AbstractRendererTestCase
|
||||
public function testConfiguration(): void
|
||||
{
|
||||
$sut = $this->getAbstractRenderer();
|
||||
$sut->setLocale('de');
|
||||
|
||||
self::assertEquals('xlsx', $sut->getId());
|
||||
self::assertEquals('xlsx', $sut->getTitle());
|
||||
self::assertEquals('default', $sut->getTitle());
|
||||
|
||||
$sut->setTitle('foo-bar');
|
||||
self::assertEquals('foo-bar', $sut->getTitle());
|
||||
|
||||
$sut->setId('bar-id');
|
||||
self::assertEquals('bar-id', $sut->getId());
|
||||
}
|
||||
|
||||
public function testRender(): void
|
||||
|
||||
Reference in New Issue
Block a user