merging (cb6d5677) · Commits · open-source / emc2

config/autoload/unicaen-db-import.global.php

+18 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,24 @@ return [
		'columns' => ['id_orig', 'agent_id', 'structure_id', 'corps_id', 'grade_id', 'bap_id', 'd_debut', 'd_fin'],
		],
		],
		[
		'name' => 'Import_AGENT_QUOTITE',
		'source' => [
		'name' => 'Quotité travaillé par les agents',
		'select' => 'SELECT ID, INDIVIDU_ID AS AGENT_ID, D_DEBUT AS DEBUT, D_FIN AS FIN, QUOTITE FROM INDIVIDU_QUOTITE JOIN V_PREECOG_AGENT on V_PREECOG_AGENT.C_INDIVIDU = INDIVIDU_QUOTITE.INDIVIDU_ID',
		'connection' => 'octopus',
		'source_code_column' => 'ID',
		//'columns' => ['AGENT_ID', 'STRUCTURE_ID', 'CORPS_ID', 'GRADE_ID', 'BAP_ID', 'DATE_DEBUT', 'DATE_FIN'],
		],
		'intermediate_table' => 'src_agent_quotite',
		'destination' => [
		'name' => 'Grade des agents gérés par la DRH',
		'table' => 'agent_quotite',
		'connection' => 'default',
		'source_code_column' => 'id',
		'columns' => ['agent_id', 'debut', 'fin', 'quotite'],
		],
		],
		[
		'name' => 'Import_STATUT',
		'source' => [

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

+0 −83

Original line number	Diff line number	Diff line
		@@ -6,10 +6,6 @@ use Application\Assertion\AgentAssertion;
		use Application\Assertion\AgentAssertionFactory;
		use Application\Controller\AgentController;
		use Application\Controller\AgentControllerFactory;
		use Application\Form\Agent\AgentForm;
		use Application\Form\Agent\AgentFormFactory;
		use Application\Form\Agent\AgentHydrator;
		use Application\Form\Agent\AgentHydratorFactory;
		use Application\Form\AgentApplication\AgentApplicationForm;
		use Application\Form\AgentApplication\AgentApplicationFormFactory;
		use Application\Form\AgentApplication\AgentApplicationHydrator;
		@@ -107,9 +103,6 @@ return [
		[
		'controller' => AgentController::class,
		'action' => [
		'modifier',
		'ajouter-agent-mission-specifique',
		'modifier-agent-mission-specifique',
		'upload-fichier',
		],
		'privileges' => [
		@@ -140,17 +133,6 @@ return [
		],
		'assertion' => AgentAssertion::class,
		],
		[
		'controller' => AgentController::class,
		'action' => [
		'historiser-agent-mission-specifique',
		'restaurer-agent-mission-specifique',
		'detruire-agent-mission-specifique',
		],
		'privileges' => [
		AgentPrivileges::AGENT_EFFACER,
		],
		],
		[
		'controller' => AgentController::class,
		'action' => [
		@@ -248,59 +230,6 @@ return [
		],
		],

		/ Route des AgentMissionSpecifique ******************************************************************/

		'ajouter-agent-mission-specifique' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-agent-mission-specifique/:agent',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'ajouter-agent-mission-specifique',
		],
		],
		],
		'modifier-agent-mission-specifique' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-agent-mission-specifique/:agent-mission-specifique',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'modifier-agent-mission-specifique',
		],
		],
		],
		'historiser-agent-mission-specifique' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-agent-mission-specifique/:agent-mission-specifique',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'historiser-agent-mission-specifique',
		],
		],
		],
		'restaurer-agent-mission-specifique' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-agent-mission-specifique/:agent-mission-specifique',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'restaurer-agent-mission-specifique',
		],
		],
		],
		'detruire-agent-mission-specifique' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/detruire-agent-mission-specifique/:agent-mission-specifique',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'detruire-agent-mission-specifique',
		],
		],
		],

		/ Route des AgentApplication ******************************************************************/

		'ajouter-agent-application' => [
		@@ -516,16 +445,6 @@ return [

		/ AUTRE **************************************************************************************/

		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:agent',
		'defaults' => [
		'controller' => AgentController::class,
		'action' => 'modifier',
		],
		],
		],
		'upload-fichier' => [
		'type' => Segment::class,
		'options' => [
		@@ -593,7 +512,6 @@ return [
		],
		'form_elements' => [
		'factories' => [
		AgentForm::class => AgentFormFactory::class,
		AgentApplicationForm::class => AgentApplicationFormFactory::class,
		AgentCompetenceForm::class => AgentCompetenceFormFactory::class,
		AgentFormationForm::class => AgentFormationFormFactory::class,
		@@ -602,7 +520,6 @@ return [
		],
		'hydrators' => [
		'factories' => [
		AgentHydrator::class => AgentHydratorFactory::class,
		AgentApplicationHydrator::class => AgentApplicationHydratorFactory::class,
		AgentCompetenceHydrator::class => AgentCompetenceHydratorFactory::class,
		AgentFormationHydrator::class => AgentFormationHydratorFactory::class,

module/Application/config/merged/competence.config.php

+2 −4

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@ use Application\Service\CompetenceTheme\CompetenceThemeService;
		use Application\Service\CompetenceTheme\CompetenceThemeServiceFactory;
		use Application\Service\CompetenceType\CompetenceTypeService;
		use Application\Service\CompetenceType\CompetenceTypeServiceFactory;
		use Application\View\Helper\CompetencesViewHelper;
		use Application\View\Helper\CompetenceViewHelper;
		use Application\View\Helper\CompetenceBlocViewHelper;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;
		@@ -384,8 +383,7 @@ return [
		],
		'view_helpers' => [
		'invokables' => [
		'competence' => CompetenceViewHelper::class,
		'competences' => CompetencesViewHelper::class,
		'competenceBloc' => CompetenceBlocViewHelper::class,
		],
		],

module/Application/config/merged/corps.config.php

+12 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ return [
		'controller' => CorpsController::class,
		'action' => [
		'afficher-agents-avec-corps',
		'afficher-agents-avec-correspondance',
		'afficher-agents-avec-grade',
		],
		'privileges' => [
		@@ -120,6 +121,17 @@ return [
		],
		'may_terminate' => true,
		],
		'afficher-agents-avec-correspondance' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher-agents-avec-correspondance/:correspondance',
		'defaults' => [
		'controller' => CorpsController::class,
		'action' => 'afficher-agents-avec-correspondance',
		],
		],
		'may_terminate' => true,
		],
		'afficher-agents-avec-grade' => [
		'type' => Segment::class,
		'options' => [

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ return [
		'controller' => FicheMetierController::class,
		'action' => [
		'ajouter',
		// 'ajouter-terminer',
		'ajouter-avec-metier',
		],
		'privileges' => [
		@@ -209,6 +210,17 @@ return [
		],
		'may_terminate' => true,
		],
		// 'ajouter-terminer' => [
		// 'type' => Segment::class,
		// 'options' => [
		// 'route' => '/ajouter-terminer/:fiche',
		// 'defaults' => [
		// 'controller' => FicheMetierController::class,
		// 'action' => 'ajouter-terminer',
		// ],
		// ],
		// 'may_terminate' => true,
		// ],
		'ajouter-avec-metier' => [
		'type' => Segment::class,
		'options' => [