Loading module/Application/src/Application/Controller/FormationInstanceController.php +5 −1 Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -42,6 +42,8 @@ class FormationInstanceController extends AbstractActionController { $formation = $this->getFormationService()->getRequestedFormation($this); $instance = new FormationInstance(); $instance->setNbPlacePrincipale(0); $instance->setNbPlaceComplementaire(0); $instance->setFormation($formation); $this->getFormationInstanceService()->create($instance); Loading Loading @@ -250,11 +252,13 @@ class FormationInstanceController extends AbstractActionController { public function exportTousEmargementsAction() { $instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this); $journees = $instance->getJournees(); $journees = array_filter($journees, function (FormationInstanceJournee $a) { return $a->estNonHistorise();}); $exporter = new EmargementPdfExporter($this->renderer, 'A4'); $exporter->setVars([]); $filemane = "formation_".$instance->getFormation()->getId()."_du_".str_replace("/","-",$instance->getDebut())."_au_".str_replace("/","-",$instance->getFin())."_emargements.pdf"; $exporter->exportAll($instance->getJournees(), $filemane); $exporter->exportAll($journees, $filemane); exit; } Loading module/Application/src/Application/Service/Formation/FormationService.php +1 −1 Changes for module/Application/src/Application/Service/Formation/FormationService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -83,7 +83,7 @@ class FormationService { ->addSelect('groupe')->leftJoin('formation.groupe', 'groupe') ->addSelect('finstance')->leftJoin('formation.instances', 'finstance') ->addSelect('journee')->leftJoin('finstance.journees', 'journee') // ->addSelect('inscrit')->leftJoin('finstance.inscrits', 'inscrit') ->addSelect('inscrit')->leftJoin('finstance.inscrits', 'inscrit') ; return $qb; } Loading module/Application/src/Application/Service/FormationInstance/FormationInstanceInscritService.php +3 −0 Changes for module/Application/src/Application/Service/FormationInstance/FormationInstanceInscritService.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -73,7 +73,10 @@ class FormationInstanceInscritService { { $qb = $this->getEntityManager()->getRepository(FormationInstanceInscrit::class)->createQueryBuilder('inscrit') ->addSelect('agent')->join('inscrit.agent', 'agent') ->addSelect('affectation')->leftJoin('agent.affectations', 'affectation') ->addSelect('structure')->leftJoin('affectation.structure', 'structure') ->addSelect('finstance')->join('inscrit.instance', 'finstance') ->addSelect('formation')->join('finstance.formation', 'formation') ; return $qb; } Loading module/Application/src/Application/Service/FormationInstance/FormationInstanceService.php +4 −1 Changes for module/Application/src/Application/Service/FormationInstance/FormationInstanceService.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -77,7 +77,10 @@ class FormationInstanceService { $qb= $this->getEntityManager()->getRepository(FormationInstance::class)->createQueryBuilder('Finstance') ->addSelect('formation')->join('Finstance.formation', 'formation') ->addSelect('journee')->leftJoin('Finstance.journees', 'journee') // ->addSelect('inscrit')->leftJoin('Finstance.inscrits', 'inscrit') ->addSelect('inscrit')->leftJoin('Finstance.inscrits', 'inscrit') ->addSelect('agent')->leftJoin('inscrit.agent', 'agent') ->addSelect('affectation')->leftJoin('agent.affectations', 'affectation') ->addSelect('structure')->leftJoin('affectation.structure', 'structure') ; return $qb; } Loading module/Application/view/application/formation-instance/afficher.phtml +1 −1 Changes for module/Application/view/application/formation-instance/afficher.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ $historises = $instance->getListeHistorisee(); <br/> <?php /** @see \Application\Controller\FormationInstanceController::exportTousEmargementsAction() */?> <a href="<?php echo $this->url('formation-instance/export-tous-emargements', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action ajax-modal" data-event="modification"> class="btn btn-primary action" target="_blank"> <span class="icon pdf"></span> Exporter les émargements </a> Loading Loading
module/Application/src/Application/Controller/FormationInstanceController.php +5 −1 Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -42,6 +42,8 @@ class FormationInstanceController extends AbstractActionController { $formation = $this->getFormationService()->getRequestedFormation($this); $instance = new FormationInstance(); $instance->setNbPlacePrincipale(0); $instance->setNbPlaceComplementaire(0); $instance->setFormation($formation); $this->getFormationInstanceService()->create($instance); Loading Loading @@ -250,11 +252,13 @@ class FormationInstanceController extends AbstractActionController { public function exportTousEmargementsAction() { $instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this); $journees = $instance->getJournees(); $journees = array_filter($journees, function (FormationInstanceJournee $a) { return $a->estNonHistorise();}); $exporter = new EmargementPdfExporter($this->renderer, 'A4'); $exporter->setVars([]); $filemane = "formation_".$instance->getFormation()->getId()."_du_".str_replace("/","-",$instance->getDebut())."_au_".str_replace("/","-",$instance->getFin())."_emargements.pdf"; $exporter->exportAll($instance->getJournees(), $filemane); $exporter->exportAll($journees, $filemane); exit; } Loading
module/Application/src/Application/Service/Formation/FormationService.php +1 −1 Changes for module/Application/src/Application/Service/Formation/FormationService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -83,7 +83,7 @@ class FormationService { ->addSelect('groupe')->leftJoin('formation.groupe', 'groupe') ->addSelect('finstance')->leftJoin('formation.instances', 'finstance') ->addSelect('journee')->leftJoin('finstance.journees', 'journee') // ->addSelect('inscrit')->leftJoin('finstance.inscrits', 'inscrit') ->addSelect('inscrit')->leftJoin('finstance.inscrits', 'inscrit') ; return $qb; } Loading
module/Application/src/Application/Service/FormationInstance/FormationInstanceInscritService.php +3 −0 Changes for module/Application/src/Application/Service/FormationInstance/FormationInstanceInscritService.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -73,7 +73,10 @@ class FormationInstanceInscritService { { $qb = $this->getEntityManager()->getRepository(FormationInstanceInscrit::class)->createQueryBuilder('inscrit') ->addSelect('agent')->join('inscrit.agent', 'agent') ->addSelect('affectation')->leftJoin('agent.affectations', 'affectation') ->addSelect('structure')->leftJoin('affectation.structure', 'structure') ->addSelect('finstance')->join('inscrit.instance', 'finstance') ->addSelect('formation')->join('finstance.formation', 'formation') ; return $qb; } Loading
module/Application/src/Application/Service/FormationInstance/FormationInstanceService.php +4 −1 Changes for module/Application/src/Application/Service/FormationInstance/FormationInstanceService.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -77,7 +77,10 @@ class FormationInstanceService { $qb= $this->getEntityManager()->getRepository(FormationInstance::class)->createQueryBuilder('Finstance') ->addSelect('formation')->join('Finstance.formation', 'formation') ->addSelect('journee')->leftJoin('Finstance.journees', 'journee') // ->addSelect('inscrit')->leftJoin('Finstance.inscrits', 'inscrit') ->addSelect('inscrit')->leftJoin('Finstance.inscrits', 'inscrit') ->addSelect('agent')->leftJoin('inscrit.agent', 'agent') ->addSelect('affectation')->leftJoin('agent.affectations', 'affectation') ->addSelect('structure')->leftJoin('affectation.structure', 'structure') ; return $qb; } Loading
module/Application/view/application/formation-instance/afficher.phtml +1 −1 Changes for module/Application/view/application/formation-instance/afficher.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ $historises = $instance->getListeHistorisee(); <br/> <?php /** @see \Application\Controller\FormationInstanceController::exportTousEmargementsAction() */?> <a href="<?php echo $this->url('formation-instance/export-tous-emargements', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action ajax-modal" data-event="modification"> class="btn btn-primary action" target="_blank"> <span class="icon pdf"></span> Exporter les émargements </a> Loading