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

Arret d'usage des fonction computeSuperieurs et computeAutorites

parent 929147d6

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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ class AgentController extends AbstractActionController 
            'affectations' => $agentAffectations,

            'statuts' => $agentStatuts,

            'grades' => $agentGrades,

            'echelon' => $agent->getEchelonActif(),

            'echelons' => $agent->getEchelonsActifs(),

            'fichespostes' => $fichespostes,



            'superieures' => $superieures,

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

+7 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
namespace Application\Controller;



use Application\Entity\Db\Agent;

use Application\Entity\Db\AgentSuperieur;

use Application\Entity\Db\Expertise;

use Application\Entity\Db\FichePoste;

use Application\Entity\Db\FicheposteActiviteDescriptionRetiree;
@@ -21,6 +22,7 @@ use Application\Provider\Validation\FichePosteValidations; 
use Application\Service\ActivitesDescriptionsRetirees\ActivitesDescriptionsRetireesServiceAwareTrait;

use Application\Service\Agent\AgentServiceAwareTrait;

use Application\Service\AgentPoste\AgentPosteServiceAwareTrait;

use Application\Service\AgentSuperieur\AgentSuperieurServiceAwareTrait;

use Application\Service\ApplicationsRetirees\ApplicationsRetireesServiceAwareTrait;

use Application\Service\CompetencesRetirees\CompetencesRetireesServiceAwareTrait;

use Application\Service\Expertise\ExpertiseServiceAwareTrait;
@@ -54,6 +56,7 @@ class FichePosteController extends AbstractActionController { 
    /** Service **/

    use ActivitesDescriptionsRetireesServiceAwareTrait;

    use AgentServiceAwareTrait;

    use AgentSuperieurServiceAwareTrait;

    use AgentPosteServiceAwareTrait;



    use ApplicationsRetireesServiceAwareTrait;
@@ -940,10 +943,10 @@ class FichePosteController extends AbstractActionController { 
                $texte .= "Suite à cette validation un courrier électronique sera envoyé à l'agent associé à la fiche de poste  (".$ficheposte->getAgent()->getDenomination().") afin qu'il puisse valider à son tour celle-ci.<br/>";

                break;

            case FichePosteValidations::VALIDATION_AGENT :

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

                usort($responsables, function (Agent $a, Agent $b) {

                    $aaa = $a->getNomUsuel() . " " . $a->getPrenom();

                    $bbb = $b->getNomUsuel() . " " . $b->getPrenom();

                $responsables = $this->getAgentSuperieurService()->getAgentsSuperieursByAgent($agent);

                usort($responsables, function (AgentSuperieur $a, AgentSuperieur $b) {

                    $aaa = $a->getSuperieur()->getNomUsuel() . " " . $a->getSuperieur()->getPrenom();

                    $bbb = $b->getSuperieur()->getNomUsuel() . " " . $b->getSuperieur()->getPrenom();

                    return $aaa > $bbb;

                });

                $responsables = array_map(function (Agent $a) { return $a->getDenomination();} , $responsables);

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

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ use Application\Form\SpecificitePoste\SpecificitePosteForm; 
use Application\Service\ActivitesDescriptionsRetirees\ActivitesDescriptionsRetireesService;

use Application\Service\Agent\AgentService;

use Application\Service\AgentPoste\AgentPosteService;

use Application\Service\AgentSuperieur\AgentSuperieurService;

use Application\Service\ApplicationsRetirees\ApplicationsRetireesService;

use Application\Service\CompetencesRetirees\CompetencesRetireesService;

use Application\Service\Expertise\ExpertiseService;
@@ -19,8 +20,8 @@ use Application\Service\ParcoursDeFormation\ParcoursDeFormationService; 
use Application\Service\SpecificitePoste\SpecificitePosteService;

use FicheMetier\Service\FicheMetier\FicheMetierService;

use FicheMetier\Service\MissionPrincipale\MissionPrincipaleService;

use Interop\Container\ContainerInterface;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use Structure\Service\Structure\StructureService;

use UnicaenEtat\Form\SelectionEtat\SelectionEtatForm;
@@ -40,6 +41,7 @@ class FichePosteControllerFactory { 
    {

        /**

         * @var AgentService $agentService

         * @var AgentSuperieurService $agentSuperieurService

         * @var AgentPosteService $agentPosteService

         * @var RenduService $renduService

         * @var FicheMetierService $ficheMetierService
@@ -55,6 +57,7 @@ class FichePosteControllerFactory { 
         * @var ValidationInstanceService $validationInstanceService

         */

        $agentService = $container->get(AgentService::class);

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

        $agentPosteService = $container->get(AgentPosteService::class);

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

        $ficheMetierService = $container->get(FicheMetierService::class);
@@ -93,6 +96,7 @@ class FichePosteControllerFactory { 


        $controller->setActivitesDescriptionsRetireesService($activitesDescriptionsRetireesService);

        $controller->setAgentService($agentService);

        $controller->setAgentSuperieurService($agentSuperieurService);

        $controller->setAgentPosteService($agentPosteService);

        $controller->setRenduService($renduService);

        $controller->setFicheMetierService($ficheMetierService);

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

+130 −326

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.