Commit cb6d5677 authored 4 years ago by Jean-Philippe Metivier

merging

parents 791d29f5 de6cac7d

No related merge requests found

Show whitespace changes

Inline Side-by-side

Showing

config/autoload/unicaen-db-import.global.php 18 additions, 0 deletions

config/autoload/unicaen-db-import.global.php
module/Application/config/merged/agent.config.php 0 additions, 83 deletions

module/Application/config/merged/agent.config.php
module/Application/config/merged/competence.config.php 2 additions, 4 deletions

module/Application/config/merged/competence.config.php
module/Application/config/merged/corps.config.php 12 additions, 0 deletions

module/Application/config/merged/corps.config.php
module/Application/config/merged/fiche-metier.config.php 12 additions, 0 deletions

module/Application/config/merged/fiche-metier.config.php
module/Application/src/Application/Controller/AgentController.php 44 additions, 173 deletions

...pplication/src/Application/Controller/AgentController.php
module/Application/src/Application/Controller/AgentControllerFactory.php 0 additions, 7 deletions

...ion/src/Application/Controller/AgentControllerFactory.php
module/Application/src/Application/Controller/CompetenceController.php 15 additions, 15 deletions

...ation/src/Application/Controller/CompetenceController.php
module/Application/src/Application/Controller/CompetenceControllerFactory.php 7 additions, 6 deletions

...rc/Application/Controller/CompetenceControllerFactory.php
module/Application/src/Application/Controller/CorpsController.php 8 additions, 4 deletions

...pplication/src/Application/Controller/CorpsController.php
module/Application/src/Application/Controller/EntretienProfessionnelController.php 8 additions, 3 deletions

...plication/Controller/EntretienProfessionnelController.php
module/Application/src/Application/Controller/FicheMetierController.php 54 additions, 47 deletions

...tion/src/Application/Controller/FicheMetierController.php
module/Application/src/Application/Controller/FichePosteController.php 14 additions, 21 deletions

...ation/src/Application/Controller/FichePosteController.php
module/Application/src/Application/Controller/IndexController.php 2 additions, 4 deletions

...pplication/src/Application/Controller/IndexController.php
module/Application/src/Application/Controller/MissionSpecifiqueAffectationController.php 37 additions, 30 deletions

...ion/Controller/MissionSpecifiqueAffectationController.php
module/Application/src/Application/Controller/MissionSpecifiqueAffectationControllerFactory.php 1 addition, 2 deletions

...troller/MissionSpecifiqueAffectationControllerFactory.php
module/Application/src/Application/Controller/StructureController.php 3 additions, 3 deletions

...cation/src/Application/Controller/StructureController.php
module/Application/src/Application/Entity/Db/Agent.php 32 additions, 34 deletions

module/Application/src/Application/Entity/Db/Agent.php
module/Application/src/Application/Entity/Db/AgentQuotite.php 111 additions, 0 deletions

...le/Application/src/Application/Entity/Db/AgentQuotite.php
module/Application/src/Application/Entity/Db/Corps.php 25 additions, 0 deletions

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

with 405 additions and 436 deletions

Please register or to comment