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

Modification et validation des formations pour l'entretien professionnel

parent 612fc54c

module/Application/config/merged/agent.config.php

+1 −1
Changes for module/Application/config/merged/agent.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ return [ 
                    'ajouter-agent-formation' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/ajouter-agent-formation/:agent',

                            'route'    => '/ajouter-agent-formation/:agent[/:formation]',

                            'defaults' => [

                                'controller' => AgentController::class,

                                'action'     => 'ajouter-agent-formation',

module/Application/config/merged/parcours-de-formation.config.php

+3 −4
Changes for module/Application/config/merged/parcours-de-formation.config.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ use Application\Form\ParcoursDeFormation\ParcoursDeFormationHydratorFactory; 
use Application\Provider\Privilege\FormationPrivileges;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceFactory;

use Application\View\Helper\ActiviteViewHelper;

use Application\View\Helper\ParcoursDeFormationViewHelper;

use Application\View\Helper\ParcoursDeFormationViewHelperFactory;

use UnicaenPrivilege\Guard\PrivilegeController;

use Zend\Router\Http\Literal;

use Zend\Router\Http\Segment;
@@ -164,8 +163,8 @@ return [ 
        ],

    ],

    'view_helpers' => [

        'invokables' => [

            'parcoursDeFormation'  => ParcoursDeFormationViewHelper::class,

        'factories' => [

            'parcoursDeFormation'  => ParcoursDeFormationViewHelperFactory::class,

        ],

    ],

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

+5 −1
Changes for module/Application/src/Application/Controller/AgentController.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ use Application\Form\AgentMissionSpecifique\AgentMissionSpecifiqueFormAwareTrait 
use Application\Service\Agent\AgentServiceAwareTrait;

use Application\Service\Application\ApplicationServiceAwareTrait;

use Application\Service\EntretienProfessionnel\EntretienProfessionnelServiceAwareTrait;

use Application\Service\Formation\FormationServiceAwareTrait;

use Application\Service\Structure\StructureServiceAwareTrait;

use Doctrine\ORM\ORMException;

use Fichier\Entity\Db\Fichier;
@@ -46,6 +47,7 @@ class AgentController extends AbstractActionController 
    use ValidationTypeServiceAwareTrait;

    use NatureServiceAwareTrait;

    use FichierServiceAwareTrait;

    use FormationServiceAwareTrait;

    use StructureServiceAwareTrait;

    use UserServiceAwareTrait;
@@ -447,11 +449,13 @@ class AgentController extends AbstractActionController 
    public function ajouterAgentFormationAction()

    {

        $agent = $this->getAgentService()->getRequestedAgent($this);

        $formation = $this->getFormationService()->getRequestedFormation($this);



        $agentFormation = new AgentFormation();

        $agentFormation->setAgent($agent);

        $agentFormation->setFormation($formation);

        $form = $this->getAgentFormationForm();

        $form->setAttribute('action', $this->url()->fromRoute('agent/ajouter-agent-formation', ['agent' => $agent->getId()]));

        $form->setAttribute('action', $this->url()->fromRoute('agent/ajouter-agent-formation', ['agent' => $agent->getId(), 'formation' => ($formation)?$formation->getId():null]));

        $form->bind($agentFormation);



        /** @var Request $request */

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

+4 −0
Changes for module/Application/src/Application/Controller/AgentControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ use Application\Form\AgentFormation\AgentFormationForm; 
use Application\Form\AgentMissionSpecifique\AgentMissionSpecifiqueForm;

use Application\Service\Agent\AgentService;

use Application\Service\EntretienProfessionnel\EntretienProfessionnelService;

use Application\Service\Formation\FormationService;

use Application\Service\Structure\StructureService;

use Fichier\Form\Upload\UploadForm;

use Fichier\Service\Fichier\FichierService;
@@ -29,6 +30,7 @@ class AgentControllerFactory { 
         * @var ValidationTypeService $validationTypeService

         * @var NatureService $natureService

         * @var FichierService $fichierService

         * @var FormationService $formationService

         * @var StructureService $structureService

         * @var UserService $userService

         */
@@ -38,6 +40,7 @@ class AgentControllerFactory { 
        $validationTypeService = $container->get(ValidationTypeService::class);

        $natureService = $container->get(NatureService::class);

        $fichierService = $container->get(FichierService::class);

        $formationService = $container->get(FormationService::class);

        $userService = $container->get(UserService::class);

        $structureService = $container->get(StructureService::class);
@@ -65,6 +68,7 @@ class AgentControllerFactory { 
        $controller->setValidationTypeService($validationTypeService);

        $controller->setNatureService($natureService);

        $controller->setFichierService($fichierService);

        $controller->setFormationService($formationService);

        $controller->setUserService($userService);

        $controller->setStructureService($structureService);

module/Application/src/Application/Controller/EntretienProfessionnelController.php

+2 −1
Changes for module/Application/src/Application/Controller/EntretienProfessionnelController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -184,12 +184,13 @@ class EntretienProfessionnelController extends AbstractActionController { 


    public function renseignerAction()

    {

        /** TODO  revoir ici une seul fiche de poste actives sinon c'est la merde */

        $entretien = $this->getEntretienProfessionnelService()->getRequestedEntretienProfessionnel($this, 'entretien');



        $agent = $entretien->getAgent();

        $fichespostes = ($agent)?$agent->getFiches():[];

        $fichesmetiers = [];

        $parcours = $this->getParcoursDeFormationService()->getParcoursDeFormation(1); //TODO recuperer le bon

        $parcours = ($fichespostes[0])?$this->getParcoursDeFormationService()->generateParcoursArrayFromFichePoste($fichespostes[0]):null;



        foreach ($fichespostes as $ficheposte) {

            $fiches = $ficheposte->getFichesMetiers();