Commit b463bd43 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Admission : la marge du bas dans des PDF générés n'était pas respectée (pb dans unicaen/pdf).

parent 3c637b2c

CHANGELOG.md

+4 −0
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Journal des modifications

=========================



10.4.0

------

- [FIX] Admission : la marge du bas dans des PDF générés n'était pas respectée (pb dans unicaen/pdf).



10.3.0

------

- Nouvelle charte de depot et diffusion des theses (depot papier optionnel : selon activation de la 'feature').

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
        "unicaen/livelog": "^4.0",

        "unicaen/maintenance-mode": "^1.0",

        "unicaen/parametre": "^6.0",

        "unicaen/pdf": "^6.1",

        "unicaen/pdf": "dev-release_7.0.0",

        "unicaen/renderer": "dev-release_7.0.6",

        "unicaen/search": "dev-release_1.1.0",

        "unicaen/sql": "^2.0",

composer.lock

+5 −4
Changes for composer.lock: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "28fada5e054b2be36623eef893330fec",

    "content-hash": "f1fb116fdfba0d327e434ecb6ee082d6",

    "packages": [

        {

            "name": "apereo/phpcas",
@@ -12405,11 +12405,11 @@ 
        },

        {

            "name": "unicaen/pdf",

            "version": "6.1.1",

            "version": "dev-release_7.0.0",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/pdf.git",

                "reference": "1a0b52ed24ea0d67cdfe1d1f19a1d35393c37338"

                "reference": "32068930863a40beea43ca5ebbac87ccc881d24b"

            },

            "require": {

                "laminas/laminas-view": "^2.22",
@@ -12432,7 +12432,7 @@ 
                ]

            },

            "description": "Génération PDF",

            "time": "2024-07-18T08:02:04+00:00"

            "time": "2025-09-24T07:37:09+00:00"

        },

        {

            "name": "unicaen/privilege",
@@ -15504,6 +15504,7 @@ 
    "aliases": [],

    "minimum-stability": "dev",

    "stability-flags": {

        "unicaen/pdf": 20,

        "unicaen/renderer": 20,

        "unicaen/search": 20,

        "unicaen/sygal-api": 20,

module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/ConventionFormationDoctoraleExporter.php

+11 −5
Changes for module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/ConventionFormationDoctoraleExporter.php: 11 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ use Application\Service\Role\ApplicationRoleServiceAwareTrait; 
use Fichier\Service\Fichier\FichierStorageServiceAwareTrait;

use Individu\Renderer\IndividuTemplateVariable;

use Laminas\View\Renderer\PhpRenderer;

use Laminas\View\Resolver\TemplatePathStack;

use Laminas\View\Resolver\TemplateMapResolver;

use Structure\Service\Etablissement\EtablissementServiceAwareTrait;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenPdf\Exporter\PdfExporter as PdfExporter;
@@ -48,8 +48,12 @@ class ConventionFormationDoctoraleExporter extends PdfExporter 
    public function __construct(PhpRenderer $renderer = null, $format = 'A4', $orientationPaysage = false, $defaultFontSize = 10)

    {

        parent::__construct($renderer, $format, $orientationPaysage, $defaultFontSize);



        $resolver = $renderer->resolver();

        $resolver->attach(new TemplatePathStack(['script_paths' => [__DIR__]]));

        $resolver->attach(new TemplateMapResolver([

            'convention_header' => __DIR__ . '/header.phtml',

            'convention_footer' => __DIR__ . '/footer.phtml',

        ]));

    }



    public function export($filename = null, $destination = self::DESTINATION_BROWSER, $memoryLimit = null)
@@ -63,10 +67,12 @@ class ConventionFormationDoctoraleExporter extends PdfExporter 


        $rendu = $this->getRenduService()->generateRenduByTemplateCode(PdfTemplates::ADMISSION_CONVENTION_FORMATION_DOCTORALE, $vars);



        $this->getMpdf()->SetMargins(0,0,60);

        $this->setHeaderScript('header.phtml', null, $logos);

        $this->setFooterScript('footer.phtml');

        $this->setHeaderScript('convention_header', null, $logos);

        $this->setFooterScript('convention_footer');

        $this->setMarginTop(60);

        $this->setMarginBottom(30);

        $this->addBodyHtml($rendu->getCorps());

        $this->prepare();



        return PdfExporter::export($filename, $destination, $memoryLimit);

    }

module/Admission/src/Admission/Service/Exporter/Recapitulatif/RecapitulatifExporter.php

+3 −2
Changes for module/Admission/src/Admission/Service/Exporter/Recapitulatif/RecapitulatifExporter.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -54,11 +54,12 @@ class RecapitulatifExporter extends PdfExporter 


        $rendu = $this->getRenduService()->generateRenduByTemplateCode(PdfTemplates::ADMISSION_RECAPITULATIF, $vars);



        $this->getMpdf()->SetMargins(0,0,60);

        $this->setHeaderScript('header.phtml', null, $logos);

        $this->setFooterScript('footer.phtml');

        $this->setMarginBottom(25);

        $this->setMarginTop(60);

        $this->setMarginBottom(30);

        $this->addBodyHtml($rendu->getCorps());

        $this->prepare();



        return PdfExporter::export($filename, $destination, $memoryLimit);

    }