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

Merge branch 'development'

parents cb2184fc 1949f24e

config/application.config.php

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ $modules = [ 
    'Mailing',

    'Octopus',

    'Utilisateur',

    'Indicateur',

    'Application',

    //'ZendDeveloperTools',

];

config/autoload/unicaen-app.global.php

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ return [ 
        'app_infos' => [

            'nom'     => "PrEECoG",

            'desc'    => "Gestion Prévisionnelle des effectifs, des emplois et des compétences",

            'version' => "0.2.0",

            'date'    => "03/07/2019",

            'version' => "0.2.1",

            'date'    => "28/08/2019",

            'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/],

            'mentionsLegales'        => "http://www.unicaen.fr/acces-direct/mentions-legales/",

            'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",

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

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ use Application\Form\Agent\AgentHydratorFactory; 
use Application\Provider\Privilege\AgentPrivileges;

use Application\Service\Agent\AgentService;

use Application\Service\Agent\AgentServiceFactory;

use Application\View\Helper\AgentViewHelper;

use Application\View\Helper\AgentStatutViewHelper;

use Application\View\Helper\AgentViewHelper;

use UnicaenAuth\Guard\PrivilegeController;

use Zend\Mvc\Router\Http\Literal;

use Zend\Mvc\Router\Http\Segment;

module/Application/config/merged/application.config.php

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Controller\Application\ApplicationControllerFactory; 
use Application\Form\Application\ApplicationForm;

use Application\Form\Application\ApplicationFormFactory;

use Application\Form\Application\ApplicationHydrator;

use Application\Form\Application\ApplicationHydratorFactory;

use Application\Provider\Privilege\ApplicationPrivileges;

use Application\Service\Application\ApplicationService;

use Application\Service\Application\ApplicationServiceFactory;
@@ -146,8 +147,8 @@ return [ 
        ],

    ],

    'hydrators' => [

        'invokable' => [

            ApplicationHydrator::class => ApplicationHydrator::class,

        'factories' => [

            ApplicationHydrator::class => ApplicationHydratorFactory::class,

        ]

    ]

module/Application/config/merged/fiche-metier.config.php

+0 −16
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ use Application\Form\FicheMetier\LibelleForm; 
use Application\Form\FicheMetier\LibelleFormFactory;

use Application\Form\FicheMetier\LibelleHydrator;

use Application\Form\FicheMetier\LibelleHydratorFactory;

use Application\Form\FicheMetier\MissionsPrincipalesForm;

use Application\Form\FicheMetier\MissionsPrincipalesFormFactory;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\Service\FicheMetier\FicheMetierService;

use Application\Service\FicheMetier\FicheMetierServiceFactory;
@@ -58,7 +56,6 @@ return [ 
                        'export',



                        'editer-libelle',

                        'editer-missions-principales',

                        'retirer-activite',

                        'deplacer-activite',

                        'ajouter-nouvelle-activite',
@@ -179,17 +176,6 @@ return [ 
                        ],

                        'may_terminate' => true,

                    ],

                    'editer-missions-principales' => [

                        'type'  => Segment::class,

                        'options' => [

                            'route'    => '/editer-missions-principales/:id',

                            'defaults' => [

                                'controller' => FicheMetierController::class,

                                'action'     => 'editer-missions-principales',

                            ],

                        ],

                        'may_terminate' => true,

                    ],

                    'retirer-activite' => [

                        'type'  => Segment::class,

                        'options' => [
@@ -301,8 +287,6 @@ return [ 
        'factories' => [

            ActiviteExistanteForm::class => ActiviteExistanteFormFactory::class,

            LibelleForm::class => LibelleFormFactory::class,

            MissionsPrincipalesForm::class => MissionsPrincipalesFormFactory::class,





            FormationBaseForm::class => FormationBaseFormFactory::class,

            FormationOperationnelleForm::class => FormationOperationnelleFormFactory::class,