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

Fixing oublie

parent 7e3f061f
Loading
Loading
Loading
Loading
+3 −2
Changes for composer.json: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
  ],
  "minimum-stability": "dev",
  "require": {
    "unicaen/app": "^5",
    "unicaen/app": "5.1.9",
    "unicaen/authentification": "^5.0",
    "unicaen/utilisateur": "^5.0.5",
    "unicaen/privilege": "^5.0",
@@ -23,7 +23,8 @@
    "unicaen/autoform": "^5.0",
    "unicaen/aide": "dev-master",
    "ext-json": "*",
    "unicaen/indicateur": "^0.0"
    "unicaen/indicateur": "^0.0",
    "unicaen/instadia": "^0.0"
  },
  "require-dev": {
    "laminas/laminas-developer-tools": ">=1.0"
+3 −2
Changes for module/Application/config/merged/fiche-poste.config.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ return [
                        'pages' => [
                            'fiches' => [
                                'label' => 'Gestion des fiches',
                                'route' => 'fiche-metier-type',
                                'route' => 'fiche-metier',
                                'resource' =>  FicheMetierPrivileges::getResourceId(FicheMetierPrivileges::FICHEMETIER_INDEX) ,
                                'order'    => 2000,
                                'dropdown-header' => true,
@@ -521,8 +521,9 @@ return [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/selectionner-descriptions-retirees/:fiche-poste/:fiche-metier/:activite',
                            'route'    => '/selectionner-descriptions-retirees/:fiche-poste/:fiche-metier/:mission-principale',
                            'defaults' => [
                                /** @see FichePosteController::selectionnerDescriptionsRetireesAction() */
                                'controller' => FichePosteController::class,
                                'action'     => 'selectionner-descriptions-retirees',
                            ],
+0 −1
Changes for module/Application/src/Application/Assertion/AgentAssertion.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ class AgentAssertion extends AbstractAssertion
        }

        /** @var Agent $entity */

        $user = $this->getUserService()->getConnectedUser();
        $agent = $this->getAgentService()->getAgentByUser($user);
        $role = $this->getUserService()->getConnectedRole();
+7 −0
Changes for module/Application/src/Application/Controller/FichePosteControllerFactory.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Form\AssocierTitre\AssocierTitreForm;
use Application\Form\Expertise\ExpertiseForm;
use Application\Form\Rifseep\RifseepForm;
use Application\Form\SpecificitePoste\SpecificitePosteForm;
use Application\Service\ActivitesDescriptionsRetirees\ActivitesDescriptionsRetireesService;
use Application\Service\Agent\AgentService;
use Application\Service\AgentPoste\AgentPosteService;
use Application\Service\ApplicationsRetirees\ApplicationsRetireesService;
@@ -17,6 +18,7 @@ use Application\Service\Notification\NotificationService;
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\NotFoundExceptionInterface;
@@ -46,6 +48,7 @@ class FichePosteControllerFactory {
         * @var CompetencesRetireesService $competencesRetireesService
         * @var EtatService $etatService
         * @var ExpertiseService $expertiseService
         * @var MissionPrincipaleService $missionPrincipaleService
         * @var NotificationService $notificationService
         * @var ParcoursDeFormationService $parcoursService
         * @var SpecificitePosteService $specificitePosteService
@@ -59,8 +62,10 @@ class FichePosteControllerFactory {
        $structureService = $container->get(StructureService::class);
        $applicationsConserveesService = $container->get(ApplicationsRetireesService::class);
        $competencesRetireesService = $container->get(CompetencesRetireesService::class);
        $activitesDescriptionsRetireesService = $container->get(ActivitesDescriptionsRetireesService::class);
        $etatService = $container->get(EtatService::class);
        $expertiseService = $container->get(ExpertiseService::class);
        $missionPrincipaleService = $container->get(MissionPrincipaleService::class);
        $notificationService = $container->get(NotificationService::class);
        $specificitePosteService = $container->get(SpecificitePosteService::class);
        $parcoursService = $container->get(ParcoursDeFormationService::class);
@@ -86,6 +91,7 @@ class FichePosteControllerFactory {
        /** @var FichePosteController $controller */
        $controller = new FichePosteController();

        $controller->setActivitesDescriptionsRetireesService($activitesDescriptionsRetireesService);
        $controller->setAgentService($agentService);
        $controller->setAgentPosteService($agentPosteService);
        $controller->setRenduService($renduService);
@@ -96,6 +102,7 @@ class FichePosteControllerFactory {
        $controller->setCompetencesRetireesService($competencesRetireesService);
        $controller->setEtatService($etatService);
        $controller->setExpertiseService($expertiseService);
        $controller->setMissionPrincipaleService($missionPrincipaleService);
        $controller->setNotificationService($notificationService);
        $controller->setSpecificitePosteService($specificitePosteService);
        $controller->setParcoursDeFormationService($parcoursService);
+0 −5
Changes for module/Application/src/Application/Service/FichePoste/FichePosteService.php: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -666,11 +666,6 @@ EOS;
    {
        $agent = $this->getAgentService()->getAgentByUser($user);

        if ($fiche->getPoste()) {
            $structure = $fiche->getPoste()->getStructure();
            if ($this->getStructureService()->isGestionnaire($structure, $agent)) return true;
            if ($this->getStructureService()->isResponsable($structure, $agent)) return true;
        }
        if ($fiche->getAgent()) {
            foreach ($fiche->getAgent()->getAffectationsActifs() as $grade) {
                $structure = $grade->getStructure();
Loading