Merge branch 'development' (075ec3f5) · Commits · open-source / emc2

config/application.config.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ $modules = [
		'Utilisateur',
		'Indicateur',
		'Application',
		//'ZendDeveloperTools',
		'ZendDeveloperTools',

		];

config/autoload/unicaen-app.global.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ return [
		'app_infos' => [
		'nom' => "PrEECoG",
		'desc' => "Gestion Prévisionnelle des effectifs, des emplois et des compétences",
		'version' => "0.2.2",
		'date' => "10/09/2019",
		'version' => "0.2.6",
		'date' => "18/09/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/fiche-metier.config.php

+18 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ use Application\Form\FicheMetier\FormationComportementaleHydrator;
		use Application\Form\FicheMetier\FormationOperationnelleForm;
		use Application\Form\FicheMetier\FormationOperationnelleFormFactory;
		use Application\Form\FicheMetier\FormationOperationnelleHydrator;
		use Application\Form\FicheMetier\FormationsForm;
		use Application\Form\FicheMetier\FormationsFormFactory;
		use Application\Form\FicheMetier\FormationsHydrator;
		use Application\Form\FicheMetier\FormationsHydratorFactory;
		use Application\Form\FicheMetier\LibelleForm;
		use Application\Form\FicheMetier\LibelleFormFactory;
		use Application\Form\FicheMetier\LibelleHydrator;
		@@ -65,6 +69,7 @@ return [
		'modifier-operationnelle',
		'modifier-comportementale',
		'modifier-application',
		'modifier-formation',
		'ajouter',
		],
		'privileges' => [
		@@ -264,6 +269,17 @@ return [
		],
		'may_terminate' => true,
		],
		'modifier-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-formation/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'modifier-formation',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		@@ -287,11 +303,11 @@ return [
		'factories' => [
		ActiviteExistanteForm::class => ActiviteExistanteFormFactory::class,
		LibelleForm::class => LibelleFormFactory::class,

		FormationBaseForm::class => FormationBaseFormFactory::class,
		FormationOperationnelleForm::class => FormationOperationnelleFormFactory::class,
		FormationComportementaleForm::class => FormationComportementaleFormFactory::class,
		ApplicationsForm::class => ApplicationsFormFactory::class,
		FormationsForm::class => FormationsFormFactory::class,


		],
		@@ -301,11 +317,11 @@ return [
		FormationBaseHydrator::class => FormationBaseHydrator::class,
		FormationOperationnelleHydrator::class => FormationOperationnelleHydrator::class,
		FormationComportementaleHydrator::class => FormationComportementaleHydrator::class,

		],
		'factories' => [
		LibelleHydrator::class => LibelleHydratorFactory::class,
		ApplicationsHydrator::class => ApplicationsHydratorFactory::class,
		FormationsHydrator::class => FormationsHydratorFactory::class,
		],
		],
		'view_helpers' => [

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

+18 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@ use Application\Form\AssocierPoste\AssocierPosteForm;
		use Application\Form\AssocierPoste\AssocierPosteFormFactory;
		use Application\Form\AssocierPoste\AssocierPosteHydrator;
		use Application\Form\AssocierPoste\AssocierPosteHydratorFactory;
		use Application\Form\AssocierTitre\AssocierTitreForm;
		use Application\Form\AssocierTitre\AssocierTitreFormFactory;
		use Application\Form\AssocierTitre\AssocierTitreHydrator;
		use Application\Form\AssocierTitre\AssocierTitreHydratorFactory;
		use Application\Form\FichePosteCreation\FichePosteCreationForm;
		use Application\Form\FichePosteCreation\FichePosteCreationFormFactory;
		use Application\Form\FichePosteCreation\FichePosteCreationHydrator;
		@@ -45,6 +49,7 @@ return [
		'detruire',
		'associer-agent',
		'associer-poste',
		'associer-titre',
		'editer-specificite',
		'ajouter-fiche-metier',
		'retirer-fiche-metier',
		@@ -159,7 +164,6 @@ return [
		'action' => 'associer-agent',
		],
		],

		],
		'associer-poste' => [
		'type' => Segment::class,
		@@ -171,7 +175,17 @@ return [
		'action' => 'associer-poste',
		],
		],

		],
		'associer-titre' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/associer-titre/:fiche-poste',
		'defaults' => [
		'controller' => FichePosteController::class,
		'action' => 'associer-titre',
		],
		],
		],
		'ajouter-fiche-metier' => [
		'type' => Segment::class,
		@@ -248,6 +262,7 @@ return [
		AjouterFicheMetierForm::class => AjouterFicheMetierFormFactory::class,
		AssocierAgentForm::class => AssocierAgentFormFactory::class,
		AssocierPosteForm::class => AssocierPosteFormFactory::class,
		AssocierTitreForm::class => AssocierTitreFormFactory::class,
		FichePosteCreationForm::class => FichePosteCreationFormFactory::class,
		SpecificitePosteForm::class => SpecificitePosteFormFactory::class,
		],
		@@ -260,6 +275,7 @@ return [
		AjouterFicheMetierHydrator::class => AjouterFicheMetierHydratorFactory::class,
		AssocierAgentHydrator::class => AssocierAgentHydratorFactory::class,
		AssocierPosteHydrator::class => AssocierPosteHydratorFactory::class,
		AssocierTitreHydrator::class => AssocierTitreHydratorFactory::class,
		FichePosteCreationHydrator::class => FichePosteCreationHydratorFactory::class,
		],
		]

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

