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

Fix AMU

parent ca9a4ca7

module/Application/src/Application/Assertion/AgentAffichageAssertion.php

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class AgentAffichageAssertion extends AbstractAssertion 
        [$catCode, $priCode] = explode('-', $privilege);

        $categorie = $this->getPrivilegeCategorieService()->findByCode($catCode);

        $pprivilege = $this->getPrivilegeService()->findByCode($priCode, $categorie->getId());

        if ($pprivilege === null) return false;

        $listings = $pprivilege->getRoles()->toArray();

        if (!in_array($role, $listings)) return false;

        //todo FIN BIZARERIE ...

module/Formation/src/Formation/Controller/StructureController.php

+1 −6
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ use Laminas\View\Model\ViewModel; 
use Structure\Entity\Db\StructureAgentForce;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenApp\View\Model\CsvModel;

use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;



class StructureController extends AbstractActionController

{
@@ -22,7 +21,6 @@ class StructureController extends AbstractActionController 
    use DemandeExterneServiceAwareTrait;

    use FormationInstanceInscritServiceAwareTrait;

    use StructureServiceAwareTrait;

    use UserServiceAwareTrait;



    public function indexAction() : ViewModel

    {
@@ -45,10 +43,7 @@ class StructureController extends AbstractActionController 
    {

        /**  Récupération du sous-arbre des structures */

        $structure = $this->getStructureService()->getRequestedStructure($this);



        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();

        if (!empty($selecteur) AND $structure===null) $structure = $selecteur[0];



        $structures = $this->getStructureService()->getStructuresFilles($structure);

module/Formation/src/Formation/Controller/StructureControllerFactory.php

+0 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ use Psr\Container\ContainerExceptionInterface; 
use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use Structure\Service\Structure\StructureService;

use UnicaenUtilisateur\Service\User\UserService;



class StructureControllerFactory {
@@ -26,20 +25,17 @@ class StructureControllerFactory { 
         * @var DemandeExterneService $demandeExterneService

         * @var FormationInstanceInscritService $instanceService

         * @var StructureService $structureService

         * @var UserService $userService

         */

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

        $demandeExterneService = $container->get(DemandeExterneService::class);

        $instanceService = $container->get(FormationInstanceInscritService::class);

        $structureService = $container->get(StructureService::class);

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



        $controller = new StructureController();

        $controller->setAgentService($agentService);

        $controller->setFormationInstanceInscritService($instanceService);

        $controller->setDemandeExterneService($demandeExterneService);

        $controller->setStructureService($structureService);

        $controller->setUserService($userService);

        return $controller;

    }

}
 
 No newline at end of file

module/Structure/src/Structure/Controller/StructureController.php

+5 −16
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ class StructureController extends AbstractActionController { 
    use StructureServiceAwareTrait;

    use StructureAgentForceServiceAwareTrait;

    use SpecificitePosteServiceAwareTrait;

    use UserServiceAwareTrait;

    use SynchronisationServiceAwareTrait;



    use CampagneServiceAwareTrait;
@@ -76,9 +75,7 @@ class StructureController extends AbstractActionController { 


    public function descriptionAction() : ViewModel

    {

        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();



        $structure = $this->getStructureService()->getRequestedStructure($this);

        $responsables = $this->getStructureService()->getResponsables($structure, new DateTime());
@@ -107,9 +104,7 @@ class StructureController extends AbstractActionController { 


    public function agentsAction() : ViewModel

    {

        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();



        $structure = $this->getStructureService()->getRequestedStructure($this);

        $structures = $this->getStructureService()->getStructuresFilles($structure, true);
@@ -153,9 +148,7 @@ class StructureController extends AbstractActionController { 


    public function missionsSpecifiquesAction() : ViewModel

    {

        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();



        $structure = $this->getStructureService()->getRequestedStructure($this);

        $structures = $this->getStructureService()->getStructuresFilles($structure, true);
@@ -177,9 +170,7 @@ class StructureController extends AbstractActionController { 


    public function fichesDePosteAction() : ViewModel

    {

        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();



        $structure = $this->getStructureService()->getRequestedStructure($this);

        $structures = $this->getStructureService()->getStructuresFilles($structure, true);
@@ -216,9 +207,7 @@ class StructureController extends AbstractActionController { 
    public function extractionsAction() : ViewModel

    {

        $structure = $this->getStructureService()->getRequestedStructure($this);

        $role = $this->getUserService()->getConnectedRole();

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

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole($utilisateur, $role);

        $selecteur = $this->getStructureService()->getStructuresByCurrentRole();



        $last =  $this->getCampagneService()->getLastCampagne();

        $campagnes =  $this->getCampagneService()->getCampagnesActives();

module/Structure/src/Structure/Controller/StructureControllerFactory.php

+0 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ class StructureControllerFactory { 
         * @var SpecificitePosteService $specificiteService

         * @var StructureService $structureService

         * @var StructureAgentForceService $structureAgentForceService

         * @var UserService $userService

         * @var SynchronisationService $synchronisationService

         */

        $agentService = $container->get(AgentService::class);
@@ -62,7 +61,6 @@ class StructureControllerFactory { 
        $specificiteService = $container->get(SpecificitePosteService::class);

        $structureService = $container->get(StructureService::class);

        $structureAgentForceService = $container->get(StructureAgentForceService::class);

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

        $synchronisationService = $container->get(SynchronisationService::class);



        /**
@@ -89,7 +87,6 @@ class StructureControllerFactory { 
        $controller->setSpecificitePosteService($specificiteService);

        $controller->setStructureService($structureService);

        $controller->setStructureAgentForceService($structureAgentForceService);

        $controller->setUserService($userService);

        $controller->setSynchronisationService($synchronisationService);



        $controller->setAgentMissionSpecifiqueForm($affectationForm);