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

Enrichissement index personnel et correction pb lié au PDF

parent c99d8f1f

config/autoload/unicaen-app.global.php

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ return [ 
        'app_infos' => [

            'nom'     => "PrEECoG",

            'desc'    => "Gestion Prévisionnelle des effectifs, des emplois et des compétences",

            'version' => "0.2.5",

            'date'    => "17/09/2019",

            'version' => "0.2.6",

            'date'    => "18/09/2019",

            'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/],

            'mentionsLegales'        => "http://www.unicaen.fr/acces-direct/mentions-legales/",

            'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",

module/Application/src/Application/Controller/FichePosteController.php

+9 −3
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ class FichePosteController extends AbstractActionController { 
    use FichePosteCreationFormAwareTrait;

    use SpecificitePosteFormAwareTrait;



    private $renderer;



    public function setRenderer($renderer)

    {

        $this->renderer = $renderer;

    }



    public function indexAction()

    {

        $fiches = $this->getFichePosteService()->getFichesPostes();
@@ -461,10 +468,9 @@ class FichePosteController extends AbstractActionController { 
    {

        $fiche = $this->getFichePosteService()->getRequestedFichePoste($this, 'fiche-poste');



        /* @var PhpRenderer $renderer  */

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



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



        $exporter = new FichePostePdfExporter($this->renderer, 'A4');

        $exporter->setVars([

            'fiche' => $fiche,

        ]);

module/Application/src/Application/Controller/FichePosteControllerFactory.php

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ use Application\Service\Agent\AgentService; 
use Application\Service\FichePoste\FichePosteService;

use Application\Service\Structure\StructureService;

use Interop\Container\ContainerInterface;

use Zend\View\Renderer\PhpRenderer;



class FichePosteControllerFactory {
@@ -40,8 +41,12 @@ class FichePosteControllerFactory { 
        $fichePosteCreation = $container->get('FormElementManager')->get(FichePosteCreationForm::class);

        $specificiftePosteForm = $container->get('FormElementManager')->get(SpecificitePosteForm::class);



        /* @var PhpRenderer $renderer  */

        $renderer = $container->get('ViewRenderer');



        /** @var FichePosteController $controller */

        $controller = new FichePosteController();

        $controller->setRenderer($renderer);



        $controller->setAgentService($agentService);

        $controller->setFichePosteService($fichePosteService);

module/Application/src/Application/Controller/IndexController.php

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


namespace Application\Controller;



use Application\Entity\Db\AgentMissionSpecifique;

use Application\Form\AgentMissionSpecifique\AgentMissionSpecifiqueForm;

use Application\Service\Agent\AgentServiceAwareTrait;

use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;

use Utilisateur\Entity\Db\Role;
@@ -68,10 +70,14 @@ class IndexController extends AbstractActionController 


        $user = $this->getUserService()->getConnectedUser();

        $agent = $this->getAgentService()->getAgentByUser($user);

        $missions = $agent->getMissionsSpecifiques();

        usort($missions, function (AgentMissionSpecifique $a, AgentMissionSpecifique $b) { return $a->getDateDebut() > $b->getDateDebut();});



        return new ViewModel([

            'user' => $user,

            'agent' => $agent,

            'fiche' => $agent->getFiche(),

            'missions' => $missions,

        ]);

    }

module/Application/src/Application/Form/Poste/PosteForm.php

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class PosteForm extends Form { 
            'options' => [

                'label' => "Service/composante/direction d'affectation :",

                'empty_option'  => "Sélectionner une service ...",

                'value_options' => $this->getStructureService()->getStructuresAsOptions(),

                'value_options' => $this->getStructureService()->getStructuresAsGroupOptions(),

            ],

            'attributes' => [

                'id'                => 'structure',