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

Gros oeuvre fait

parent 834741c8

module/Application/config/merged/formation.config.php

deleted100644 → 0
+0 −605

File deleted.

Preview size limit exceeded, changes collapsed.

module/Application/config/merged/parcours-de-formation.config.php

+8 −2
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ namespace Application; 


use Application\Controller\ParcoursDeFormationController;

use Application\Controller\ParcoursDeFormationControllerFactory;

use Application\Form\AjouterFormation\AjouterFormationForm;

use Application\Form\AjouterFormation\AjouterFormationFormFactory;

use Application\Form\AjouterFormation\AjouterFormationHydrator;

use Application\Form\AjouterFormation\AjouterFormationHydratorFactory;

use Application\Form\ModifierRattachement\ModifierRattachementForm;

use Application\Form\ModifierRattachement\ModifierRattachementFormFactory;

use Application\Form\ModifierRattachement\ModifierRattachementHydrator;
@@ -12,7 +16,7 @@ use Application\Form\ParcoursDeFormation\ParcoursDeFormationForm; 
use Application\Form\ParcoursDeFormation\ParcoursDeFormationFormFactory;

use Application\Form\ParcoursDeFormation\ParcoursDeFormationHydrator;

use Application\Form\ParcoursDeFormation\ParcoursDeFormationHydratorFactory;

use Application\Provider\Privilege\FormationPrivileges;

use Formation\Provider\Privilege\FormationPrivileges;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;

use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceFactory;

use Application\View\Helper\ParcoursDeFormationViewHelperFactory;
@@ -42,7 +46,7 @@ return [ 


                    ],

                    'privileges' => [

                        FormationPrivileges::FORMATION_INDEX,

                        FormationPrivileges::FORMATION_ACCES,

                    ],

                ],

            ],
@@ -215,12 +219,14 @@ return [ 
    ],

    'form_elements' => [

        'factories' => [

            AjouterFormationForm::class => AjouterFormationFormFactory::class,

            ModifierRattachementForm::class => ModifierRattachementFormFactory::class,

            ParcoursDeFormationForm::class => ParcoursDeFormationFormFactory::class,

        ],

    ],

    'hydrators' => [

        'factories' => [

            AjouterFormationHydrator::class => AjouterFormationHydratorFactory::class,

            ModifierRattachementHydrator::class => ModifierRattachementHydratorFactory::class,

            ParcoursDeFormationHydrator::class => ParcoursDeFormationHydratorFactory::class,

        ],

module/Application/config/module.config.php

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ use Application\Provider\Privilege\CorpsPrivileges; 
use Application\Provider\Privilege\EntretienproPrivileges;

use Application\Provider\Privilege\FicheMetierPrivileges;

use Application\Provider\Privilege\FichePostePrivileges;

use Application\Provider\Privilege\FormationPrivileges;

use Formation\Provider\Privilege\FormationPrivileges;

use Application\Provider\Privilege\MetierPrivileges;

use Application\Provider\Privilege\MissionspecifiquePrivileges;

use Application\Provider\Privilege\PostePrivileges;
@@ -72,7 +72,7 @@ return [ 
                        CompetencePrivileges::COMPETENCE_INDEX,

                        CorpsPrivileges::CORPS_INDEX,

                        MetierPrivileges::METIER_INDEX,

                        FormationPrivileges::FORMATION_INDEX,

                        FormationPrivileges::FORMATION_ACCES,

                        ActivitePrivileges::ACTIVITE_AFFICHER,

                        ActivitePrivileges::ACTIVITE_INDEX,

                        MissionspecifiquePrivileges::MISSIONSPECIFIQUE_GESTION_INDEX,

module/Application/src/Application/Controller/ConfigurationController.php

+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ use Application\Entity\Db\Application; 
use Application\Entity\Db\Competence;

use Application\Entity\Db\ConfigurationEntretienProfessionnel;

use Application\Entity\Db\ConfigurationFicheMetier;

use Application\Entity\Db\Formation;

use Formation\Entity\Db\Formation;

use Application\Form\ConfigurationEntretienProfessionnel\ConfigurationEntretienProfessionnelFormAwareTrait;

use Application\Form\ConfigurationFicheMetier\ConfigurationFicheMetierFormAwareTrait;

use Application\Service\Application\ApplicationServiceAwareTrait;

use Application\Service\Competence\CompetenceServiceAwareTrait;

use Application\Service\Configuration\ConfigurationServiceAwareTrait;

use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;

use Application\Service\Formation\FormationServiceAwareTrait;

use Formation\Service\Formation\FormationServiceAwareTrait;

use Autoform\Service\Formulaire\FormulaireServiceAwareTrait;

use Zend\Form\Element\Select;

use Zend\Http\Request;

module/Application/src/Application/Entity/Db/ActiviteFormation.php

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
namespace Application\Entity\Db;



use Application\Entity\Db\Activite;

use Application\Entity\Db\Formation;

use Formation\Entity\Db\Formation;

use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;



class ActiviteFormation {