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

Ajout de la signature pour les formations

parent d1174550
Loading
Loading
Loading
Loading
+2
Changes for module/Application/src/Application/Controller/StructureController.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ use Application\Service\Role\RoleServiceAwareTrait;
use Application\Service\Structure\StructureServiceAwareTrait;
use Application\Service\StructureDocument\StructureDocumentServiceAwareTrait;
use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait;
use Formation\Provider\NatureFichier\NatureFichier as NatureFichierFormation;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;

@@ -135,6 +136,7 @@ class StructureController extends AbstractController
        $structure = $this->structureService->getRequestedStructure($this);
        $natures = $this->natureFichierService->findAllByCodes([
            NatureFichier::CODE_SIGNATURE_CONVOCATION,
            NatureFichierFormation::CODE_SIGNATURE_FORMATION,
            NatureFichier::CODE_SIGNATURE_RAPPORT_ACTIVITE,
        ]);
        $etablissements = $this->etablissementService->getRepository()->findAllEtablissementsInscriptions();
+2
Changes for module/Formation/SQL/002_donnees_initiales.sql: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ INSERT INTO FORMATION_ETAT (CODE, LIBELLE, DESCRIPTION, ICONE, COULEUR, ORDRE) V
INSERT INTO FORMATION_ETAT (CODE, LIBELLE, DESCRIPTION, ICONE, COULEUR, ORDRE) VALUES ('F', 'Inscription fermée', null, 'glyphicon glyphicon-ban-circle', '#008fcc', 3);
INSERT INTO FORMATION_ETAT (CODE, LIBELLE, DESCRIPTION, ICONE, COULEUR, ORDRE) VALUES ('A', 'Session annulée', 'La session a été annulée', 'icon icon-historiser', '#cc0000', 5);
INSERT INTO FORMATION_ETAT (CODE, LIBELLE, DESCRIPTION, ICONE, COULEUR, ORDRE) VALUES ('C', 'Close', 'Formation close', null, null, 4);

INSERT INTO nature_fichier (code, libelle) VALUES ('SIGNATURE_FORMATION', 'Signature pour les formations');
 No newline at end of file
+9
Changes for module/Formation/src/Formation/Controller/InscriptionController.php: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ use Application\Entity\Db\Individu;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\File\FileServiceAwareTrait;
use Application\Service\Individu\IndividuServiceAwareTrait;
use Application\Service\StructureDocument\StructureDocumentServiceAwareTrait;
use Doctorant\Entity\Db\Doctorant;
use Doctorant\Service\DoctorantServiceAwareTrait;
use Formation\Entity\Db\Inscription;
use Formation\Entity\Db\Session;
use Formation\Provider\NatureFichier\NatureFichier;
use Formation\Service\Exporter\Attestation\AttestationExporter;
use Formation\Service\Exporter\Convocation\ConvocationExporter;
use Formation\Service\Inscription\InscriptionServiceAwareTrait;
@@ -31,6 +33,7 @@ class InscriptionController extends AbstractController
    use InscriptionServiceAwareTrait;
    use NotificationServiceAwareTrait;
    use PresenceServiceAwareTrait;
    use StructureDocumentServiceAwareTrait;

    /** @var PhpRenderer */
    private $renderer;
@@ -226,9 +229,12 @@ class InscriptionController extends AbstractController
            $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue);
        }

        $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION);

        //exporter
        $export = new ConvocationExporter($this->renderer, 'A4');
        $export->setVars([
            'signature' => $signature,
            'inscription' => $inscription,
            'logos' => $logos,
        ]);
@@ -249,9 +255,12 @@ class InscriptionController extends AbstractController
            $logos['comue'] = $this->fileService->computeLogoFilePathForStructure($comue);
        }

        $signature = $this->getStructureDocumentService()->getContenuFichier($inscription->getDoctorant()->getEtablissement()->getStructure(), NatureFichier::CODE_SIGNATURE_FORMATION);

        //exporter
        $export = new AttestationExporter($this->renderer, 'A4');
        $export->setVars([
            'signature' => $signature,
            'inscription' => $inscription,
            'logos' => $logos,
            'presences' => $presences,
+4
Changes for module/Formation/src/Formation/Controller/InscriptionControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Formation\Controller;
use Application\Service\Etablissement\EtablissementService;
use Application\Service\File\FileService;
use Application\Service\Individu\IndividuService;
use Application\Service\StructureDocument\StructureDocumentService;
use Doctorant\Service\DoctorantService;
use Doctrine\ORM\EntityManager;
use Formation\Service\Inscription\InscriptionService;
@@ -30,6 +31,7 @@ class InscriptionControllerFactory {
         * @var IndividuService $individuService
         * @var NotificationService $notificationService
         * @var PresenceService $presenceService
         * @var StructureDocumentService $structureDocumentService
         */
        $entityManager = $container->get('doctrine.entitymanager.orm_default');
        $doctorantService = $container->get(DoctorantService::class);
@@ -39,6 +41,7 @@ class InscriptionControllerFactory {
        $inscriptionService = $container->get(InscriptionService::class);
        $notificationService = $container->get(NotificationService::class);
        $presenceService = $container->get(PresenceService::class);
        $structureDocumentService = $container->get(StructureDocumentService::class);

        /* @var $renderer PhpRenderer */
        $renderer = $container->get('ViewRenderer');
@@ -53,6 +56,7 @@ class InscriptionControllerFactory {
        $controller->setInscriptionService($inscriptionService);
        $controller->setNotificationService($notificationService);
        $controller->setPresenceService($presenceService);
        $controller->setStructureDocumentService($structureDocumentService);
        /** forms *****************************************************************************************************/
        /** autres*****************************************************************************************************/
        $controller->setRenderer($renderer);
+7
Changes for module/Formation/src/Formation/Provider/NatureFichier/NatureFichier.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Formation\Provider\NatureFichier;

class NatureFichier {
    const CODE_SIGNATURE_FORMATION = 'SIGNATURE_FORMATION';
}
 No newline at end of file
Loading