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

Parcours de formation sur l'affichage des agents

parent 68b5ffcc

module/Application/src/Application/Controller/AgentController.php

+6 −0
Changes for module/Application/src/Application/Controller/AgentController.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ use Application\Form\CompetenceElement\CompetenceElementFormAwareTrait; 
use Application\Form\SelectionApplication\SelectionApplicationFormAwareTrait;

use Application\Service\Agent\AgentServiceAwareTrait;

use Application\Service\ApplicationElement\ApplicationElementServiceAwareTrait;

use Application\Service\Categorie\CategorieServiceAwareTrait;

use Application\Service\CompetenceElement\CompetenceElementServiceAwareTrait;

use Application\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;

use Application\Service\HasApplicationCollection\HasApplicationCollectionServiceAwareTrait;

use Application\Service\HasCompetenceCollection\HasCompetenceCollectionServiceAwareTrait;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;

use Application\Service\Structure\StructureServiceAwareTrait;

use Doctrine\ORM\ORMException;

use Fichier\Entity\Db\Fichier;
@@ -51,6 +53,8 @@ class AgentController extends AbstractActionController 
    use NatureServiceAwareTrait;

    use FichierServiceAwareTrait;

    use FormationServiceAwareTrait;

    use CategorieServiceAwareTrait;

    use ParcoursDeFormationServiceAwareTrait;

    use StructureServiceAwareTrait;

    use UserServiceAwareTrait;
@@ -82,12 +86,14 @@ class AgentController extends AbstractActionController 
        $agent = $this->getAgentService()->getRequestedAgent($this);

        $entretiens = $this->getEntretienProfessionnelService()->getEntretiensProfessionnelsParAgent($agent);

        $responsables = $this->getAgentService()->getClosestResponsablesByAgent($agent);

        $parcoursArray = $this->getParcoursDeFormationService()->generateParcoursArrayFromFichePoste($agent->getFichePosteActif());



        return new ViewModel([

            'title' => 'Afficher l\'agent',

            'agent' => $agent,

            'entretiens' => $entretiens,

            'responsables' => $responsables,

            'parcoursArray' => $parcoursArray,

        ]);

    }

module/Application/src/Application/Controller/AgentControllerFactory.php

+8 −0
Changes for module/Application/src/Application/Controller/AgentControllerFactory.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ use Application\Form\ApplicationElement\ApplicationElementForm; 
use Application\Form\CompetenceElement\CompetenceElementForm;

use Application\Service\Agent\AgentService;

use Application\Service\ApplicationElement\ApplicationElementService;

use Application\Service\Categorie\CategorieService;

use Application\Service\CompetenceElement\CompetenceElementService;

use Application\Service\EntretienProfessionnel\EntretienProfessionnelService;

use Application\Service\HasApplicationCollection\HasApplicationCollectionService;

use Application\Service\HasCompetenceCollection\HasCompetenceCollectionService;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;

use Application\Service\Structure\StructureService;

use Fichier\Form\Upload\UploadForm;

