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

improve export filename (#2958)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-19 18:53:43 +01:00
committed by GitHub
parent 56d02673ed
commit 859131308a
10 changed files with 199 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Export/Base/AbstractSpreadsheetRenderer.php
View File

@@ -16,6 +16,7 @@ use App\Event\MetaDisplayEventInterface;
use App\Event\ProjectMetaDisplayEvent;
use App\Event\TimesheetMetaDisplayEvent;
use App\Event\UserPreferenceDisplayEvent;
use App\Export\ExportFilename;
use App\Export\ExportItemInterface;
use App\Repository\Query\CustomerQuery;
use App\Repository\Query\TimesheetQuery;
@@ -753,9 +754,10 @@ abstract class AbstractSpreadsheetRenderer
public function render(array $exportItems, TimesheetQuery $query): Response
{
$spreadsheet = $this->fromArrayToSpreadsheet($exportItems, $query);
$filename = $this->saveSpreadsheet($spreadsheet);
$file = $this->saveSpreadsheet($spreadsheet);
$filename = new ExportFilename($query);
return $this->getFileResponse($filename, 'kimai-export' . $this->getFileExtension());
return $this->getFileResponse($file, $filename->getFilename() . $this->getFileExtension());
}
/**

7
src/Export/Base/PDFRenderer.php
View File

@@ -10,6 +10,7 @@
namespace App\Export\Base;
use App\Export\ExportContext;
use App\Export\ExportFilename;
use App\Export\ExportItemInterface;
use App\Project\ProjectStatisticService;
use App\Repository\Query\TimesheetQuery;
@@ -94,8 +95,9 @@ class PDFRenderer
*/
public function render(array $timesheets, TimesheetQuery $query): Response
{
$filename = new ExportFilename($query);
$context = new ExportContext();
$context->setOption('filename', 'kimai-export');
$context->setOption('filename', $filename->getFilename());
$summary = $this->calculateSummary($timesheets);
$content = $this->twig->render($this->getTemplate(), array_merge([
@@ -117,7 +119,8 @@ class PDFRenderer
$filename = $context->getOption('filename');
if (empty($filename)) {
$filename = 'kimai-export';
$filename = new ExportFilename($query);
$filename = $filename->getFilename();
}
$filename = FileHelper::convertToAsciiFilename($filename);