Commit d56e8596 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Changement regex des macro

parent 43cf6ffb

src/UnicaenRenderer/Service/Rendu/RenduService.php

+8 −4
Original line number Diff line number Diff line
@@ -144,16 +144,20 @@ class RenduService 
    /**

     * TODO >>> Dans unicaenPDF

     */

    public function generate(string $sujet, string $corps): string

    public function generate(string $sujet, string $corps, string $header = null, string $footer = null,

                             string $destination = PdfExporter::DESTINATION_BROWSER, string $filename='export.pdf'): ?string

    {

        if ($header === null) $footer = '/unicaen-renderer/pdf/header';

        if ($footer === null) $footer = '/unicaen-renderer/pdf/footer';

        

        try {

            $exporter = new PdfExporter();

            $exporter->setRenderer($this->renderer);

            $exporter->getMpdf()->SetTitle($sujet);

            $exporter->setHeaderScript('/unicaen-renderer/pdf/header');

            $exporter->setFooterScript('/unicaen-renderer/pdf/footer');

            $exporter->setHeaderScript($header);

            $exporter->setFooterScript($footer);

            $exporter->addBodyHtml($corps);

            return $exporter->export($sujet);

            return $exporter->export($filename, $destination);

        } catch (MpdfException $e) {

            throw new RuntimeException("Un problème est survenue lors de la génértion du PDF", null, $e);

        }

src/UnicaenRenderer/Service/Template/TemplateService.php

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ class TemplateService { 
    public function replaceMacros(string $texteInitial, array $variables) : string

    {

        $matches = [];

        preg_match_all('/VAR\[[a-zA-Z0-9_]*#[a-zA-Z0-9_]*(|.*)*\]/', $texteInitial, $matches);

        preg_match_all('/VAR\[[^[\]]+#[^[\]]+\]/', $texteInitial, $matches);



        $patterns = array_unique($matches[0]);

        $replacements = [];

view/unicaen-renderer/rendu/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ $canTemplate = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume 
            </td>

            <td> <?php echo $rendu->getDate()->format('d/m/Y à H:i:s'); ?> </td>

            <td>

                <span title="<?php echo $rendu->getSujet(); ?>" data-toggle="tooltip" data-html="true">

                <span title="<?php echo $rendu->getSujet(); ?>" data-bs-toggle="tooltip" data--bshtml="true">

                <?php

                $sujet = $rendu->getSujet();

                if (strlen($sujet) > 50) $sujet = substr($rendu->getSujet(), 0, 46) . " ...";