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

support line breaks in docx (#466)

Browse Source
This commit is contained in:
Kevin Papst
2018-12-07 11:24:39 +01:00
committed by GitHub
parent 7fa3b67cc4
commit ed8efcf139
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Invoice/Renderer/DocxRenderer.php
View File

@@ -12,33 +12,13 @@ namespace App\Invoice\Renderer;
use App\Entity\InvoiceDocument; use App\Entity\InvoiceDocument;
use App\Invoice\RendererInterface; use App\Invoice\RendererInterface;
use App\Model\InvoiceModel; use App\Model\InvoiceModel;
use PhpOffice\PhpWord\PhpWord; use PhpOffice\PhpWord\Escaper\Xml;
use PhpOffice\PhpWord\TemplateProcessor; use PhpOffice\PhpWord\TemplateProcessor;
use Symfony\Component\HttpFoundation\File\Stream; use Symfony\Component\HttpFoundation\File\Stream;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
class DocxRenderer extends AbstractRenderer implements RendererInterface class DocxRenderer extends AbstractRenderer implements RendererInterface
{ {
/*
protected function setPhpWordOptions(PhpWord $phpWord)
{
if (!extension_loaded('zip')) {
\PhpOffice\PhpWord\Settings::setZipClass(\PhpOffice\PhpWord\Settings::PCLZIP);
}
// \PhpOffice\PhpWord\Settings::setPdfRendererPath(__DIR__ . '/../../vendor/tecnickcom/tcpdf/');
// \PhpOffice\PhpWord\Settings::setPdfRendererName(\PhpOffice\PhpWord\Settings::PDF_RENDERER_TCPDF);
// \PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(true);
// $phpWord->getSettings()->setThemeFontLang(new Language(Language::EN_US));
$properties = $phpWord->getDocInfo();
$properties->setCreator('Kimai 2');
$properties->setDescription('Created with Kimai 2, the open-source time-tracking software! Get more information at www.kimai.org.');
$properties->setCreated(time());
$properties->setModified(time());
}
*/
/** /**
* @param InvoiceDocument $document * @param InvoiceDocument $document
* @param InvoiceModel $model * @param InvoiceModel $model
@@ -46,11 +26,18 @@ class DocxRenderer extends AbstractRenderer implements RendererInterface
*/ */
public function render(InvoiceDocument $document, InvoiceModel $model): Response public function render(InvoiceDocument $document, InvoiceModel $model): Response
{ {
\PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(false);
$filename = basename($document->getFilename()); $filename = basename($document->getFilename());
$xmlEscaper = new Xml();
$template = new TemplateProcessor($document->getFilename()); $template = new TemplateProcessor($document->getFilename());
foreach ($this->modelToReplacer($model) as $key => $value) {
$template->setValue($key, $value); foreach ($this->modelToReplacer($model) as $search => $replace) {
$replace = $xmlEscaper->escape($replace);
$replace = str_replace(PHP_EOL, '</w:t><w:br /><w:t xml:space="preserve">', $replace);
$template->setValue($search, $replace);
} }
$template->cloneRow('entry.description', count($model->getCalculator()->getEntries())); $template->cloneRow('entry.description', count($model->getCalculator()->getEntries()));
@@ -58,6 +45,9 @@ class DocxRenderer extends AbstractRenderer implements RendererInterface
foreach ($model->getCalculator()->getEntries() as $entry) { foreach ($model->getCalculator()->getEntries() as $entry) {
$values = $this->timesheetToArray($entry); $values = $this->timesheetToArray($entry);
foreach ($values as $search => $replace) { foreach ($values as $search => $replace) {
$replace = $xmlEscaper->escape($replace);
$replace = str_replace(PHP_EOL, '</w:t><w:br /><w:t xml:space="preserve">', $replace);
$template->setValue($search . '#' . $i, $replace); $template->setValue($search . '#' . $i, $replace);
} }
$i++; $i++;