Commit 258568f0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge remote-tracking branch 'origin/feature_MEL_logo_et_adresse' into release-1.4.6

parents f00f6a77 18b5304c

doc/release-notes/MEL_logo/Pdf.php_change

0 → 100644
+4 −0
Original line number Diff line number Diff line 
protected function _addFooter()

protected function _addHeader()



$scriptVars = array_merge($scriptVars, current($this->scriptVars));
 
 No newline at end of file

doc/release-notes/MEL_logo/change.sql

0 → 100644
+16 −0
Original line number Diff line number Diff line 
alter table STRUCTURE add ADRESSE varchar2(1024)

/



alter table STRUCTURE add TELEPHONE varchar2(256)

/



alter table STRUCTURE add FAX varchar2(256)

/



alter table STRUCTURE add EMAIL varchar2(256)

/



alter table STRUCTURE add SITE_WEB varchar2(256)

/



alter table ETABLISSEMENT add EST_ETAB_INSCRIPTION NUMBER default 0 not null;
 
 No newline at end of file

module/Application/src/Application/Controller/Factory/TheseControllerFactory.php

+4 −0
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);

module/Application/src/Application/Controller/TheseController.php

+13 −1
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,9 +1342,18 @@ class TheseController extends AbstractController 
        $libEtablissementLe = $letab;

        $libEtablissementDe = "de " . $letab;



        $renderer = $this->getServiceLocator()->get('view_renderer'); /* @var $renderer \Zend\View\Renderer\PhpRenderer */

        $etablissement = $this->etablissementService->fetchEtablissementComue();

        if ($etablissement === null) $etablissement = $these->getEtablissement();

        $cheminLogo = $this->fileService->computeLogoFilePathForStructure($etablissement);



        /* @var $renderer PhpRenderer */

        $renderer = $this->getServiceLocator()->get('view_renderer');

        $exporter = new ConventionPdfExporter($renderer, 'A4');

//        $exporter->setLogo(file_get_contents($cheminLogo));

        $exporter->setVars([

            'test'               => "Ceci est un test",

            'etablissement'      => $etablissement,

            'logo'               => $cheminLogo,

            'these'              => $these,

            'diffusion'          => $diffusion,

            'attestation'        => $attestation,

module/Application/src/Application/Entity/Db/Etablissement.php

+23 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf 
     */

    protected $estAssocie = false;



    /**

     * @var bool

     */

    protected $estInscription = false;



    /**

     * @var bool

     */
@@ -199,6 +204,24 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf 
        return $this;

    }



    /**

     * @return bool

     */

    public function estInscription()

    {

        return $this->estInscription;

    }



    /**

     * @param bool $estInscription

     * @return Etablissement

     */

    public function setEstInscription($estInscription)

    {

        $this->estInscription = $estInscription;

        return $this;

    }



    /**

     * @return bool

     */