Commit 17cc9c9e authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Abandon des 'data:image/*;base64,' dans les templates mPDF.

parent be8cd43d

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Journal des modifications 


5.0.1

-----

- [FIX] Abandon des 'data:image/*;base64,' dans les templates mPDF.

- [FIX] mPdf ne supporte plus les ' ' et ':' dans les noms de fichiers images (logos de structure).

- [FIX] Ajustement de la demande du justificatif de demande d'HDR pour les membres étranger de rang B ayant un HDR (ou équivalent)

module/RapportActivite/src/RapportActivite/Service/RapportActiviteService.php

+1 −1
Changes for module/RapportActivite/src/RapportActivite/Service/RapportActiviteService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ class RapportActiviteService extends BaseService 


        // signature ED

        try {

            $exportData->signatureEcoleDoctorale = $this->structureDocumentService->getContenuFichier(

            $exportData->signatureEcoleDoctorale = $this->structureDocumentService->getCheminFichier(

                $these->getEcoleDoctorale()->getStructure(),

                NatureFichier::CODE_SIGNATURE_RAPPORT_ACTIVITE,

                $these->getEtablissement()

module/RapportActivite/view/rapport-activite/page-de-validation/template.phtml

+1 −1
Changes for module/RapportActivite/view/rapport-activite/page-de-validation/template.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ use RapportActivite\Entity\Db\RapportActiviteAvis; 
        <td>

            <?php if ($data->signatureEcoleDoctorale): ?>

                <img class="signature-ecole-doctorale"

                     src="data:image/*;base64,<?php echo base64_encode($data->signatureEcoleDoctorale); ?>"

                     src="<?php echo $data->signatureEcoleDoctorale ?>"

                     alt="Signature de la direction d'ED"/>

            <?php endif ?>

            <?php if ($data->signatureEcoleDoctoraleAnomalie): ?>

module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php

+10 −6
Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 10 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -462,9 +462,9 @@ class PresoutenanceController extends AbstractController 
    {

        $these = $this->requestedThese();

        $proposition = $this->getPropositionService()->findByThese($these);

        $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        if ($signature === null) {

            $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

            $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        }



        $pdcData = $this->getTheseService()->fetchInformationsPageDeCouverture($these);
@@ -491,8 +491,10 @@ class PresoutenanceController extends AbstractController 
    {

        $these = $this->requestedThese();

        $proposition = $this->getPropositionService()->findByThese($these);

        $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        if ($signature === null) $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        if ($signature === null) {

            $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        }



        $pdcData = $this->getTheseService()->fetchInformationsPageDeCouverture($these);
@@ -519,8 +521,10 @@ class PresoutenanceController extends AbstractController 
        $these = $this->requestedThese();

        $proposition = $this->getPropositionService()->findByThese($these);

        $membre = $this->getMembreService()->getRequestedMembre($this);

        $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        if ($signature === null) $signature = $this->getStructureDocumentService()->getContenuFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEcoleDoctorale()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        if ($signature === null) {

            $signature = $this->getStructureDocumentService()->getCheminFichier($these->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_CONVOCATION, $these->getEtablissement());

        }



        $pdcData = $this->getTheseService()->fetchInformationsPageDeCouverture($these);

module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_doctorant.phtml

+1 −1
Changes for module/Soutenance/src/Soutenance/Service/Exporter/Convocation/convocation_doctorant.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ $civilite = ($these->getDoctorant()->getIndividu()->getCivilite() === 'M.')?"Mon 
        <td>

            <?php if ($signature) : ?>

            <img id="logo" style="background-color: white; max-width: 50%;"

                 src="data:image/*;base64,<?php echo base64_encode($signature); ?>"/>

                 src="<?php echo $signature ?>"/>

            <?php endif; ?>

        </td>

    </tr>