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

Ajustement des menus

parent 3e0f49fd

config/autoload/unicaen-utilisateur.global.php

+0 −2
Changes for config/autoload/unicaen-utilisateur.global.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,13 +4,11 @@ use Application\Provider\IdentityProvider; 
use Application\Provider\IdentityProviderFactory;

use UnicaenUtilisateur\Entity\Db\Role;

use UnicaenUtilisateur\Entity\Db\User;

use UnicaenUtilisateur\ORM\Event\Listeners\HistoriqueListener;

use UnicaenUtilisateur\ORM\Event\Listeners\HistoriqueListenerFactory;

use UnicaenUtilisateur\Provider\Privilege\RolePrivileges;

use UnicaenUtilisateur\Provider\Privilege\UtilisateurPrivileges;

use UnicaenUtilisateur\Service\User\UserService;

use UnicaenUtilisateurLdapAdapter\Service\LdapService;

use UnicaenUtilisateurOctopusAdapter\Service\OctopusService;



return [

    /**

documentation/release/3.1.6.md

+2 −2
Changes for documentation/release/3.1.6.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ alter table formation drop constraint formation_source_id_fk; 
alter table formation alter column source_id type varchar(128);

alter table formation_groupe drop constraint formation_groupe_source_id_fk;

alter table formation_groupe alter column source_id type varchar(128);

alter table formation_seance drop constraint fformation_seance_source_id_fk;

alter table formation_seance drop constraint formation_seance_source_id_fk;

alter table formation_seance alter column source_id type varchar(128);

alter table formation_presence drop constraint formation_presence_source_id_fk;

alter table formation_presence alter column source_id type varchar(128);
@@ -123,7 +123,7 @@ alter table structure_responsable drop constraint structure_responsable_source_i 
alter table structure_responsable alter column source_id type varchar(128);

alter table structure_gestionnaire drop constraint structure_gestionnaire_source_id_fk;

alter table structure_gestionnaire alter column source_id type varchar(128);

alter table carriere_correspondance_type  alter column source_id type varchar(128)

alter table carriere_correspondance_type  alter column source_id type varchar(128);

alter table carriere_correspondance  alter column source_id type varchar(128);

alter table carriere_corps  alter column source_id type varchar(128);

alter table carriere_grade  alter column source_id type varchar(128);

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

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

            'home' => [

                'pages' => [

                    'ressource' => [

                    'suivis' => [

                        'order' => 1,

                        'label' => 'Suivis',

                        'title' => "suivis",

                        'route' => 'agent',

                        'resource' => PrivilegeController::getResourceId(AgentController::class, 'index') ,



                        'pages' => [

                            'agent' => [

                                'label'    => 'Agents',

module/Application/config/module.config.php

+1 −3
Changes for module/Application/config/module.config.php: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -9,14 +9,12 @@ use Application\Form\ModifierLibelle\ModifierLibelleForm; 
use Application\Form\ModifierLibelle\ModifierLibelleFormFactory;

use Application\Form\ModifierLibelle\ModifierLibelleHydrator;

use Application\Provider\Privilege\ActivitePrivileges;

use Application\Provider\Privilege\AdministrationPrivileges;

use Application\Provider\Privilege\AgentPrivileges;

use Application\Provider\Privilege\ConfigurationPrivileges;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\Provider\Privilege\FichePostePrivileges;

use Application\Provider\Privilege\MissionspecifiqueaffectationPrivileges;

use Application\Provider\Privilege\MissionspecifiquePrivileges;

use Application\Provider\Privilege\PostePrivileges;

use Application\Provider\Privilege\SynchroPrivileges;

use Application\Provider\Privilege\ValidationPrivileges;

use Application\Provider\Role\RoleProvider;
@@ -31,7 +29,7 @@ use Application\Service\Url\UrlServiceFactory; 
use Application\View\Helper\ActionIconViewHelper;

use Application\View\Helper\SynchorniserIconViewHelper;

use Carriere\Provider\Privilege\CorpsPrivileges;

use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;

Use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;

use Doctrine\ORM\Mapping\Driver\XmlDriver;

use EntretienProfessionnel\Provider\Privilege\EntretienproPrivileges;

use Formation\Provider\Privilege\FormationPrivileges;

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

+1 −1
Changes for module/Application/src/Application/Controller/AgentController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class AgentController extends AbstractActionController 


        //Récupération des status

        $agentStatuts = $this->getAgentStatutService()->getAgentStatutsByAgent($agent);

        $agentAffectations = $this->getAgentAffectationService()->getAgentAffectationsByAgent($agent);

        $agentAffectations = $this->getAgentAffectationService()->getAgentAffectationsByAgent($agent, true, false, false, false);

        $agentGrades = $this->getAgentGradeService()->getAgentGradesByAgent($agent);



        //Récupération des supérieures et autorités