+86 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,10 @@ use Application\Form\Formation\FormationForm;
		use Application\Form\Formation\FormationFormFactory;
		use Application\Form\Formation\FormationHydrator;
		use Application\Form\Formation\FormationHydratorFactory;
		use Application\Form\FormationTheme\FormationThemeForm;
		use Application\Form\FormationTheme\FormationThemeFormFactory;
		use Application\Form\FormationTheme\FormationThemeHydrator;
		use Application\Form\FormationTheme\FormationThemeHydratorFactory;
		use Application\Provider\Privilege\FormationPrivileges;
		use Application\Service\Formation\FormationService;
		use Application\Service\Formation\FormationServiceFactory;
		@@ -24,6 +28,8 @@ return [
		'action' => [
		'index',
		'afficher',

		'afficher-theme',
		],
		'privileges' => [
		FormationPrivileges::AFFICHER,
		@@ -36,6 +42,11 @@ return [
		'editer',
		'historiser',
		'restaurer',

		'ajouter-theme',
		'editer-theme',
		'historiser-theme',
		'restaurer-theme',
		],
		'privileges' => [
		FormationPrivileges::EDITER,
		@@ -45,6 +56,7 @@ return [
		'controller' => FormationController::class,
		'action' => [
		'detruire',
		'detruire-theme',
		],
		'privileges' => [
		FormationPrivileges::DETRUIRE,
		@@ -56,6 +68,78 @@ return [

		'router' => [
		'routes' => [
		'formation-theme' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		],
		],
		'may_terminate' => false,
		'child_routes' => [
		'afficher' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher/:formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'afficher-theme',
		],
		],
		],
		'ajouter' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'ajouter-theme',
		],
		],
		],
		'editer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/editer/:formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'editer-theme',
		],
		],
		],
		'historiser' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser/:formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'historiser-theme',
		],
		],
		],
		'restaurer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer/:formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'restaurer-theme',
		],
		],
		],
		'detruire' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/detruire/:formation-theme',
		'defaults' => [
		'controller' => FormationController::class,
		'action' => 'detruire-theme',
		],
		],
		],
		],
		],
		'formation' => [
		'type' => Literal::class,
		'options' => [
		@@ -145,11 +229,13 @@ return [
		'form_elements' => [
		'factories' => [
		FormationForm::class => FormationFormFactory::class,
		FormationThemeForm::class => FormationThemeFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		FormationHydrator::class => FormationHydratorFactory::class,
		FormationThemeHydrator::class => FormationThemeHydratorFactory::class,
		],
		]