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

Début de changement du logo de MEL

parent f00f6a77
Loading
Loading
Loading
Loading
+4 −0
Changes for module/Application/src/Application/Controller/Factory/TheseControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Controller\Factory;
use Application\Controller\TheseController;
use Application\Service\Etablissement\EtablissementService;
use Application\Service\FichierThese\FichierTheseService;
use Application\Service\File\FileService;
use Application\Service\MailConfirmationService;
use Application\Service\Notification\NotifierService;
use Application\Service\Role\RoleService;
@@ -44,6 +45,7 @@ class TheseControllerFactory
         * @var TheseRechercheService   $theseRechercheService
         * @var RoleService             $roleService
         * @var FichierTheseService     $fichierTheseService
         * @var FileService             $fileService
         * @var WorkflowService         $workflowService
         * @var NotifierService         $notifierService
         * @var EtablissementService    $etablissementService
@@ -61,6 +63,7 @@ class TheseControllerFactory
        $roleService = $sl->get('RoleService');
        $uniteService = $sl->get('UniteRechercheService');
        $fichierTheseService = $sl->get('FichierTheseService');
        $fileService = $sl->get(FileService::class);
        $workflowService = $sl->get('WorkflowService');
        $etablissementService = $sl->get('EtablissementService');
        $mailConfirmationService = $sl->get('MailConfirmationService');
@@ -78,6 +81,7 @@ class TheseControllerFactory
        $controller->setTheseRechercheService($theseRechercheService);
        $controller->setRoleService($roleService);
        $controller->setFichierTheseService($fichierTheseService);
        $controller->setFileService($fileService);
        $controller->setWorkflowService($workflowService);
        $controller->setEtablissementService($etablissementService);
        $controller->setUniteRechercheService($uniteService);
+9 −1
Changes for module/Application/src/Application/Controller/TheseController.php: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ use Application\Form\RdvBuTheseForm;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\FichierThese\Exception\ValidationImpossibleException;
use Application\Service\FichierThese\FichierTheseServiceAwareTrait;
use Application\Service\File\FileServiceAwareTrait;
use Application\Service\MailConfirmationServiceAwareTrait;
use Application\Service\Notification\NotifierServiceAwareTrait;
use Application\Service\Role\RoleServiceAwareTrait;
@@ -61,10 +62,12 @@ use Zend\Log\Logger;
use Zend\Log\Writer\Noop;
use Zend\Stdlib\ParametersInterface;
use Zend\View\Model\ViewModel;
use Zend\View\Renderer\PhpRenderer;

class TheseController extends AbstractController
{
    use FichierTheseServiceAwareTrait;
    use FileServiceAwareTrait;
    use MessageCollectorAwareTrait;
    use NotifierServiceAwareTrait;
    use RoleServiceAwareTrait;
@@ -1339,8 +1342,13 @@ class TheseController extends AbstractController
        $libEtablissementLe = $letab;
        $libEtablissementDe = "de " . $letab;

        $renderer = $this->getServiceLocator()->get('view_renderer'); /* @var $renderer \Zend\View\Renderer\PhpRenderer */
        //todo remplacer par celui de la comue si elle existe ...
        $cheminLogo = $this->fileService->computeLogoFilePathForStructure($these->getEtablissement()->getStructure());

        /* @var $renderer PhpRenderer */
        $renderer = $this->getServiceLocator()->get('view_renderer');
        $exporter = new ConventionPdfExporter($renderer, 'A4');
        $exporter->setLogo(file_get_contents($cheminLogo));
        $exporter->setVars([
            'these'              => $these,
            'diffusion'          => $diffusion,
+1 −1
Changes for module/Application/src/Application/Service/These/Convention/ConventionPdfExporter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class ConventionPdfExporter extends PdfExporter
        $resolver = $renderer->resolver();
        $resolver->attach(new TemplatePathStack(['script_paths' => [__DIR__]]));

        $this->setLogo(file_get_contents(APPLICATION_DIR . '/public/logo_normandie_univ.jpg')); // 'var:logo' dans les phtml
        //$this->setLogo(file_get_contents(APPLICATION_DIR . '/public/logo_normandie_univ.jpg')); // 'var:logo' dans les phtml
        $this->setHeaderScript('partial/header-odd.phtml', 'O');  // pages paires
        $this->setHeaderScript('partial/header-even.phtml', 'E'); // pages impaires
        $this->setFooterScript('partial/footer.phtml');