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

Ajout (au moment de leur téléchargement) d'une page de couverture aux rapports d'activité validés

parent ef155f4f

config/autoload/global.php

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,18 @@ return [ 
            // Resaisir les attestations ? Sinon celles saisies au 1er dépôt sont reprises/dupliquées.

            'resaisir_attestations' => true,

        ],

        // Options concernant les rapports (activité, CSI, mi-parcours)

        'rapport' => [

            // Page de couverture des rapports d'activité déposés

            'page_de_couverture' => [

                'template' => [

                    // template .phtml

                    'phtml_file_path' => APPLICATION_DIR . '/module/Application/view/application/rapport/page-de-couverture/pagedecouverture.phtml',

                    // feuille de styles

                    'css_file_path' => APPLICATION_DIR . '/module/Application/view/application/rapport/page-de-couverture/pagedecouverture.css',

                ],

            ],

        ],

    ],

    // Options pour le service de notification par mail

    'notification' => [

config/autoload/local.php.dist

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ return [ 
            'resaisir_autorisation_diffusion' => false,

            'resaisir_attestations' => false,

        ],

        'rapport' => [

            'page_de_couverture' => [

                'template' => [

                    // template .phtml

                    'phtml_file_path' => APPLICATION_DIR . '/module/Application/view/application/rapport/page-de-couverture/pagedecouverture.phtml',

                    // feuille de styles

                    'css_file_path' => APPLICATION_DIR . '/module/Application/view/application/rapport/page-de-couverture/pagedecouverture.css',

                ],

            ],

        ],

    ],



    'actualite' => [

module/Application/src/Application/Command/Pdf/PdfMergeShellCommandQpdf.php

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class PdfMergeShellCommandQpdf extends MergeShellCommand 
    {

        // Commande de fusion (cf. https://qpdf.sourceforge.io/files/qpdf-manual.html#ref.page-selection)

        $command = $this->executable .

            sprintf(' %s --pages %s -- %s',

            sprintf(' %s --pages . %s -- %s',

                array_shift($this->inputFilesPaths),

                implode(' ', $this->inputFilesPaths),

                $this->outputFilePath

module/Application/src/Application/Controller/Factory/Rapport/RapportActiviteControllerFactory.php

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use Application\Entity\Db\TypeValidation; 
use Application\Form\Rapport\RapportForm;

use Application\Form\RapportActiviteForm;

use Application\Service\Fichier\FichierService;

use Application\Service\File\FileService;

use Application\Service\Individu\IndividuService;

use Application\Service\Notification\NotifierService;

use Application\Service\Rapport\RapportService;
@@ -29,6 +30,7 @@ class RapportActiviteControllerFactory 
    {

        /**

         * @var TheseService          $theseService

         * @var FileService           $fileService

         * @var FichierService        $fichierService

         * @var RapportService        $rapportService

         * @var VersionFichierService $versionFichierService
@@ -38,6 +40,7 @@ class RapportActiviteControllerFactory 
         * @var RapportForm           $rapportForm

         */

        $theseService = $container->get('TheseService');

        $fileService = $container->get(FileService::class);

        $fichierService = $container->get(FichierService::class);

        $rapportService = $container->get(RapportService::class);

        $versionFichierService = $container->get('VersionFichierService');
@@ -52,6 +55,7 @@ class RapportActiviteControllerFactory 
        $controller = new RapportActiviteController();

        $controller->setTheseService($theseService);

        $controller->setRapportService($rapportService);

        $controller->setFileService($fileService);

        $controller->setFichierService($fichierService);

        $controller->setVersionFichierService($versionFichierService);

        $controller->setNotifierService($notificationService);

module/Application/src/Application/Controller/Rapport/RapportActiviteController.php

+15 −0
Original line number Diff line number Diff line
@@ -84,4 +84,19 @@ class RapportActiviteController extends RapportController 
        }

        $this->form->setEstFinalValueOptions($estFinalValueOptions);

    }



    public function telechargerAction()

    {

        $rapport = $this->requestedRapport();



        // s'il s'agit d'un rapport d'activité validé, on ajoute une page de couverture

        if ($rapport->getRapportValidation() !== null) {

            $pdcData = $this->theseService->fetchInformationsPageDeCouverture($rapport->getThese());

            $outputFilePath = $this->rapportService->ajouterPdc($rapport, $pdcData);

            $this->fileService->downloadFile($outputFilePath);

            exit;

        }



        return parent::telechargerAction();

    }

}