Loading module/Application/config/merged/formation.config.php +12 −1 Changes for module/Application/config/merged/formation.config.php: 12 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -89,7 +89,7 @@ return [ 'editer', 'editer-groupe', 'editer-theme', 'update-ordre-groupe' 'update-ordre-groupe', 'modifier-formation-informations', 'ajouter-instance', ], Loading Loading @@ -126,6 +126,7 @@ return [ 'controller' => FormationInstanceController::class, 'action' => [ 'afficher', 'generer-convocation', ], 'privileges' => [ FormationPrivileges::FORMATION_INSTANCE_AFFICHER, Loading Loading @@ -239,6 +240,16 @@ return [ ], ], ], 'generer-convocation' => [ 'type' => Segment::class, 'options' => [ 'route' => '/generer-convocation/:inscrit', 'defaults' => [ 'controller' => FormationInstanceController::class, 'action' => 'generer-convocation', ], ], ], 'historiser' => [ 'type' => Segment::class, 'options' => [ Loading module/Application/src/Application/Controller/FormationInstanceController.php +19 −0 Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 19 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,8 @@ use Application\Service\FormationInstance\FormationInstanceJourneeServiceAwareTr use Application\Service\FormationInstance\FormationInstanceServiceAwareTrait; use Mpdf\MpdfException; use UnicaenApp\Exception\RuntimeException; use UnicaenDocument\Service\Contenu\ContenuServiceAwareTrait; use UnicaenDocument\Service\Exporter\ExporterServiceAwareTrait; use Zend\Http\Request; use Zend\Mvc\Controller\AbstractActionController; use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger; Loading @@ -30,6 +32,7 @@ class FormationInstanceController extends AbstractActionController { use FormationInstanceFormAwareTrait; use FormationJourneeFormAwareTrait; use SelectionAgentFormAwareTrait; use ExporterServiceAwareTrait; private $renderer; Loading Loading @@ -373,4 +376,20 @@ class FormationInstanceController extends AbstractActionController { return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true); } /** * @throws MpdfException */ public function genererConvocationAction() { $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this); $this->getExporterService()->setVars([ 'type' => 'FORMATION_CONVOCATION', 'agent' => $inscrit->getAgent(), 'instance' => $inscrit->getInstance(), ]); $this->getExporterService()->export('export.pdf'); exit; } } No newline at end of file module/Application/src/Application/Controller/FormationInstanceControllerFactory.php +4 −0 Changes for module/Application/src/Application/Controller/FormationInstanceControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ use Application\Service\FormationInstance\FormationInstanceInscritService; use Application\Service\FormationInstance\FormationInstanceJourneeService; use Application\Service\FormationInstance\FormationInstanceService; use Interop\Container\ContainerInterface; use UnicaenDocument\Service\Exporter\ExporterService; use Zend\View\Renderer\PhpRenderer; class FormationInstanceControllerFactory { Loading @@ -25,11 +26,13 @@ class FormationInstanceControllerFactory { * @var FormationInstanceService $formationInstanceService * @var FormationInstanceInscritService $formationInstanceInscritService * @var FormationInstanceJourneeService $formationInstanceJourneeService * @var ExporterService $exporterService */ $formationService = $container->get(FormationService::class); $formationInstanceService = $container->get(FormationInstanceService::class); $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class); $formationInstanceJourneeService = $container->get(FormationInstanceJourneeService::class); $exporterService = $container->get(ExporterService::class); /** * @var FormationInstanceForm $formationInstanceForm Loading @@ -50,6 +53,7 @@ class FormationInstanceControllerFactory { $controller->setFormationInstanceService($formationInstanceService); $controller->setFormationInstanceInscritService($formationInstanceInscritService); $controller->setFormationInstanceJourneeService($formationInstanceJourneeService); $controller->setExporterService($exporterService); $controller->setFormationInstanceForm($formationInstanceForm); $controller->setFormationJourneeForm($formationJourneeForm); $controller->setSelectionAgentForm($selectionAgentForm); Loading module/Application/view/application/formation-instance/afficher.phtml +4 −1 Changes for module/Application/view/application/formation-instance/afficher.phtml: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -218,7 +218,10 @@ $historises = $instance->getListeHistorisee(); data-toggle="tooltip" data-html="true" title="Afficher la fiche de <span class='highlight agent'><?php echo $inscrit->getAgent()->getDenomination(); ?></span>" > <span class="icon agent"></span></a> <span class="icon pdf"></span> <?php /** @see \Application\Controller\FormationInstanceController::genererConvocationAction() */?> <a href="<?php echo $this->url('formation-instance/generer-convocation', ['inscrit' => $inscrit->getId()], [], true); ?>" data-toogle="tooltip" data-html="true" title="Générer la convocation"> <span class="icon pdf"></span></a> <?php if (! $complementaireComplete) : ?> <?php /** @see \Application\Controller\FormationInstanceController::envoyerListeComplementaireAction() */?> <a href="<?php echo $this->url('formation-instance/envoyer-liste-complementaire', ['inscrit' => $inscrit->getId()], [], true); ?>" Loading module/Application/view/application/formation/modifier.phtml +1 −1 Changes for module/Application/view/application/formation/modifier.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ $instances = $formation->getInstances(); </dd> <dt>Groupe</dt> <dd> <?php echo ($formation->getGroupe())?$this->formationGroupe($formation->getGroupe()):"Non renseigné"; ?> <?php echo ($formation->getGroupe())?$formation->getGroupe()->getLibelle():"Non renseigné"; ?> </dd> <dt>Lien</dt> <dd> Loading Loading
module/Application/config/merged/formation.config.php +12 −1 Changes for module/Application/config/merged/formation.config.php: 12 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -89,7 +89,7 @@ return [ 'editer', 'editer-groupe', 'editer-theme', 'update-ordre-groupe' 'update-ordre-groupe', 'modifier-formation-informations', 'ajouter-instance', ], Loading Loading @@ -126,6 +126,7 @@ return [ 'controller' => FormationInstanceController::class, 'action' => [ 'afficher', 'generer-convocation', ], 'privileges' => [ FormationPrivileges::FORMATION_INSTANCE_AFFICHER, Loading Loading @@ -239,6 +240,16 @@ return [ ], ], ], 'generer-convocation' => [ 'type' => Segment::class, 'options' => [ 'route' => '/generer-convocation/:inscrit', 'defaults' => [ 'controller' => FormationInstanceController::class, 'action' => 'generer-convocation', ], ], ], 'historiser' => [ 'type' => Segment::class, 'options' => [ Loading
module/Application/src/Application/Controller/FormationInstanceController.php +19 −0 Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 19 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -15,6 +15,8 @@ use Application\Service\FormationInstance\FormationInstanceJourneeServiceAwareTr use Application\Service\FormationInstance\FormationInstanceServiceAwareTrait; use Mpdf\MpdfException; use UnicaenApp\Exception\RuntimeException; use UnicaenDocument\Service\Contenu\ContenuServiceAwareTrait; use UnicaenDocument\Service\Exporter\ExporterServiceAwareTrait; use Zend\Http\Request; use Zend\Mvc\Controller\AbstractActionController; use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger; Loading @@ -30,6 +32,7 @@ class FormationInstanceController extends AbstractActionController { use FormationInstanceFormAwareTrait; use FormationJourneeFormAwareTrait; use SelectionAgentFormAwareTrait; use ExporterServiceAwareTrait; private $renderer; Loading Loading @@ -373,4 +376,20 @@ class FormationInstanceController extends AbstractActionController { return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $inscrit->getInstance()->getId()], [], true); } /** * @throws MpdfException */ public function genererConvocationAction() { $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this); $this->getExporterService()->setVars([ 'type' => 'FORMATION_CONVOCATION', 'agent' => $inscrit->getAgent(), 'instance' => $inscrit->getInstance(), ]); $this->getExporterService()->export('export.pdf'); exit; } } No newline at end of file
module/Application/src/Application/Controller/FormationInstanceControllerFactory.php +4 −0 Changes for module/Application/src/Application/Controller/FormationInstanceControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ use Application\Service\FormationInstance\FormationInstanceInscritService; use Application\Service\FormationInstance\FormationInstanceJourneeService; use Application\Service\FormationInstance\FormationInstanceService; use Interop\Container\ContainerInterface; use UnicaenDocument\Service\Exporter\ExporterService; use Zend\View\Renderer\PhpRenderer; class FormationInstanceControllerFactory { Loading @@ -25,11 +26,13 @@ class FormationInstanceControllerFactory { * @var FormationInstanceService $formationInstanceService * @var FormationInstanceInscritService $formationInstanceInscritService * @var FormationInstanceJourneeService $formationInstanceJourneeService * @var ExporterService $exporterService */ $formationService = $container->get(FormationService::class); $formationInstanceService = $container->get(FormationInstanceService::class); $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class); $formationInstanceJourneeService = $container->get(FormationInstanceJourneeService::class); $exporterService = $container->get(ExporterService::class); /** * @var FormationInstanceForm $formationInstanceForm Loading @@ -50,6 +53,7 @@ class FormationInstanceControllerFactory { $controller->setFormationInstanceService($formationInstanceService); $controller->setFormationInstanceInscritService($formationInstanceInscritService); $controller->setFormationInstanceJourneeService($formationInstanceJourneeService); $controller->setExporterService($exporterService); $controller->setFormationInstanceForm($formationInstanceForm); $controller->setFormationJourneeForm($formationJourneeForm); $controller->setSelectionAgentForm($selectionAgentForm); Loading
module/Application/view/application/formation-instance/afficher.phtml +4 −1 Changes for module/Application/view/application/formation-instance/afficher.phtml: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -218,7 +218,10 @@ $historises = $instance->getListeHistorisee(); data-toggle="tooltip" data-html="true" title="Afficher la fiche de <span class='highlight agent'><?php echo $inscrit->getAgent()->getDenomination(); ?></span>" > <span class="icon agent"></span></a> <span class="icon pdf"></span> <?php /** @see \Application\Controller\FormationInstanceController::genererConvocationAction() */?> <a href="<?php echo $this->url('formation-instance/generer-convocation', ['inscrit' => $inscrit->getId()], [], true); ?>" data-toogle="tooltip" data-html="true" title="Générer la convocation"> <span class="icon pdf"></span></a> <?php if (! $complementaireComplete) : ?> <?php /** @see \Application\Controller\FormationInstanceController::envoyerListeComplementaireAction() */?> <a href="<?php echo $this->url('formation-instance/envoyer-liste-complementaire', ['inscrit' => $inscrit->getId()], [], true); ?>" Loading
module/Application/view/application/formation/modifier.phtml +1 −1 Changes for module/Application/view/application/formation/modifier.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ $instances = $formation->getInstances(); </dd> <dt>Groupe</dt> <dd> <?php echo ($formation->getGroupe())?$this->formationGroupe($formation->getGroupe()):"Non renseigné"; ?> <?php echo ($formation->getGroupe())?$formation->getGroupe()->getLibelle():"Non renseigné"; ?> </dd> <dt>Lien</dt> <dd> Loading