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

Listing des agents pour les Supérieur·es et Autorités utilise le même fitlrage que les structures

parent 5ae1dc88

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

+10 −0
Changes for module/Application/src/Application/Controller/IndexController.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait; 
use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;

use Structure\Controller\StructureController;

use Structure\Entity\Db\StructureAgentForce;

use Structure\Provider\Parametre\StructureParametres;

use Structure\Provider\Role\RoleProvider;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait;

use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;

use UnicaenRenderer\Service\Rendu\RenduServiceAwareTrait;

use UnicaenUtilisateur\Entity\Db\Role;

use UnicaenUtilisateur\Entity\Db\User;
@@ -35,6 +37,7 @@ class IndexController extends AbstractActionController 
    use AgentAutoriteServiceAwareTrait;

    use AgentSuperieurServiceAwareTrait;

    use CampagneServiceAwareTrait;

    use ParametreServiceAwareTrait;

    use RenduServiceAwareTrait;

    use RoleServiceAwareTrait;

    use StructureServiceAwareTrait;
@@ -111,7 +114,10 @@ class IndexController extends AbstractActionController 
    {

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

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



        $agents = array_map(function (AgentSuperieur $a) { return $a->getAgent(); },$this->getAgentSuperieurService()->getAgentsSuperieursBySuperieur($agent));

        $agents = $this->getAgentService()->filtrerWithStatutTemoin($agents, $this->getParametreService()->getParametreByCode(StructureParametres::TYPE, StructureParametres::AGENT_TEMOIN_STATUT));

        $agents = $this->getAgentService()->filtrerWithAffectationTemoin($agents, $this->getParametreService()->getParametreByCode(StructureParametres::TYPE, StructureParametres::AGENT_TEMOIN_AFFECTATION));

        usort($agents, function (Agent $a, Agent $b) { return $a->getNomUsuel()." ".$a->getPrenom() > $b->getNomUsuel()." ".$b->getPrenom();});



        /** Campagne d'entretien professionnel ************************************************************************/
@@ -151,7 +157,11 @@ class IndexController extends AbstractActionController 
    {

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

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



        $agents = array_map(function (AgentAutorite $a) { return $a->getAgent(); },$this->getAgentAutoriteService()->getAgentsAutoritesByAutorite($agent));

        $agents = $this->getAgentService()->filtrerWithStatutTemoin($agents, $this->getParametreService()->getParametreByCode(StructureParametres::TYPE, StructureParametres::AGENT_TEMOIN_STATUT));

        $agents = $this->getAgentService()->filtrerWithAffectationTemoin($agents, $this->getParametreService()->getParametreByCode(StructureParametres::TYPE, StructureParametres::AGENT_TEMOIN_AFFECTATION));



        usort($agents, function (Agent $a, Agent $b) { return $a->getNomUsuel()." ".$a->getPrenom() > $b->getNomUsuel()." ".$b->getPrenom();});



        /** Campagne d'entretien professionnel ************************************************************************/

module/Application/src/Application/Controller/IndexControllerFactory.php

+4 −0
Changes for module/Application/src/Application/Controller/IndexControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ use Psr\Container\ContainerExceptionInterface; 
use Psr\Container\NotFoundExceptionInterface;

use Structure\Service\Structure\StructureService;

use UnicaenAuthentification\Service\UserContext;

use UnicaenParametre\Service\Parametre\ParametreService;

use UnicaenRenderer\Service\Rendu\RenduService;

use UnicaenUtilisateur\Service\Role\RoleService;

use UnicaenUtilisateur\Service\User\UserService;
@@ -35,6 +36,7 @@ class IndexControllerFactory { 
         * @var AgentSuperieurService $agentSuperieurService

         * @var AgentService $agentService

         * @var CampagneService $campagneService

         * @var ParametreService $parametreService

         * @var RenduService $renduService

         * @var RoleService $roleService

         * @var StructureService $structureService
@@ -51,6 +53,7 @@ class IndexControllerFactory { 
        $agentAutoriteService = $container->get(AgentAutoriteService::class);

        $agentSuperieurService = $container->get(AgentSuperieurService::class);

        $campagneService = $container->get(CampagneService::class);

        $parametreService = $container->get(ParametreService::class);

        $renduService = $container->get(RenduService::class);

        $roleService = $container->get(RoleService::class);

        $userService = $container->get(UserService::class);
@@ -69,6 +72,7 @@ class IndexControllerFactory { 
        $controller->setAgentSuperieurService($agentSuperieurService);

        $controller->setAgentService($agentService);

        $controller->setCampagneService($campagneService);

        $controller->setParametreService($parametreService);

        $controller->setRenduService($renduService);

        $controller->setRoleService($roleService);

        $controller->setServiceUserContext($userContext);