use Fichier\Service\Fichier\FichierService;
@@ -30,9 +32,11 @@ class AgentControllerFactory { 
         * @var AgentService $agentService

         * @var ApplicationElementService $applicationElementService

         * @var HasApplicationCollectionService $hasApplicationCollectionService

         * @var CategorieService $categorieService

         * @var CompetenceElementService $competenceElementService

         * @var HasCompetenceCollectionService $hasCompetenceCollectionService

         * @var EntretienProfessionnelService $entretienService

         * @var ParcoursDeFormationService $parcoursService

         * @var ValidationInstanceService $validationInstanceService

         * @var ValidationTypeService $validationTypeService
@@ -47,7 +51,9 @@ class AgentControllerFactory { 
        $hasApplicationCollectionService = $container->get(HasApplicationCollectionService::class);

        $competenceElementService = $container->get(CompetenceElementService::class);

        $hasCompetenceCollectionService = $container->get(HasCompetenceCollectionService::class);

        $categorieService = $container->get(CategorieService::class);

        $entretienService = $container->get(EntretienProfessionnelService::class);

        $parcoursService = $container->get(ParcoursDeFormationService::class);

        $validationInstanceService = $container->get(ValidationInstanceService::class);

        $validationTypeService = $container->get(ValidationTypeService::class);

        $natureService = $container->get(NatureService::class);
@@ -74,6 +80,8 @@ class AgentControllerFactory { 


        $controller->setAgentService($agentService);

        $controller->setApplicationElementService($applicationElementService);

        $controller->setCategorieService($categorieService);

        $controller->setParcoursDeFormationService($parcoursService);

        $controller->setHasApplicationCollectionService($hasApplicationCollectionService);

        $controller->setCompetenceElementService($competenceElementService);

        $controller->setHasCompetenceCollectionService($hasCompetenceCollectionService);

module/Application/src/Application/Controller/ParcoursDeFormationController.php

+7 −0
Changes for module/Application/src/Application/Controller/ParcoursDeFormationController.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,11 +25,18 @@ class ParcoursDeFormationController extends AbstractActionController 


    public function indexAction()

    {

        $result = [];

        $parcours = $this->getParcoursDeFormationService()->getParcoursDeFormations();

        foreach ($parcours as $parcour) {

            $result[($parcour->getType())?:""][] = $parcour;

        }



        $parcoursCategorie = $this->getParcoursDeFormationService()->getParcoursDeFormationsByType(ParcoursDeFormation::TYPE_CATEGORIE);

        $parcoursMetier = $this->getParcoursDeFormationService()->getParcoursDeFormationsByType(ParcoursDeFormation::TYPE_METIER);

        $parcoursVide = $this->getParcoursDeFormationService()->getParcoursDeFormationsByType(null);



        return new ViewModel([

            'parcours' => $result,

            'parcoursCategorie' => $parcoursCategorie,

            'parcoursMetier' => $parcoursMetier,

            'parcoursVide' => $parcoursVide,

module/Application/src/Application/Entity/Db/ParcoursDeFormation.php

+1 −0
Changes for module/Application/src/Application/Entity/Db/ParcoursDeFormation.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ class ParcoursDeFormation implements HistoriqueAwareInterface { 
    use HistoriqueAwareTrait;



    const TYPE_CATEGORIE = 'Catégorie';

    const TYPE_DOMAINE = 'Domaine';

    const TYPE_METIER    = 'Métier';



    /** @var integer */

module/Application/src/Application/Form/ModifierRattachement/ModifierRattachementForm.php

+21 −2
Changes for module/Application/src/Application/Form/ModifierRattachement/ModifierRattachementForm.php: 21 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Application\Form\ModifierRattachement; 


use Application\Entity\Db\ParcoursDeFormation;

use Application\Service\Categorie\CategorieServiceAwareTrait;

use Application\Service\Domaine\DomaineServiceAwareTrait;

use Application\Service\Metier\MetierServiceAwareTrait;

use Zend\Form\Element\Button;

use Zend\Form\Element\Select;
@@ -15,6 +16,7 @@ class ModifierRattachementForm extends Form 
{

    use CategorieServiceAwareTrait;

    use MetierServiceAwareTrait;

    use DomaineServiceAwareTrait;



    public function init()

    {
@@ -26,6 +28,7 @@ class ModifierRattachementForm extends Form 
                'empty_option' => "Sélectionner un type de parcours  ...",

                'value_options' => [

                    ParcoursDeFormation::TYPE_CATEGORIE => ParcoursDeFormation::TYPE_CATEGORIE,

                    ParcoursDeFormation::TYPE_DOMAINE => ParcoursDeFormation::TYPE_DOMAINE,

                    ParcoursDeFormation::TYPE_METIER => ParcoursDeFormation::TYPE_METIER,

                ],

            ],
@@ -40,7 +43,7 @@ class ModifierRattachementForm extends Form 
            'type' => Select::class,

            'name' => 'categorie',

            'options' => [

                'label' => "Catégorie (laisser vide si concerne un métier) :",

                'label' => "Catégorie (laisser vide si concerne un domaine ou un métier) :",

                'empty_option' => "Sélectionner une catégorie ...",

                'value_options' => $this->getCategorieService()->getCategorieAsOption(),

            ],
@@ -51,11 +54,26 @@ class ModifierRattachementForm extends Form 
            ],

        ]);



        $this->add([

            'type' => Select::class,

            'name' => 'domaine',

            'options' => [

                'label' => "Domaine (laisser vide si concerne une catégorie ou un métier) :",

                'empty_option' => "Sélectionner un domaine ...",

                'value_options' => $this->getDomaineService()->getDomainesAsOptions(),

            ],

            'attributes' => [

                'id' => 'Select',

                'class'             => 'bootstrap-selectpicker show-tick',

                'data-live-search'  => 'true',

            ],

        ]);



        $this->add([

            'type' => Select::class,

            'name' => 'metier',

            'options' => [

                'label' => "Métier (laisser vide si concerne une catégorie) :",

                'label' => "Métier (laisser vide si concerne une catégorie ou un domaine) :",

                'empty_option' => "Sélectionner un métier ...",

                'value_options' => $this->getMetierService()->getMetiersTypesAsMultiOptions(),

            ],
@@ -102,6 +120,7 @@ class ModifierRattachementForm extends Form 
                ]],

            ],

            'metier'             => [ 'required' => false, ],

            'domaine'             => [ 'required' => false, ],

            'categorie'          => [ 'required' => false, ],

        ]));

    }