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

Refactoring

parent 1ca5bd9f

database/migration-script/5.0.0.sql

0 → 100644
+1 −0
Changes for database/migration-script/5.0.0.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
update unicaen_privilege_categorie set namespace='Agent\Provider\Privilege' where code='agentmobilite';
 
 No newline at end of file

module/Application/config/merged/agent-mobilite.config.php→module/Agent/config/merged/agent-mobilite.config.php

+12 −12
Changes for module/Agent/config/merged/agent-mobilite.config.php: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Application;

namespace Agent;



use Application\Controller\AgentMobiliteController;

use Application\Controller\AgentMobiliteControllerFactory;

use Application\Form\AgentMobilite\AgentMobiliteForm;

use Application\Form\AgentMobilite\AgentMobiliteFormFactory;

use Application\Form\AgentMobilite\AgentMobiliteHydrator;

use Application\Form\AgentMobilite\AgentMobiliteHydratorFactory;

use Application\Provider\Privilege\AgentmobilitePrivileges;

use Application\Service\AgentMobilite\AgentMobiliteService;

use Application\Service\AgentMobilite\AgentMobiliteServiceFactory;

use Agent\Controller\AgentMobiliteController;

use Agent\Controller\AgentMobiliteControllerFactory;

use Agent\Form\AgentMobilite\AgentMobiliteForm;

use Agent\Form\AgentMobilite\AgentMobiliteFormFactory;

use Agent\Form\AgentMobilite\AgentMobiliteHydrator;

use Agent\Form\AgentMobilite\AgentMobiliteHydratorFactory;

use Agent\Provider\Privilege\AgentmobilitePrivileges;

use Agent\Service\AgentMobilite\AgentMobiliteService;

use Agent\Service\AgentMobilite\AgentMobiliteServiceFactory;

use Laminas\Router\Http\Literal;

use Laminas\Router\Http\Segment;

use UnicaenPrivilege\Guard\PrivilegeController;
@@ -167,12 +167,12 @@ return [ 


    'service_manager' => [

        'factories' => [

            AgentMobiliteService::class => AgentMobiliteServiceFactory::class

            AgentMobiliteService::class => AgentMobiliteServiceFactory::class,

        ],

    ],

    'controllers' => [

        'factories' => [

            AgentMobiliteController::class => AgentMobiliteControllerFactory::class

            AgentMobiliteController::class => AgentMobiliteControllerFactory::class,

        ],

    ],

    'form_elements' => [

module/Application/src/Application/Controller/AgentMobiliteController.php→module/Agent/src/Agent/Controller/AgentMobiliteController.php

+16 −8
Changes for module/Agent/src/Agent/Controller/AgentMobiliteController.php: 16 added lines, 8 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Application\Controller;

namespace Agent\Controller;



use Application\Entity\Db\AgentMobilite;

use Application\Form\AgentMobilite\AgentMobiliteFormAwareTrait;

use Agent\Entity\Db\AgentMobilite;

use Agent\Form\AgentMobilite\AgentMobiliteFormAwareTrait;

use Agent\Service\AgentMobilite\AgentMobiliteServiceAwareTrait;

use Application\Service\Agent\AgentServiceAwareTrait;

use Application\Service\AgentMobilite\AgentMobiliteServiceAwareTrait;

use Carriere\Service\Mobilite\MobiliteServiceAwareTrait;

use Laminas\Http\Response;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\ViewModel;

use Structure\Service\Structure\StructureServiceAwareTrait;



class AgentMobiliteController extends AgentController {

class AgentMobiliteController extends AbstractActionController

{

    use AgentServiceAwareTrait;

    use AgentMobiliteServiceAwareTrait;

    use MobiliteServiceAwareTrait;
@@ -36,9 +38,15 @@ class AgentMobiliteController extends AgentController { 
            $mobilite = $this->getMobiliteService()->getMobilite((int)$mobiliteId);

        }



        if ($agent) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($agent) { return $a->getAgent() === $agent;});

        if ($structure) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($structure) { return !empty($a->getAgent()->getAffectationsActifs(null, [$structure])); });

        if ($mobilite) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($mobilite) { return $a->getMobilite() === $mobilite;});

        if ($agent) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($agent) {

            return $a->getAgent() === $agent;

        });

        if ($structure) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($structure) {

            return !empty($a->getAgent()->getAffectationsActifs(null, [$structure]));

        });

        if ($mobilite) $mobilites = array_filter($mobilites, function (AgentMobilite $a) use ($mobilite) {

            return $a->getMobilite() === $mobilite;

        });



        return new ViewModel([

            'mobilites' => $mobilites,

module/Application/src/Application/Controller/AgentMobiliteControllerFactory.php→module/Agent/src/Agent/Controller/AgentMobiliteControllerFactory.php

+5 −4
Changes for module/Agent/src/Agent/Controller/AgentMobiliteControllerFactory.php: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Application\Controller;

namespace Agent\Controller;



use Application\Form\AgentMobilite\AgentMobiliteForm;

use Agent\Form\AgentMobilite\AgentMobiliteForm;

use Agent\Service\AgentMobilite\AgentMobiliteService;

use Application\Service\Agent\AgentService;

use Application\Service\AgentMobilite\AgentMobiliteService;

use Carriere\Service\Mobilite\MobiliteService;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use Structure\Service\Structure\StructureService;



class AgentMobiliteControllerFactory {

class AgentMobiliteControllerFactory

{



    /**

     * @throws ContainerExceptionInterface

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

+2 −1
Changes for module/Agent/src/Agent/Entity/Db/AgentMobilite.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?php



namespace Application\Entity\Db;

namespace Agent\Entity\Db;



use Application\Entity\Db\Agent;

use Carriere\Entity\Db\Mobilite;

use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;

use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;