diff --git a/data/Sql/v_4.sql b/data/Sql/v_4.sql
index abb582ca2264a2758d576274204e039a3a4d10b6..bfdd81ae1d4ff4352398e0f0779398ca305ae3f8 100644
--- a/data/Sql/v_4.sql
+++ b/data/Sql/v_4.sql
@@ -307,6 +307,16 @@ UPDATE INTERVENANT SET SUPANN_EMP_ID = SOURCE_CODE;
 UPDATE PERSONNEL SET CODE = SOURCE_CODE;
 UPDATE PERSONNEL SET SUPANN_EMP_ID = SOURCE_CODE;
 
+update formule_resultat set
+
+  type_intervenant_code = (SELECT ti.code FROM type_intervenant ti JOIN statut_intervenant si ON si.type_intervenant_id = ti.id JOIN intervenant i ON i.statut_id = si.id WHERE i.id = formule_resultat.intervenant_id),
+  type_volume_horaire_code = (SELECT tvh.code FROM type_volume_horaire tvh WHERE tvh.id = formule_resultat.type_volume_horaire_id),
+  etat_volume_horaire_code = (SELECT evh.code FROM etat_volume_horaire evh WHERE evh.id = formule_resultat.etat_volume_horaire_id)
+;
+
+
+
+--penser à la table des indicateurs ! !
 
 -- ********************************************************************* --
 -- *          à faire APRÈS avoir mis à jour le code source            * --
diff --git a/module/Application/autoload_classmap.php b/module/Application/autoload_classmap.php
index 47693c063b1ed9ae4bac71b7df2a277d61a4e886..f0809d1d35fb033e196a590f189327e090bb2ed4 100644
--- a/module/Application/autoload_classmap.php
+++ b/module/Application/autoload_classmap.php
@@ -1,814 +1,869 @@
 <?php
 // Generated by ZF2's ./bin/classmap_generator.php
 return array(
-    'Application\Module'                                                                                                  => __DIR__ . '/Module.php',
-    'Application\Validator\DepartementNaissanceValidator'                                                                 => __DIR__ . '/src/Application/Validator/DepartementNaissanceValidator.php',
-    'Application\Validator\PaysNaissanceValidator'                                                                        => __DIR__ . '/src/Application/Validator/PaysNaissanceValidator.php',
-    'Application\Validator\StatutIntervenantValidator'                                                                    => __DIR__ . '/src/Application/Validator/StatutIntervenantValidator.php',
-    'Application\Validator\NumeroINSEEValidator'                                                                          => __DIR__ . '/src/Application/Validator/NumeroINSEEValidator.php',
-    'Application\Interfaces\NiveauEtapeAwareInterface'                                                                    => __DIR__ . '/src/Application/Interfaces/NiveauEtapeAwareInterface.php',
-    'Application\Interfaces\ServiceAPayerAwareInterface'                                                                  => __DIR__ . '/src/Application/Interfaces/ServiceAPayerAwareInterface.php',
-    'Application\Interfaces\RoleAwareInterface'                                                                           => __DIR__ . '/src/Application/Interfaces/RoleAwareInterface.php',
-    'Application\Entity\Db\TypeModulateur'                                                                                => __DIR__ . '/src/Application/Entity/Db/TypeModulateur.php',
-    'Application\Entity\Db\ServiceReferentiel'                                                                            => __DIR__ . '/src/Application/Entity/Db/ServiceReferentiel.php',
-    'Application\Entity\Db\AffectationRecherche'                                                                          => __DIR__ . '/src/Application/Entity/Db/AffectationRecherche.php',
-    'Application\Entity\Db\CheminPedagogique'                                                                             => __DIR__ . '/src/Application/Entity/Db/CheminPedagogique.php',
-    'Application\Entity\Db\Interfaces\ContratAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/ContratAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CentreCoutEpAwareInterface'                                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/CentreCoutEpAwareInterface.php',
-    'Application\Entity\Db\Interfaces\SituationFamilialeAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/SituationFamilialeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VolumeHoraireEnsAwareInterface'                                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireEnsAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicDepassHcHorsRemuFcAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDepassHcHorsRemuFcAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VolumeHoraireReferentielAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeModulateurStructureAwareInterface'                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeModulateurStructureAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicDepassRefAwareInterface'                                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDepassRefAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AdresseStructureAwareInterface'                                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/AdresseStructureAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeHeuresAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeHeuresAwareInterface.php',
-    'Application\Entity\Db\Interfaces\MiseEnPaiementIntervenantStructureAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/MiseEnPaiementIntervenantStructureAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AffectationRechercheAwareInterface'                                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/AffectationRechercheAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CorpsAwareInterface'                                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/CorpsAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CentreCoutAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/CentreCoutAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeContratAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeContratAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ServiceAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/ServiceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleResultatServiceReferentielAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatServiceReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteValidationServiceRefAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidationServiceRefAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeModulateurAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeModulateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeRessourceAwareInterface'                                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeRessourceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FichierAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/FichierAwareInterface.php',
-    'Application\Entity\Db\Interfaces\EtablissementAwareInterface'                                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtablissementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeAgrementStatutAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeAgrementStatutAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ServiceReferentielAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/ServiceReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\RoleAwareInterface'                                                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/RoleAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AnneeAwareInterface'                                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/AnneeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\PersonnelAwareInterface'                                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/PersonnelAwareInterface.php',
-    'Application\Entity\Db\Interfaces\PerimetreAwareInterface'                                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/PerimetreAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeDotationAwareInterface'                                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeDotationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\StatutIntervenantAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/StatutIntervenantAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleVolumeHoraireAwareInterface'                                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleVolumeHoraireAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleVolumeHoraireReferentielAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleVolumeHoraireReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteValidRefAutreAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidRefAutreAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeVolumeHoraireAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeVolumeHoraireAwareInterface.php',
-    'Application\Entity\Db\Interfaces\PeriodeAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/PeriodeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleResultatAwareInterface'                                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatAwareInterface.php',
-    'Application\Entity\Db\Interfaces\PaysAwareInterface'                                                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/PaysAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeFormationAwareInterface'                                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeFormationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\NotificationIndicateurAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/NotificationIndicateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\IntervenantAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/IntervenantAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeValidationAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeValidationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleIntervenantAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleIntervenantAwareInterface.php',
-    'Application\Entity\Db\Interfaces\DotationAwareInterface'                                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/DotationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\MiseEnPaiementAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/MiseEnPaiementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ModulateurAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/ModulateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypePieceJointeStatutAwareInterface'                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePieceJointeStatutAwareInterface.php',
-    'Application\Entity\Db\Interfaces\DomaineFonctionnelAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/DomaineFonctionnelAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleServiceModifieAwareInterface'                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceModifieAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypePosteAwareInterface'                                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePosteAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CheminPedagogiqueAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/CheminPedagogiqueAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VServiceNonValideAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/VServiceNonValideAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteDemandeMepAwareInterface'                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteDemandeMepAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AgrementAwareInterface'                                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/AgrementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\DisciplineAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/DisciplineAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AffectationAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/AffectationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleResultatVolumeHoraireAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatVolumeHoraireAwareInterface.php',
-    'Application\Entity\Db\Interfaces\EtapeAwareInterface'                                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtapeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeAgrementAwareInterface'                                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeAgrementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeInterventionAwareInterface'                                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeInterventionAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteValidEnsAutreAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidEnsAutreAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleResultatServiceAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatServiceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\NiveauFormationAwareInterface'                                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/NiveauFormationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CcActiviteAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/CcActiviteAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteValidationServiceAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidationServiceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\IndicModifDossierAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/IndicModifDossierAwareInterface.php',
-    'Application\Entity\Db\Interfaces\MotifNonPaiementAwareInterface'                                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/MotifNonPaiementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\PieceJointeAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/PieceJointeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\DossierAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/DossierAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleServiceReferentielAwareInterface'                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\IndicateurAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/IndicateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ModificationServiceDuAwareInterface'                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/ModificationServiceDuAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeCentreCoutAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeCentreCoutAwareInterface.php',
-    'Application\Entity\Db\Interfaces\CiviliteAwareInterface'                                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/CiviliteAwareInterface.php',
-    'Application\Entity\Db\Interfaces\MotifModificationServiceDuAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/MotifModificationServiceDuAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeStructureAwareInterface'                                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeStructureAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VolumeHoraireAwareInterface'                                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VServiceValideAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/VServiceValideAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ElementPedagogiqueAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/ElementPedagogiqueAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicAttenteMepAwareInterface'                                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteMepAwareInterface.php',
-    'Application\Entity\Db\Interfaces\DepartementAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/DepartementAwareInterface.php',
-    'Application\Entity\Db\Interfaces\GroupeTypeFormationAwareInterface'                                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/GroupeTypeFormationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ElementModulateurAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/ElementModulateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleServiceAwareInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\VIndicDiffDossierAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDiffDossierAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypePieceJointeAwareInterface'                                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePieceJointeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\AdresseIntervenantAwareInterface'                                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/AdresseIntervenantAwareInterface.php',
-    'Application\Entity\Db\Interfaces\HistoIntervenantServiceAwareInterface'                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/HistoIntervenantServiceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\UtilisateurAwareInterface'                                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/UtilisateurAwareInterface.php',
-    'Application\Entity\Db\Interfaces\TypeIntervenantAwareInterface'                                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeIntervenantAwareInterface.php',
-    'Application\Entity\Db\Interfaces\SourceAwareInterface'                                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/SourceAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ParametreAwareInterface'                                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/ParametreAwareInterface.php',
-    'Application\Entity\Db\Interfaces\ValidationAwareInterface'                                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/ValidationAwareInterface.php',
-    'Application\Entity\Db\Interfaces\EtatVolumeHoraireAwareInterface'                                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtatVolumeHoraireAwareInterface.php',
-    'Application\Entity\Db\Interfaces\GradeAwareInterface'                                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/GradeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FormuleResultatVolumeHoraireReferentielAwareInterface'                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatVolumeHoraireReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\FonctionReferentielAwareInterface'                                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/FonctionReferentielAwareInterface.php',
-    'Application\Entity\Db\Interfaces\WfEtapeAwareInterface'                                                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/WfEtapeAwareInterface.php',
-    'Application\Entity\Db\Interfaces\StructureAwareInterface'                                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/StructureAwareInterface.php',
-    'Application\Entity\Db\ServiceAPayerInterface'                                                                        => __DIR__ . '/src/Application/Entity/Db/ServiceAPayerInterface.php',
-    'Application\Entity\Db\Modulateur'                                                                                    => __DIR__ . '/src/Application/Entity/Db/Modulateur.php',
-    'Application\Entity\Db\TypeValidation'                                                                                => __DIR__ . '/src/Application/Entity/Db/TypeValidation.php',
-    'Application\Entity\Db\ModificationServiceDu'                                                                         => __DIR__ . '/src/Application/Entity/Db/ModificationServiceDu.php',
-    'Application\Entity\Db\FormuleService'                                                                                => __DIR__ . '/src/Application/Entity/Db/FormuleService.php',
-    'Application\Entity\Db\VIndicDepassRef'                                                                               => __DIR__ . '/src/Application/Entity/Db/VIndicDepassRef.php',
-    'Application\Entity\Db\VIndicAttenteValidEnsAutre'                                                                    => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteValidEnsAutre.php',
-    'Application\Entity\Db\Departement'                                                                                   => __DIR__ . '/src/Application/Entity/Db/Departement.php',
-    'Application\Entity\Db\FormuleVolumeHoraireReferentiel'                                                               => __DIR__ . '/src/Application/Entity/Db/FormuleVolumeHoraireReferentiel.php',
-    'Application\Entity\Db\FormuleResultatVolumeHoraireReferentiel'                                                       => __DIR__ . '/src/Application/Entity/Db/FormuleResultatVolumeHoraireReferentiel.php',
-    'Application\Entity\Db\VIndicAttenteMep'                                                                              => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteMep.php',
-    'Application\Entity\Db\EtatVolumeHoraire'                                                                             => __DIR__ . '/src/Application/Entity/Db/EtatVolumeHoraire.php',
-    'Application\Entity\Db\FormuleResultatService'                                                                        => __DIR__ . '/src/Application/Entity/Db/FormuleResultatService.php',
-    'Application\Entity\Db\TypeContrat'                                                                                   => __DIR__ . '/src/Application/Entity/Db/TypeContrat.php',
-    'Application\Entity\Db\ServiceAPayerTrait'                                                                            => __DIR__ . '/src/Application/Entity/Db/ServiceAPayerTrait.php',
-    'Application\Entity\Db\AdresseStructure'                                                                              => __DIR__ . '/src/Application/Entity/Db/AdresseStructure.php',
-    'Application\Entity\Db\TypeAgrement'                                                                                  => __DIR__ . '/src/Application/Entity/Db/TypeAgrement.php',
-    'Application\Entity\Db\Corps'                                                                                         => __DIR__ . '/src/Application/Entity/Db/Corps.php',
-    'Application\Entity\Db\ElementPedagogique'                                                                            => __DIR__ . '/src/Application/Entity/Db/ElementPedagogique.php',
-    'Application\Entity\Db\MiseEnPaiementIntervenantStructure'                                                            => __DIR__ . '/src/Application/Entity/Db/MiseEnPaiementIntervenantStructure.php',
-    'Application\Entity\Db\Pays'                                                                                          => __DIR__ . '/src/Application/Entity/Db/Pays.php',
-    'Application\Entity\Db\MotifModificationServiceDu'                                                                    => __DIR__ . '/src/Application/Entity/Db/MotifModificationServiceDu.php',
-    'Application\Entity\Db\Annee'                                                                                         => __DIR__ . '/src/Application/Entity/Db/Annee.php',
-    'Application\Entity\Db\TypeVolumeHoraire'                                                                             => __DIR__ . '/src/Application/Entity/Db/TypeVolumeHoraire.php',
-    'Application\Entity\Db\Structure'                                                                                     => __DIR__ . '/src/Application/Entity/Db/Structure.php',
-    'Application\Entity\Db\Perimetre'                                                                                     => __DIR__ . '/src/Application/Entity/Db/Perimetre.php',
-    'Application\Entity\Db\PieceJointe'                                                                                   => __DIR__ . '/src/Application/Entity/Db/PieceJointe.php',
-    'Application\Entity\Db\TypeFormation'                                                                                 => __DIR__ . '/src/Application/Entity/Db/TypeFormation.php',
-    'Application\Entity\Db\TypeRessource'                                                                                 => __DIR__ . '/src/Application/Entity/Db/TypeRessource.php',
-    'Application\Entity\Db\Intervenant'                                                                                   => __DIR__ . '/src/Application/Entity/Db/Intervenant.php',
-    'Application\Entity\Db\Service'                                                                                       => __DIR__ . '/src/Application/Entity/Db/Service.php',
-    'Application\Entity\Db\MotifNonPaiement'                                                                              => __DIR__ . '/src/Application/Entity/Db/MotifNonPaiement.php',
-    'Application\Entity\Db\TypeHeures'                                                                                    => __DIR__ . '/src/Application/Entity/Db/TypeHeures.php',
-    'Application\Entity\Db\FormuleVolumeHoraire'                                                                          => __DIR__ . '/src/Application/Entity/Db/FormuleVolumeHoraire.php',
-    'Application\Entity\Db\Fichier'                                                                                       => __DIR__ . '/src/Application/Entity/Db/Fichier.php',
-    'Application\Entity\Db\FormuleServiceModifie'                                                                         => __DIR__ . '/src/Application/Entity/Db/FormuleServiceModifie.php',
-    'Application\Entity\Db\CentreCout'                                                                                    => __DIR__ . '/src/Application/Entity/Db/CentreCout.php',
-    'Application\Entity\Db\Civilite'                                                                                      => __DIR__ . '/src/Application/Entity/Db/Civilite.php',
-    'Application\Entity\Db\VIndicDiffDossier'                                                                             => __DIR__ . '/src/Application/Entity/Db/VIndicDiffDossier.php',
-    'Application\Entity\Db\Validation'                                                                                    => __DIR__ . '/src/Application/Entity/Db/Validation.php',
-    'Application\Entity\Db\CcActivite'                                                                                    => __DIR__ . '/src/Application/Entity/Db/CcActivite.php',
-    'Application\Entity\Db\HistoIntervenantService'                                                                       => __DIR__ . '/src/Application/Entity/Db/HistoIntervenantService.php',
-    'Application\Entity\Db\Indicateur'                                                                                    => __DIR__ . '/src/Application/Entity/Db/Indicateur.php',
-    'Application\Entity\Db\VIndicAttenteDemandeMep'                                                                       => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteDemandeMep.php',
-    'Application\Entity\Db\Traits\FormuleResultatAwareTrait'                                                              => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleVolumeHoraireReferentielAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleVolumeHoraireReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\ServiceReferentielAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/ServiceReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\ModulateurAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/ModulateurAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicDepassRefAwareTrait'                                                              => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDepassRefAwareTrait.php',
-    'Application\Entity\Db\Traits\IndicateurAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/IndicateurAwareTrait.php',
-    'Application\Entity\Db\Traits\ElementModulateurAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/ElementModulateurAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeRessourceAwareTrait'                                                                => __DIR__ . '/src/Application/Entity/Db/Traits/TypeRessourceAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleServiceReferentielAwareTrait'                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\CorpsAwareTrait'                                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/CorpsAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeInterventionAwareTrait'                                                             => __DIR__ . '/src/Application/Entity/Db/Traits/TypeInterventionAwareTrait.php',
-    'Application\Entity\Db\Traits\MotifModificationServiceDuAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/MotifModificationServiceDuAwareTrait.php',
-    'Application\Entity\Db\Traits\ModificationServiceDuAwareTrait'                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/ModificationServiceDuAwareTrait.php',
-    'Application\Entity\Db\Traits\RoleAwareTrait'                                                                         => __DIR__ . '/src/Application/Entity/Db/Traits/RoleAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleResultatVolumeHoraireAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatVolumeHoraireAwareTrait.php',
-    'Application\Entity\Db\Traits\VolumeHoraireReferentielAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\ElementPedagogiqueAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/ElementPedagogiqueAwareTrait.php',
-    'Application\Entity\Db\Traits\WfEtapeAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/WfEtapeAwareTrait.php',
-    'Application\Entity\Db\Traits\MotifNonPaiementAwareTrait'                                                             => __DIR__ . '/src/Application/Entity/Db/Traits/MotifNonPaiementAwareTrait.php',
-    'Application\Entity\Db\Traits\EtatVolumeHoraireAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/EtatVolumeHoraireAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteValidRefAutreAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidRefAutreAwareTrait.php',
-    'Application\Entity\Db\Traits\EtablissementAwareTrait'                                                                => __DIR__ . '/src/Application/Entity/Db/Traits/EtablissementAwareTrait.php',
-    'Application\Entity\Db\Traits\IndicModifDossierAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/IndicModifDossierAwareTrait.php',
-    'Application\Entity\Db\Traits\StructureAwareTrait'                                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/StructureAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleVolumeHoraireAwareTrait'                                                         => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleVolumeHoraireAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeContratAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/TypeContratAwareTrait.php',
-    'Application\Entity\Db\Traits\TypePosteAwareTrait'                                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/TypePosteAwareTrait.php',
-    'Application\Entity\Db\Traits\VServiceNonValideAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/VServiceNonValideAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeValidationAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeValidationAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeAgrementStatutAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/TypeAgrementStatutAwareTrait.php',
-    'Application\Entity\Db\Traits\DisciplineAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/DisciplineAwareTrait.php',
-    'Application\Entity\Db\Traits\SituationFamilialeAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/SituationFamilialeAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeModulateurStructureAwareTrait'                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/TypeModulateurStructureAwareTrait.php',
-    'Application\Entity\Db\Traits\TypePieceJointeAwareTrait'                                                              => __DIR__ . '/src/Application/Entity/Db/Traits/TypePieceJointeAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleServiceModifieAwareTrait'                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceModifieAwareTrait.php',
-    'Application\Entity\Db\Traits\FichierAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/FichierAwareTrait.php',
-    'Application\Entity\Db\Traits\VolumeHoraireAwareTrait'                                                                => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireAwareTrait.php',
-    'Application\Entity\Db\Traits\FonctionReferentielAwareTrait'                                                          => __DIR__ . '/src/Application/Entity/Db/Traits/FonctionReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\VolumeHoraireEnsAwareTrait'                                                             => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireEnsAwareTrait.php',
-    'Application\Entity\Db\Traits\PieceJointeAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/PieceJointeAwareTrait.php',
-    'Application\Entity\Db\Traits\NotificationIndicateurAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/NotificationIndicateurAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeDotationAwareTrait'                                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/TypeDotationAwareTrait.php',
-    'Application\Entity\Db\Traits\GroupeTypeFormationAwareTrait'                                                          => __DIR__ . '/src/Application/Entity/Db/Traits/GroupeTypeFormationAwareTrait.php',
-    'Application\Entity\Db\Traits\ServiceAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/ServiceAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeModulateurAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeModulateurAwareTrait.php',
-    'Application\Entity\Db\Traits\AdresseStructureAwareTrait'                                                             => __DIR__ . '/src/Application/Entity/Db/Traits/AdresseStructureAwareTrait.php',
-    'Application\Entity\Db\Traits\MiseEnPaiementIntervenantStructureAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/MiseEnPaiementIntervenantStructureAwareTrait.php',
-    'Application\Entity\Db\Traits\GradeAwareTrait'                                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/GradeAwareTrait.php',
-    'Application\Entity\Db\Traits\ValidationAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/ValidationAwareTrait.php',
-    'Application\Entity\Db\Traits\TypePieceJointeStatutAwareTrait'                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/TypePieceJointeStatutAwareTrait.php',
-    'Application\Entity\Db\Traits\CheminPedagogiqueAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/CheminPedagogiqueAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeHeuresAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/TypeHeuresAwareTrait.php',
-    'Application\Entity\Db\Traits\PaysAwareTrait'                                                                         => __DIR__ . '/src/Application/Entity/Db/Traits/PaysAwareTrait.php',
-    'Application\Entity\Db\Traits\HistoIntervenantServiceAwareTrait'                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/HistoIntervenantServiceAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleServiceAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceAwareTrait.php',
-    'Application\Entity\Db\Traits\AgrementAwareTrait'                                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/AgrementAwareTrait.php',
-    'Application\Entity\Db\Traits\DepartementAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/DepartementAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeStructureAwareTrait'                                                                => __DIR__ . '/src/Application/Entity/Db/Traits/TypeStructureAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicDiffDossierAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDiffDossierAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleResultatServiceAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatServiceAwareTrait.php',
-    'Application\Entity\Db\Traits\ContratAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/ContratAwareTrait.php',
-    'Application\Entity\Db\Traits\DossierAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/DossierAwareTrait.php',
-    'Application\Entity\Db\Traits\CentreCoutAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/CentreCoutAwareTrait.php',
-    'Application\Entity\Db\Traits\ParametreAwareTrait'                                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/ParametreAwareTrait.php',
-    'Application\Entity\Db\Traits\PerimetreAwareTrait'                                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/PerimetreAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteValidationServiceAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidationServiceAwareTrait.php',
-    'Application\Entity\Db\Traits\MiseEnPaiementAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/MiseEnPaiementAwareTrait.php',
-    'Application\Entity\Db\Traits\PeriodeAwareTrait'                                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/PeriodeAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteValidationServiceRefAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidationServiceRefAwareTrait.php',
-    'Application\Entity\Db\Traits\IntervenantAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeCentreCoutAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeCentreCoutAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleResultatVolumeHoraireReferentielAwareTrait'                                      => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatVolumeHoraireReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\DomaineFonctionnelAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/DomaineFonctionnelAwareTrait.php',
-    'Application\Entity\Db\Traits\EtapeAwareTrait'                                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/EtapeAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicDepassHcHorsRemuFcAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDepassHcHorsRemuFcAwareTrait.php',
-    'Application\Entity\Db\Traits\NiveauFormationAwareTrait'                                                              => __DIR__ . '/src/Application/Entity/Db/Traits/NiveauFormationAwareTrait.php',
-    'Application\Entity\Db\Traits\AffectationAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/AffectationAwareTrait.php',
-    'Application\Entity\Db\Traits\AnneeAwareTrait'                                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/AnneeAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeFormationAwareTrait'                                                                => __DIR__ . '/src/Application/Entity/Db/Traits/TypeFormationAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleIntervenantAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleIntervenantAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeIntervenantAwareTrait'                                                              => __DIR__ . '/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php',
-    'Application\Entity\Db\Traits\VServiceValideAwareTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/Traits/VServiceValideAwareTrait.php',
-    'Application\Entity\Db\Traits\FormuleResultatServiceReferentielAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatServiceReferentielAwareTrait.php',
-    'Application\Entity\Db\Traits\PersonnelAwareTrait'                                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/PersonnelAwareTrait.php',
-    'Application\Entity\Db\Traits\CiviliteAwareTrait'                                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/CiviliteAwareTrait.php',
-    'Application\Entity\Db\Traits\StatutIntervenantAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/StatutIntervenantAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteDemandeMepAwareTrait'                                                      => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteDemandeMepAwareTrait.php',
-    'Application\Entity\Db\Traits\AdresseIntervenantAwareTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/Traits/AdresseIntervenantAwareTrait.php',
-    'Application\Entity\Db\Traits\CentreCoutEpAwareTrait'                                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/CentreCoutEpAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteValidEnsAutreAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidEnsAutreAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait'                                                            => __DIR__ . '/src/Application/Entity/Db/Traits/TypeVolumeHoraireAwareTrait.php',
-    'Application\Entity\Db\Traits\CcActiviteAwareTrait'                                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/CcActiviteAwareTrait.php',
-    'Application\Entity\Db\Traits\UtilisateurAwareTrait'                                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/UtilisateurAwareTrait.php',
-    'Application\Entity\Db\Traits\VIndicAttenteMepAwareTrait'                                                             => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteMepAwareTrait.php',
-    'Application\Entity\Db\Traits\TypeAgrementAwareTrait'                                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/TypeAgrementAwareTrait.php',
-    'Application\Entity\Db\Traits\AffectationRechercheAwareTrait'                                                         => __DIR__ . '/src/Application/Entity/Db/Traits/AffectationRechercheAwareTrait.php',
-    'Application\Entity\Db\Traits\DotationAwareTrait'                                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/DotationAwareTrait.php',
-    'Application\Entity\Db\NotificationIndicateur'                                                                        => __DIR__ . '/src/Application/Entity/Db/NotificationIndicateur.php',
-    'Application\Entity\Db\Affectation'                                                                                   => __DIR__ . '/src/Application/Entity/Db/Affectation.php',
-    'Application\Entity\Db\TypeCentreCout'                                                                                => __DIR__ . '/src/Application/Entity/Db/TypeCentreCout.php',
-    'Application\Entity\Db\VIndicAttenteValidRefAutre'                                                                    => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteValidRefAutre.php',
-    'Application\Entity\Db\StatutIntervenant'                                                                             => __DIR__ . '/src/Application/Entity/Db/StatutIntervenant.php',
-    'Application\Entity\Db\VServiceNonValide'                                                                             => __DIR__ . '/src/Application/Entity/Db/VServiceNonValide.php',
-    'Application\Entity\Db\GroupeTypeFormation'                                                                           => __DIR__ . '/src/Application/Entity/Db/GroupeTypeFormation.php',
-    'Application\Entity\Db\Contrat'                                                                                       => __DIR__ . '/src/Application/Entity/Db/Contrat.php',
-    'Application\Entity\Db\TypeStructure'                                                                                 => __DIR__ . '/src/Application/Entity/Db/TypeStructure.php',
-    'Application\Entity\Db\MiseEnPaiement'                                                                                => __DIR__ . '/src/Application/Entity/Db/MiseEnPaiement.php',
-    'Application\Entity\Db\AdresseIntervenant'                                                                            => __DIR__ . '/src/Application/Entity/Db/AdresseIntervenant.php',
-    'Application\Entity\Db\VIndicAttenteValidationServiceRef'                                                             => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteValidationServiceRef.php',
-    'Application\Entity\Db\Utilisateur'                                                                                   => __DIR__ . '/src/Application/Entity/Db/Utilisateur.php',
-    'Application\Entity\Db\Etape'                                                                                         => __DIR__ . '/src/Application/Entity/Db/Etape.php',
-    'Application\Entity\Db\IntervenantInterface'                                                                          => __DIR__ . '/src/Application/Entity/Db/IntervenantInterface.php',
-    'Application\Entity\Db\Role'                                                                                          => __DIR__ . '/src/Application/Entity/Db/Role.php',
-    'Application\Entity\Db\VIndicAttenteValidationService'                                                                => __DIR__ . '/src/Application/Entity/Db/VIndicAttenteValidationService.php',
-    'Application\Entity\Db\Hydrator\DateInfSupStrategy'                                                                   => __DIR__ . '/src/Application/Entity/Db/Hydrator/DateInfSupStrategy.php',
-    'Application\Entity\Db\Hydrator\IntervenantHydrator'                                                                  => __DIR__ . '/src/Application/Entity/Db/Hydrator/IntervenantHydrator.php',
-    'Application\Entity\Db\Hydrator\Intervenant'                                                                          => __DIR__ . '/src/Application/Entity/Db/Hydrator/Intervenant.php',
-    'Application\Entity\Db\Hydrator\CiviliteHydrator'                                                                     => __DIR__ . '/src/Application/Entity/Db/Hydrator/CiviliteHydrator.php',
-    'Application\Entity\Db\VolumeHoraireReferentiel'                                                                      => __DIR__ . '/src/Application/Entity/Db/VolumeHoraireReferentiel.php',
-    'Application\Entity\Db\FormuleResultatVolumeHoraire'                                                                  => __DIR__ . '/src/Application/Entity/Db/FormuleResultatVolumeHoraire.php',
-    'Application\Entity\Db\CentreCoutEp'                                                                                  => __DIR__ . '/src/Application/Entity/Db/CentreCoutEp.php',
-    'Application\Entity\Db\Periode'                                                                                       => __DIR__ . '/src/Application/Entity/Db/Periode.php',
-    'Application\Entity\Db\NiveauFormation'                                                                               => __DIR__ . '/src/Application/Entity/Db/NiveauFormation.php',
-    'Application\Entity\Db\VolumeHoraireEns'                                                                              => __DIR__ . '/src/Application/Entity/Db/VolumeHoraireEns.php',
-    'Application\Entity\Db\Dotation'                                                                                      => __DIR__ . '/src/Application/Entity/Db/Dotation.php',
-    'Application\Entity\Db\IndicModifDossier'                                                                             => __DIR__ . '/src/Application/Entity/Db/IndicModifDossier.php',
-    'Application\Entity\Db\FormuleResultat'                                                                               => __DIR__ . '/src/Application/Entity/Db/FormuleResultat.php',
-    'Application\Entity\Db\Etablissement'                                                                                 => __DIR__ . '/src/Application/Entity/Db/Etablissement.php',
-    'Application\Entity\Db\DomaineFonctionnel'                                                                            => __DIR__ . '/src/Application/Entity/Db/DomaineFonctionnel.php',
-    'Application\Entity\Db\Discipline'                                                                                    => __DIR__ . '/src/Application/Entity/Db/Discipline.php',
-    'Application\Entity\Db\Dossier'                                                                                       => __DIR__ . '/src/Application/Entity/Db/Dossier.php',
-    'Application\Entity\Db\Parametre'                                                                                     => __DIR__ . '/src/Application/Entity/Db/Parametre.php',
-    'Application\Entity\Db\TypePieceJointe'                                                                               => __DIR__ . '/src/Application/Entity/Db/TypePieceJointe.php',
-    'Application\Entity\Db\TypeIntervention'                                                                              => __DIR__ . '/src/Application/Entity/Db/TypeIntervention.php',
-    'Application\Entity\Db\TypeIntervenant'                                                                               => __DIR__ . '/src/Application/Entity/Db/TypeIntervenant.php',
-    'Application\Entity\Db\FormuleResultatServiceReferentiel'                                                             => __DIR__ . '/src/Application/Entity/Db/FormuleResultatServiceReferentiel.php',
-    'Application\Entity\Db\TypePoste'                                                                                     => __DIR__ . '/src/Application/Entity/Db/TypePoste.php',
-    'Application\Entity\Db\Indicateur\AbstractIndicateur'                                                                 => __DIR__ . '/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php',
-    'Application\Entity\Db\Indicateur\Indicateur210'                                                                      => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur210.php',
-    'Application\Entity\Db\TypeAgrementStatut'                                                                            => __DIR__ . '/src/Application/Entity/Db/TypeAgrementStatut.php',
-    'Application\Entity\Db\VIndicDepassHcHorsRemuFc'                                                                      => __DIR__ . '/src/Application/Entity/Db/VIndicDepassHcHorsRemuFc.php',
-    'Application\Entity\Db\FonctionReferentiel'                                                                           => __DIR__ . '/src/Application/Entity/Db/FonctionReferentiel.php',
-    'Application\Entity\Db\Agrement'                                                                                      => __DIR__ . '/src/Application/Entity/Db/Agrement.php',
-    'Application\Entity\Db\Personnel'                                                                                     => __DIR__ . '/src/Application/Entity/Db/Personnel.php',
-    'Application\Entity\Db\ElementModulateur'                                                                             => __DIR__ . '/src/Application/Entity/Db/ElementModulateur.php',
-    'Application\Entity\Db\FormuleIntervenant'                                                                            => __DIR__ . '/src/Application/Entity/Db/FormuleIntervenant.php',
-    'Application\Entity\Db\WfEtape'                                                                                       => __DIR__ . '/src/Application/Entity/Db/WfEtape.php',
-    'Application\Entity\Db\TypeDotation'                                                                                  => __DIR__ . '/src/Application/Entity/Db/TypeDotation.php',
-    'Application\Entity\Db\TypePieceJointeStatut'                                                                         => __DIR__ . '/src/Application/Entity/Db/TypePieceJointeStatut.php',
-    'Application\Entity\Db\VServiceValide'                                                                                => __DIR__ . '/src/Application/Entity/Db/VServiceValide.php',
-    'Application\Entity\Db\FormuleServiceReferentiel'                                                                     => __DIR__ . '/src/Application/Entity/Db/FormuleServiceReferentiel.php',
-    'Application\Entity\Db\Effectifs'                                                                                     => __DIR__ . '/src/Application/Entity/Db/Effectifs.php',
-    'Application\Entity\Db\Grade'                                                                                         => __DIR__ . '/src/Application/Entity/Db/Grade.php',
-    'Application\Entity\Db\TypeModulateurStructure'                                                                       => __DIR__ . '/src/Application/Entity/Db/TypeModulateurStructure.php',
-    'Application\Entity\Db\VolumeHoraire'                                                                                 => __DIR__ . '/src/Application/Entity/Db/VolumeHoraire.php',
-    'Application\Entity\Db\FormuleResultatTypesHeuresTrait'                                                               => __DIR__ . '/src/Application/Entity/Db/FormuleResultatTypesHeuresTrait.php',
-    'Application\Entity\Service\Recherche'                                                                                => __DIR__ . '/src/Application/Entity/Service/Recherche.php',
-    'Application\Entity\VolumeHoraireListe'                                                                               => __DIR__ . '/src/Application/Entity/VolumeHoraireListe.php',
-    'Application\Entity\VolumeHoraireReferentielListe'                                                                    => __DIR__ . '/src/Application/Entity/VolumeHoraireReferentielListe.php',
-    'Application\Entity\MiseEnPaiementListe'                                                                              => __DIR__ . '/src/Application/Entity/MiseEnPaiementListe.php',
-    'Application\Entity\Paiement\MiseEnPaiementRecherche'                                                                 => __DIR__ . '/src/Application/Entity/Paiement/MiseEnPaiementRecherche.php',
-    'Application\Entity\NiveauEtape'                                                                                      => __DIR__ . '/src/Application/Entity/NiveauEtape.php',
-    'Application\Service\TypeModulateur'                                                                                  => __DIR__ . '/src/Application/Service/TypeModulateur.php',
-    'Application\Service\NavigationFactory'                                                                               => __DIR__ . '/src/Application/Service/NavigationFactory.php',
-    'Application\Service\ServiceReferentiel'                                                                              => __DIR__ . '/src/Application/Service/ServiceReferentiel.php',
-    'Application\Service\CheminPedagogique'                                                                               => __DIR__ . '/src/Application/Service/CheminPedagogique.php',
-    'Application\Service\Interfaces\ContratAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/ContratAwareInterface.php',
-    'Application\Service\Interfaces\LocalContextAwareInterface'                                                           => __DIR__ . '/src/Application/Service/Interfaces/LocalContextAwareInterface.php',
-    'Application\Service\Interfaces\CentreCoutEpAwareInterface'                                                           => __DIR__ . '/src/Application/Service/Interfaces/CentreCoutEpAwareInterface.php',
-    'Application\Service\Interfaces\IndicateurServiceAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/IndicateurServiceAwareInterface.php',
-    'Application\Service\Interfaces\VolumeHoraireReferentielAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/VolumeHoraireReferentielAwareInterface.php',
-    'Application\Service\Interfaces\PrivilegeAwareInterface'                                                              => __DIR__ . '/src/Application/Service/Interfaces/PrivilegeAwareInterface.php',
-    'Application\Service\Interfaces\TypeHeuresAwareInterface'                                                             => __DIR__ . '/src/Application/Service/Interfaces/TypeHeuresAwareInterface.php',
-    'Application\Service\Interfaces\MiseEnPaiementIntervenantStructureAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/MiseEnPaiementIntervenantStructureAwareInterface.php',
-    'Application\Service\Interfaces\NiveauEtapeAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/NiveauEtapeAwareInterface.php',
-    'Application\Service\Interfaces\CentreCoutAwareInterface'                                                             => __DIR__ . '/src/Application/Service/Interfaces/CentreCoutAwareInterface.php',
-    'Application\Service\Interfaces\TypeContratAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/TypeContratAwareInterface.php',
-    'Application\Service\Interfaces\ServiceAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/ServiceAwareInterface.php',
-    'Application\Service\Interfaces\ServiceAPayerAwareInterface'                                                          => __DIR__ . '/src/Application/Service/Interfaces/ServiceAPayerAwareInterface.php',
-    'Application\Service\Interfaces\FormuleResultatServiceReferentielAwareInterface'                                      => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatServiceReferentielAwareInterface.php',
-    'Application\Service\Interfaces\TypeModulateurAwareInterface'                                                         => __DIR__ . '/src/Application/Service/Interfaces/TypeModulateurAwareInterface.php',
-    'Application\Service\Interfaces\EtablissementAwareInterface'                                                          => __DIR__ . '/src/Application/Service/Interfaces/EtablissementAwareInterface.php',
-    'Application\Service\Interfaces\TypeAgrementStatutAwareInterface'                                                     => __DIR__ . '/src/Application/Service/Interfaces/TypeAgrementStatutAwareInterface.php',
-    'Application\Service\Interfaces\ServiceReferentielAwareInterface'                                                     => __DIR__ . '/src/Application/Service/Interfaces/ServiceReferentielAwareInterface.php',
-    'Application\Service\Interfaces\RoleAwareInterface'                                                                   => __DIR__ . '/src/Application/Service/Interfaces/RoleAwareInterface.php',
-    'Application\Service\Interfaces\AnneeAwareInterface'                                                                  => __DIR__ . '/src/Application/Service/Interfaces/AnneeAwareInterface.php',
-    'Application\Service\Interfaces\PersonnelAwareInterface'                                                              => __DIR__ . '/src/Application/Service/Interfaces/PersonnelAwareInterface.php',
-    'Application\Service\Interfaces\PerimetreAwareInterface'                                                              => __DIR__ . '/src/Application/Service/Interfaces/PerimetreAwareInterface.php',
-    'Application\Service\Interfaces\StatutIntervenantAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/StatutIntervenantAwareInterface.php',
-    'Application\Service\Interfaces\FormuleVolumeHoraireAwareInterface'                                                   => __DIR__ . '/src/Application/Service/Interfaces/FormuleVolumeHoraireAwareInterface.php',
-    'Application\Service\Interfaces\FormuleVolumeHoraireReferentielAwareInterface'                                        => __DIR__ . '/src/Application/Service/Interfaces/FormuleVolumeHoraireReferentielAwareInterface.php',
-    'Application\Service\Interfaces\TypeVolumeHoraireAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/TypeVolumeHoraireAwareInterface.php',
-    'Application\Service\Interfaces\PeriodeAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/PeriodeAwareInterface.php',
-    'Application\Service\Interfaces\FormuleResultatAwareInterface'                                                        => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatAwareInterface.php',
-    'Application\Service\Interfaces\ContextAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/ContextAwareInterface.php',
-    'Application\Service\Interfaces\PaysAwareInterface'                                                                   => __DIR__ . '/src/Application/Service/Interfaces/PaysAwareInterface.php',
-    'Application\Service\Interfaces\ServiceServiceAwareInterface'                                                         => __DIR__ . '/src/Application/Service/Interfaces/ServiceServiceAwareInterface.php',
-    'Application\Service\Interfaces\TypeFormationAwareInterface'                                                          => __DIR__ . '/src/Application/Service/Interfaces/TypeFormationAwareInterface.php',
-    'Application\Service\Interfaces\NotificationIndicateurAwareInterface'                                                 => __DIR__ . '/src/Application/Service/Interfaces/NotificationIndicateurAwareInterface.php',
-    'Application\Service\Interfaces\IntervenantAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/IntervenantAwareInterface.php',
-    'Application\Service\Interfaces\TypeValidationAwareInterface'                                                         => __DIR__ . '/src/Application/Service/Interfaces/TypeValidationAwareInterface.php',
-    'Application\Service\Interfaces\ParametresAwareInterface'                                                             => __DIR__ . '/src/Application/Service/Interfaces/ParametresAwareInterface.php',
-    'Application\Service\Interfaces\FormuleIntervenantAwareInterface'                                                     => __DIR__ . '/src/Application/Service/Interfaces/FormuleIntervenantAwareInterface.php',
-    'Application\Service\Interfaces\MiseEnPaiementAwareInterface'                                                         => __DIR__ . '/src/Application/Service/Interfaces/MiseEnPaiementAwareInterface.php',
-    'Application\Service\Interfaces\ModulateurAwareInterface'                                                             => __DIR__ . '/src/Application/Service/Interfaces/ModulateurAwareInterface.php',
-    'Application\Service\Interfaces\TypePieceJointeStatutAwareInterface'                                                  => __DIR__ . '/src/Application/Service/Interfaces/TypePieceJointeStatutAwareInterface.php',
-    'Application\Service\Interfaces\DomaineFonctionnelAwareInterface'                                                     => __DIR__ . '/src/Application/Service/Interfaces/DomaineFonctionnelAwareInterface.php',
-    'Application\Service\Interfaces\FormuleServiceModifieAwareInterface'                                                  => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceModifieAwareInterface.php',
-    'Application\Service\Interfaces\CheminPedagogiqueAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/CheminPedagogiqueAwareInterface.php',
-    'Application\Service\Interfaces\AgrementAwareInterface'                                                               => __DIR__ . '/src/Application/Service/Interfaces/AgrementAwareInterface.php',
-    'Application\Service\Interfaces\AffectationAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/AffectationAwareInterface.php',
-    'Application\Service\Interfaces\FormuleResultatVolumeHoraireAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatVolumeHoraireAwareInterface.php',
-    'Application\Service\Interfaces\EtapeAwareInterface'                                                                  => __DIR__ . '/src/Application/Service/Interfaces/EtapeAwareInterface.php',
-    'Application\Service\Interfaces\TypeAgrementAwareInterface'                                                           => __DIR__ . '/src/Application/Service/Interfaces/TypeAgrementAwareInterface.php',
-    'Application\Service\Interfaces\TypeInterventionAwareInterface'                                                       => __DIR__ . '/src/Application/Service/Interfaces/TypeInterventionAwareInterface.php',
-    'Application\Service\Interfaces\FormuleResultatServiceAwareInterface'                                                 => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatServiceAwareInterface.php',
-    'Application\Service\Interfaces\NiveauFormationAwareInterface'                                                        => __DIR__ . '/src/Application/Service/Interfaces/NiveauFormationAwareInterface.php',
-    'Application\Service\Interfaces\MotifNonPaiementAwareInterface'                                                       => __DIR__ . '/src/Application/Service/Interfaces/MotifNonPaiementAwareInterface.php',
-    'Application\Service\Interfaces\PieceJointeAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/PieceJointeAwareInterface.php',
-    'Application\Service\Interfaces\DossierAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/DossierAwareInterface.php',
-    'Application\Service\Interfaces\FormuleServiceReferentielAwareInterface'                                              => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceReferentielAwareInterface.php',
-    'Application\Service\Interfaces\ModificationServiceDuAwareInterface'                                                  => __DIR__ . '/src/Application/Service/Interfaces/ModificationServiceDuAwareInterface.php',
-    'Application\Service\Interfaces\CiviliteAwareInterface'                                                               => __DIR__ . '/src/Application/Service/Interfaces/CiviliteAwareInterface.php',
-    'Application\Service\Interfaces\MotifModificationServiceDuAwareInterface'                                             => __DIR__ . '/src/Application/Service/Interfaces/MotifModificationServiceDuAwareInterface.php',
-    'Application\Service\Interfaces\TypeStructureAwareInterface'                                                          => __DIR__ . '/src/Application/Service/Interfaces/TypeStructureAwareInterface.php',
-    'Application\Service\Interfaces\VolumeHoraireAwareInterface'                                                          => __DIR__ . '/src/Application/Service/Interfaces/VolumeHoraireAwareInterface.php',
-    'Application\Service\Interfaces\ElementPedagogiqueAwareInterface'                                                     => __DIR__ . '/src/Application/Service/Interfaces/ElementPedagogiqueAwareInterface.php',
-    'Application\Service\Interfaces\DepartementAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/DepartementAwareInterface.php',
-    'Application\Service\Interfaces\GroupeTypeFormationAwareInterface'                                                    => __DIR__ . '/src/Application/Service/Interfaces/GroupeTypeFormationAwareInterface.php',
-    'Application\Service\Interfaces\ElementModulateurAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/ElementModulateurAwareInterface.php',
-    'Application\Service\Interfaces\FormuleServiceAwareInterface'                                                         => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceAwareInterface.php',
-    'Application\Service\Interfaces\TypePieceJointeAwareInterface'                                                        => __DIR__ . '/src/Application/Service/Interfaces/TypePieceJointeAwareInterface.php',
-    'Application\Service\Interfaces\DisciplineServiceAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/DisciplineServiceAwareInterface.php',
-    'Application\Service\Interfaces\UtilisateurAwareInterface'                                                            => __DIR__ . '/src/Application/Service/Interfaces/UtilisateurAwareInterface.php',
-    'Application\Service\Interfaces\TypeIntervenantAwareInterface'                                                        => __DIR__ . '/src/Application/Service/Interfaces/TypeIntervenantAwareInterface.php',
-    'Application\Service\Interfaces\SourceAwareInterface'                                                                 => __DIR__ . '/src/Application/Service/Interfaces/SourceAwareInterface.php',
-    'Application\Service\Interfaces\ValidationAwareInterface'                                                             => __DIR__ . '/src/Application/Service/Interfaces/ValidationAwareInterface.php',
-    'Application\Service\Interfaces\EtatVolumeHoraireAwareInterface'                                                      => __DIR__ . '/src/Application/Service/Interfaces/EtatVolumeHoraireAwareInterface.php',
-    'Application\Service\Interfaces\FormuleResultatVolumeHoraireReferentielAwareInterface'                                => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatVolumeHoraireReferentielAwareInterface.php',
-    'Application\Service\Interfaces\FonctionReferentielAwareInterface'                                                    => __DIR__ . '/src/Application/Service/Interfaces/FonctionReferentielAwareInterface.php',
-    'Application\Service\Interfaces\WfEtapeAwareInterface'                                                                => __DIR__ . '/src/Application/Service/Interfaces/WfEtapeAwareInterface.php',
-    'Application\Service\Interfaces\StructureAwareInterface'                                                              => __DIR__ . '/src/Application/Service/Interfaces/StructureAwareInterface.php',
-    'Application\Service\Modulateur'                                                                                      => __DIR__ . '/src/Application/Service/Modulateur.php',
-    'Application\Service\TypeValidation'                                                                                  => __DIR__ . '/src/Application/Service/TypeValidation.php',
-    'Application\Service\ModificationServiceDu'                                                                           => __DIR__ . '/src/Application/Service/ModificationServiceDu.php',
-    'Application\Service\FormuleService'                                                                                  => __DIR__ . '/src/Application/Service/FormuleService.php',
-    'Application\Service\Departement'                                                                                     => __DIR__ . '/src/Application/Service/Departement.php',
-    'Application\Service\FormuleVolumeHoraireReferentiel'                                                                 => __DIR__ . '/src/Application/Service/FormuleVolumeHoraireReferentiel.php',
-    'Application\Service\IndicateurService'                                                                               => __DIR__ . '/src/Application/Service/IndicateurService.php',
-    'Application\Service\FormuleResultatVolumeHoraireReferentiel'                                                         => __DIR__ . '/src/Application/Service/FormuleResultatVolumeHoraireReferentiel.php',
-    'Application\Service\EtatVolumeHoraire'                                                                               => __DIR__ . '/src/Application/Service/EtatVolumeHoraire.php',
-    'Application\Service\FormuleResultatService'                                                                          => __DIR__ . '/src/Application/Service/FormuleResultatService.php',
-    'Application\Service\TypeContrat'                                                                                     => __DIR__ . '/src/Application/Service/TypeContrat.php',
-    'Application\Service\TypeAgrement'                                                                                    => __DIR__ . '/src/Application/Service/TypeAgrement.php',
-    'Application\Service\ElementPedagogique'                                                                              => __DIR__ . '/src/Application/Service/ElementPedagogique.php',
-    'Application\Service\MiseEnPaiementIntervenantStructure'                                                              => __DIR__ . '/src/Application/Service/MiseEnPaiementIntervenantStructure.php',
-    'Application\Service\Pays'                                                                                            => __DIR__ . '/src/Application/Service/Pays.php',
-    'Application\Service\Context'                                                                                         => __DIR__ . '/src/Application/Service/Context.php',
-    'Application\Service\MotifModificationServiceDu'                                                                      => __DIR__ . '/src/Application/Service/MotifModificationServiceDu.php',
-    'Application\Service\DisciplineService'                                                                               => __DIR__ . '/src/Application/Service/DisciplineService.php',
-    'Application\Service\Annee'                                                                                           => __DIR__ . '/src/Application/Service/Annee.php',
-    'Application\Service\TypeVolumeHoraire'                                                                               => __DIR__ . '/src/Application/Service/TypeVolumeHoraire.php',
-    'Application\Service\Structure'                                                                                       => __DIR__ . '/src/Application/Service/Structure.php',
-    'Application\Service\Perimetre'                                                                                       => __DIR__ . '/src/Application/Service/Perimetre.php',
-    'Application\Service\PieceJointe'                                                                                     => __DIR__ . '/src/Application/Service/PieceJointe.php',
-    'Application\Service\TypeFormation'                                                                                   => __DIR__ . '/src/Application/Service/TypeFormation.php',
-    'Application\Service\Intervenant'                                                                                     => __DIR__ . '/src/Application/Service/Intervenant.php',
-    'Application\Service\MotifNonPaiement'                                                                                => __DIR__ . '/src/Application/Service/MotifNonPaiement.php',
-    'Application\Service\TypeHeures'                                                                                      => __DIR__ . '/src/Application/Service/TypeHeures.php',
-    'Application\Service\FormuleVolumeHoraire'                                                                            => __DIR__ . '/src/Application/Service/FormuleVolumeHoraire.php',
-    'MessageFormatter'                                                                                                    => __DIR__ . '/src/Application/Service/Message/MessageService.php',
-    'Application\Service\FormuleServiceModifie'                                                                           => __DIR__ . '/src/Application/Service/FormuleServiceModifie.php',
-    'Application\Service\CentreCout'                                                                                      => __DIR__ . '/src/Application/Service/CentreCout.php',
-    'Application\Service\Civilite'                                                                                        => __DIR__ . '/src/Application/Service/Civilite.php',
-    'Application\Service\Validation'                                                                                      => __DIR__ . '/src/Application/Service/Validation.php',
-    'Application\Service\Traits\FormuleResultatAwareTrait'                                                                => __DIR__ . '/src/Application/Service/Traits/FormuleResultatAwareTrait.php',
-    'Application\Service\Traits\FormuleVolumeHoraireReferentielAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/FormuleVolumeHoraireReferentielAwareTrait.php',
-    'Application\Service\Traits\ServiceReferentielAwareTrait'                                                             => __DIR__ . '/src/Application/Service/Traits/ServiceReferentielAwareTrait.php',
-    'Application\Service\Traits\ModulateurAwareTrait'                                                                     => __DIR__ . '/src/Application/Service/Traits/ModulateurAwareTrait.php',
-    'Application\Service\Traits\ElementModulateurAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/ElementModulateurAwareTrait.php',
-    'Application\Service\Traits\FormuleServiceReferentielAwareTrait'                                                      => __DIR__ . '/src/Application/Service/Traits/FormuleServiceReferentielAwareTrait.php',
-    'Application\Service\Traits\TypeInterventionAwareTrait'                                                               => __DIR__ . '/src/Application/Service/Traits/TypeInterventionAwareTrait.php',
-    'Application\Service\Traits\MotifModificationServiceDuAwareTrait'                                                     => __DIR__ . '/src/Application/Service/Traits/MotifModificationServiceDuAwareTrait.php',
-    'Application\Service\Traits\ModificationServiceDuAwareTrait'                                                          => __DIR__ . '/src/Application/Service/Traits/ModificationServiceDuAwareTrait.php',
-    'Application\Service\Traits\RoleAwareTrait'                                                                           => __DIR__ . '/src/Application/Service/Traits/RoleAwareTrait.php',
-    'Application\Service\Traits\FormuleResultatVolumeHoraireAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/FormuleResultatVolumeHoraireAwareTrait.php',
-    'Application\Service\Traits\VolumeHoraireReferentielAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/VolumeHoraireReferentielAwareTrait.php',
-    'Application\Service\Traits\ElementPedagogiqueAwareTrait'                                                             => __DIR__ . '/src/Application/Service/Traits/ElementPedagogiqueAwareTrait.php',
-    'Application\Service\Traits\WfEtapeAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/WfEtapeAwareTrait.php',
-    'Application\Service\Traits\MotifNonPaiementAwareTrait'                                                               => __DIR__ . '/src/Application/Service/Traits/MotifNonPaiementAwareTrait.php',
-    'Application\Service\Traits\EtatVolumeHoraireAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/EtatVolumeHoraireAwareTrait.php',
-    'Application\Service\Traits\IndicateurServiceAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/IndicateurServiceAwareTrait.php',
-    'Application\Service\Traits\EtablissementAwareTrait'                                                                  => __DIR__ . '/src/Application/Service/Traits/EtablissementAwareTrait.php',
-    'Application\Service\Traits\StructureAwareTrait'                                                                      => __DIR__ . '/src/Application/Service/Traits/StructureAwareTrait.php',
-    'Application\Service\Traits\FormuleVolumeHoraireAwareTrait'                                                           => __DIR__ . '/src/Application/Service/Traits/FormuleVolumeHoraireAwareTrait.php',
-    'Application\Service\Traits\TypeContratAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/TypeContratAwareTrait.php',
-    'Application\Service\Traits\TypeValidationAwareTrait'                                                                 => __DIR__ . '/src/Application/Service/Traits/TypeValidationAwareTrait.php',
-    'Application\Service\Traits\TypeAgrementStatutAwareTrait'                                                             => __DIR__ . '/src/Application/Service/Traits/TypeAgrementStatutAwareTrait.php',
-    'Application\Service\Traits\TypePieceJointeAwareTrait'                                                                => __DIR__ . '/src/Application/Service/Traits/TypePieceJointeAwareTrait.php',
-    'Application\Service\Traits\FormuleServiceModifieAwareTrait'                                                          => __DIR__ . '/src/Application/Service/Traits/FormuleServiceModifieAwareTrait.php',
-    'Application\Service\Traits\VolumeHoraireAwareTrait'                                                                  => __DIR__ . '/src/Application/Service/Traits/VolumeHoraireAwareTrait.php',
-    'Application\Service\Traits\FonctionReferentielAwareTrait'                                                            => __DIR__ . '/src/Application/Service/Traits/FonctionReferentielAwareTrait.php',
-    'Application\Service\Traits\PieceJointeAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/PieceJointeAwareTrait.php',
-    'Application\Service\Traits\NotificationIndicateurAwareTrait'                                                         => __DIR__ . '/src/Application/Service/Traits/NotificationIndicateurAwareTrait.php',
-    'Application\Service\Traits\ParametresAwareTrait'                                                                     => __DIR__ . '/src/Application/Service/Traits/ParametresAwareTrait.php',
-    'Application\Service\Traits\SourceAwareTrait'                                                                         => __DIR__ . '/src/Application/Service/Traits/SourceAwareTrait.php',
-    'Application\Service\Traits\GroupeTypeFormationAwareTrait'                                                            => __DIR__ . '/src/Application/Service/Traits/GroupeTypeFormationAwareTrait.php',
-    'Application\Service\Traits\ServiceAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/ServiceAwareTrait.php',
-    'Application\Service\Traits\TypeModulateurAwareTrait'                                                                 => __DIR__ . '/src/Application/Service/Traits/TypeModulateurAwareTrait.php',
-    'Application\Service\Traits\MiseEnPaiementIntervenantStructureAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/MiseEnPaiementIntervenantStructureAwareTrait.php',
-    'Application\Service\Traits\ValidationAwareTrait'                                                                     => __DIR__ . '/src/Application/Service/Traits/ValidationAwareTrait.php',
-    'Application\Service\Traits\TypePieceJointeStatutAwareTrait'                                                          => __DIR__ . '/src/Application/Service/Traits/TypePieceJointeStatutAwareTrait.php',
-    'Application\Service\Traits\CheminPedagogiqueAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/CheminPedagogiqueAwareTrait.php',
-    'Application\Service\Traits\TypeHeuresAwareTrait'                                                                     => __DIR__ . '/src/Application/Service/Traits/TypeHeuresAwareTrait.php',
-    'Application\Service\Traits\ServiceServiceAwareTrait'                                                                 => __DIR__ . '/src/Application/Service/Traits/ServiceServiceAwareTrait.php',
-    'Application\Service\Traits\PaysAwareTrait'                                                                           => __DIR__ . '/src/Application/Service/Traits/PaysAwareTrait.php',
-    'Application\Service\Traits\DisciplineServiceAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/DisciplineServiceAwareTrait.php',
-    'Application\Service\Traits\FormuleServiceAwareTrait'                                                                 => __DIR__ . '/src/Application/Service/Traits/FormuleServiceAwareTrait.php',
-    'Application\Service\Traits\AgrementAwareTrait'                                                                       => __DIR__ . '/src/Application/Service/Traits/AgrementAwareTrait.php',
-    'Application\Service\Traits\DepartementAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/DepartementAwareTrait.php',
-    'Application\Service\Traits\TypeStructureAwareTrait'                                                                  => __DIR__ . '/src/Application/Service/Traits/TypeStructureAwareTrait.php',
-    'Application\Service\Traits\FormuleResultatServiceAwareTrait'                                                         => __DIR__ . '/src/Application/Service/Traits/FormuleResultatServiceAwareTrait.php',
-    'Application\Service\Traits\ContratAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/ContratAwareTrait.php',
-    'Application\Service\Traits\DossierAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/DossierAwareTrait.php',
-    'Application\Service\Traits\CentreCoutAwareTrait'                                                                     => __DIR__ . '/src/Application/Service/Traits/CentreCoutAwareTrait.php',
-    'Application\Service\Traits\ContextAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/ContextAwareTrait.php',
-    'Application\Service\Traits\PerimetreAwareTrait'                                                                      => __DIR__ . '/src/Application/Service/Traits/PerimetreAwareTrait.php',
-    'Application\Service\Traits\MiseEnPaiementAwareTrait'                                                                 => __DIR__ . '/src/Application/Service/Traits/MiseEnPaiementAwareTrait.php',
-    'Application\Service\Traits\PeriodeAwareTrait'                                                                        => __DIR__ . '/src/Application/Service/Traits/PeriodeAwareTrait.php',
-    'Application\Service\Traits\IntervenantAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/IntervenantAwareTrait.php',
-    'Application\Service\Traits\NiveauEtapeAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/NiveauEtapeAwareTrait.php',
-    'Application\Service\Traits\ServiceAPayerAwareTrait'                                                                  => __DIR__ . '/src/Application/Service/Traits/ServiceAPayerAwareTrait.php',
-    'Application\Service\Traits\LocalContextAwareTrait'                                                                   => __DIR__ . '/src/Application/Service/Traits/LocalContextAwareTrait.php',
-    'Application\Service\Traits\FormuleResultatVolumeHoraireReferentielAwareTrait'                                        => __DIR__ . '/src/Application/Service/Traits/FormuleResultatVolumeHoraireReferentielAwareTrait.php',
-    'Application\Service\Traits\DomaineFonctionnelAwareTrait'                                                             => __DIR__ . '/src/Application/Service/Traits/DomaineFonctionnelAwareTrait.php',
-    'Application\Service\Traits\EtapeAwareTrait'                                                                          => __DIR__ . '/src/Application/Service/Traits/EtapeAwareTrait.php',
-    'Application\Service\Traits\NiveauFormationAwareTrait'                                                                => __DIR__ . '/src/Application/Service/Traits/NiveauFormationAwareTrait.php',
-    'Application\Service\Traits\AffectationAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/AffectationAwareTrait.php',
-    'Application\Service\Traits\AnneeAwareTrait'                                                                          => __DIR__ . '/src/Application/Service/Traits/AnneeAwareTrait.php',
-    'Application\Service\Traits\TypeFormationAwareTrait'                                                                  => __DIR__ . '/src/Application/Service/Traits/TypeFormationAwareTrait.php',
-    'Application\Service\Traits\FormuleIntervenantAwareTrait'                                                             => __DIR__ . '/src/Application/Service/Traits/FormuleIntervenantAwareTrait.php',
-    'Application\Service\Traits\TypeIntervenantAwareTrait'                                                                => __DIR__ . '/src/Application/Service/Traits/TypeIntervenantAwareTrait.php',
-    'Application\Service\Traits\FormuleResultatServiceReferentielAwareTrait'                                              => __DIR__ . '/src/Application/Service/Traits/FormuleResultatServiceReferentielAwareTrait.php',
-    'Application\Service\Traits\PrivilegeAwareTrait'                                                                      => __DIR__ . '/src/Application/Service/Traits/PrivilegeAwareTrait.php',
-    'Application\Service\Traits\PersonnelAwareTrait'                                                                      => __DIR__ . '/src/Application/Service/Traits/PersonnelAwareTrait.php',
-    'Application\Service\Traits\CiviliteAwareTrait'                                                                       => __DIR__ . '/src/Application/Service/Traits/CiviliteAwareTrait.php',
-    'Application\Service\Traits\StatutIntervenantAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/StatutIntervenantAwareTrait.php',
-    'Application\Service\Traits\CentreCoutEpAwareTrait'                                                                   => __DIR__ . '/src/Application/Service/Traits/CentreCoutEpAwareTrait.php',
-    'Application\Service\Traits\TypeVolumeHoraireAwareTrait'                                                              => __DIR__ . '/src/Application/Service/Traits/TypeVolumeHoraireAwareTrait.php',
-    'Application\Service\Traits\UtilisateurAwareTrait'                                                                    => __DIR__ . '/src/Application/Service/Traits/UtilisateurAwareTrait.php',
-    'Application\Service\Traits\TypeAgrementAwareTrait'                                                                   => __DIR__ . '/src/Application/Service/Traits/TypeAgrementAwareTrait.php',
-    'Application\Service\NotificationIndicateur'                                                                          => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'NotificationIndicateurQueryBuilder'                                                                                  => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWherePersonnelIs'                                                                                                 => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWhereStructurelIs'                                                                                                => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWhereNotificationNecessaire'                                                                                      => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWhereIndicateurIs'                                                                                                => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWhereIndicateurEnabled'                                                                                           => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'AndWhereExpr'                                                                                                        => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
-    'Application\Service\Affectation'                                                                                     => __DIR__ . '/src/Application/Service/Affectation.php',
-    'Application\Service\StatutIntervenant'                                                                               => __DIR__ . '/src/Application/Service/StatutIntervenant.php',
-    'Application\Service\GroupeTypeFormation'                                                                             => __DIR__ . '/src/Application/Service/GroupeTypeFormation.php',
-    'Application\Service\Contrat'                                                                                         => __DIR__ . '/src/Application/Service/Contrat.php',
-    'Application\Service\TypeStructure'                                                                                   => __DIR__ . '/src/Application/Service/TypeStructure.php',
-    'Application\Service\MiseEnPaiement'                                                                                  => __DIR__ . '/src/Application/Service/MiseEnPaiement.php',
-    'Application\Service\Utilisateur'                                                                                     => __DIR__ . '/src/Application/Service/Utilisateur.php',
-    'Application\Service\Etape'                                                                                           => __DIR__ . '/src/Application/Service/Etape.php',
-    'Application\Service\Role'                                                                                            => __DIR__ . '/src/Application/Service/Role.php',
-    'Application\Service\ServiceService'                                                                                  => __DIR__ . '/src/Application/Service/ServiceService.php',
-    'Application\Service\PrivilegeService'                                                                                => __DIR__ . '/src/Application/Service/PrivilegeService.php',
-    'Application\Service\VolumeHoraireReferentiel'                                                                        => __DIR__ . '/src/Application/Service/VolumeHoraireReferentiel.php',
-    'Application\Service\Parametres'                                                                                      => __DIR__ . '/src/Application/Service/Parametres.php',
-    'Application\Service\FormuleResultatVolumeHoraire'                                                                    => __DIR__ . '/src/Application/Service/FormuleResultatVolumeHoraire.php',
-    'Application\Service\CentreCoutEp'                                                                                    => __DIR__ . '/src/Application/Service/CentreCoutEp.php',
-    'Application\Service\ServiceAPayer'                                                                                   => __DIR__ . '/src/Application/Service/ServiceAPayer.php',
-    'Application\Service\Periode'                                                                                         => __DIR__ . '/src/Application/Service/Periode.php',
-    'Application\Service\NiveauFormation'                                                                                 => __DIR__ . '/src/Application/Service/NiveauFormation.php',
-    'Application\Service\NavigationFactoryFactory'                                                                        => __DIR__ . '/src/Application/Service/NavigationFactoryFactory.php',
-    'Application\Service\FormuleResultat'                                                                                 => __DIR__ . '/src/Application/Service/FormuleResultat.php',
-    'Application\Service\Etablissement'                                                                                   => __DIR__ . '/src/Application/Service/Etablissement.php',
-    'Application\Service\DomaineFonctionnel'                                                                              => __DIR__ . '/src/Application/Service/DomaineFonctionnel.php',
-    'Application\Service\Dossier'                                                                                         => __DIR__ . '/src/Application/Service/Dossier.php',
-    'Application\Service\AbstractEntityService'                                                                           => __DIR__ . '/src/Application/Service/AbstractEntityService.php',
-    'Application\Service\TypePieceJointe'                                                                                 => __DIR__ . '/src/Application/Service/TypePieceJointe.php',
-    'Application\Service\TypeIntervention'                                                                                => __DIR__ . '/src/Application/Service/TypeIntervention.php',
-    'Application\Service\TypeIntervenant'                                                                                 => __DIR__ . '/src/Application/Service/TypeIntervenant.php',
-    'Application\Service\FormuleResultatServiceReferentiel'                                                               => __DIR__ . '/src/Application/Service/FormuleResultatServiceReferentiel.php',
-    'Application\Service\AbstractService'                                                                                 => __DIR__ . '/src/Application/Service/AbstractService.php',
-    'Application\Service\Indicateur\Contrat\AgrementCAMaisPasContratIndicateurImpl'                                       => __DIR__ . '/src/Application/Service/Indicateur/Contrat/AgrementCAMaisPasContratIndicateurImpl.php',
-    'Application\Service\Indicateur\Contrat\AttenteRetourContratIndicateurImpl'                                           => __DIR__ . '/src/Application/Service/Indicateur/Contrat/AttenteRetourContratIndicateurImpl.php',
-    'Application\Service\Indicateur\Contrat\ContratAvenantDeposesIndicateurImpl'                                          => __DIR__ . '/src/Application/Service/Indicateur/Contrat/ContratAvenantDeposesIndicateurImpl.php',
-    'Application\Service\Indicateur\Contrat\AttenteAvenantIndicateurImpl'                                                 => __DIR__ . '/src/Application/Service/Indicateur/Contrat/AttenteAvenantIndicateurImpl.php',
-    'Application\Service\Indicateur\Contrat\SaisieServiceApresContratAvenantIndicateurImpl'                               => __DIR__ . '/src/Application/Service/Indicateur/Contrat/SaisieServiceApresContratAvenantIndicateurImpl.php',
-    'Application\Service\Indicateur\Contrat\AttenteContratIndicateurImpl'                                                 => __DIR__ . '/src/Application/Service/Indicateur/Contrat/AttenteContratIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\EnsRealisePermSaisieNonClotureeIndicateurImpl'                                => __DIR__ . '/src/Application/Service/Indicateur/Service/EnsRealisePermSaisieNonClotureeIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\Prevu\AttenteValidationPermIndicateurImpl'             => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\Prevu\AttenteValidationAbstractIndicateurImpl'         => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\Realise\AttenteValidationPermIndicateurImpl'           => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\Realise\AttenteValidationPermAutreCompIndicateurImpl'  => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermAutreCompIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\Realise\AttenteValidationAbstractIndicateurImpl'       => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Referentiel\AttenteValidationAbstractIndicateurImpl'               => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Referentiel/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Prevu\AttenteValidationPermIndicateurImpl'            => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Prevu\AttenteValidationVacIndicateurImpl'             => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationVacIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Prevu\AttenteValidationAbstractIndicateurImpl'        => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationPermIndicateurImpl'          => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationVacIndicateurImpl'           => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationVacIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationPermAutreCompIndicateurImpl' => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermAutreCompIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationAbstractIndicateurImpl'      => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Validation\Enseignement\AttenteValidationAbstractIndicateurImpl'              => __DIR__ . '/src/Application/Service/Indicateur/Service/Validation/Enseignement/AttenteValidationAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Affectation\PermAffectMemeIntervAutreIndicateurImpl'                          => __DIR__ . '/src/Application/Service/Indicateur/Service/Affectation/PermAffectMemeIntervAutreIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Affectation\BiatssAffectMemeIntervAutreIndicateurImpl'                        => __DIR__ . '/src/Application/Service/Indicateur/Service/Affectation/BiatssAffectMemeIntervAutreIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Affectation\IntervAffectMemeIntervAutreAbstractIndicateurImpl'                => __DIR__ . '/src/Application/Service/Indicateur/Service/Affectation/IntervAffectMemeIntervAutreAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Affectation\IntervAffectAutreIntervMemeAbstractIndicateurImpl'                => __DIR__ . '/src/Application/Service/Indicateur/Service/Affectation/IntervAffectAutreIntervMemeAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Affectation\PermAffectAutreIntervMemeIndicateurImpl'                          => __DIR__ . '/src/Application/Service/Indicateur/Service/Affectation/PermAffectAutreIntervMemeIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\EnsHistoIndicateurImpl'                                                       => __DIR__ . '/src/Application/Service/Indicateur/Service/EnsHistoIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl'                     => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondRefRealiseDepasseIndicateurImpl'                               => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondRefRealiseDepasseIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondRefDepasseAbstractIndicateurImpl'                              => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondRefDepasseAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl'                        => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl'                      => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl.php',
-    'Application\Service\Indicateur\Service\Plafond\PlafondRefPrevuDepasseIndicateurImpl'                                 => __DIR__ . '/src/Application/Service/Indicateur/Service/Plafond/PlafondRefPrevuDepasseIndicateurImpl.php',
-    'Application\Service\Indicateur\Dossier\DonneesPersoModifIndicateurImpl'                                              => __DIR__ . '/src/Application/Service/Indicateur/Dossier/DonneesPersoModifIndicateurImpl.php',
-    'Application\Service\Indicateur\Dossier\DonneesPersoDiffImportIndicateurImpl'                                         => __DIR__ . '/src/Application/Service/Indicateur/Dossier/DonneesPersoDiffImportIndicateurImpl.php',
-    'Application\Service\Indicateur\Dossier\AttenteValidationDonneesPersoIndicateurImpl'                                  => __DIR__ . '/src/Application/Service/Indicateur/Dossier/AttenteValidationDonneesPersoIndicateurImpl.php',
-    'Application\Service\Indicateur\Agrement\AttenteAgrementAbstractIndicateurImpl'                                       => __DIR__ . '/src/Application/Service/Indicateur/Agrement/AttenteAgrementAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Agrement\AttenteAgrementCRIndicateurImpl'                                             => __DIR__ . '/src/Application/Service/Indicateur/Agrement/AttenteAgrementCRIndicateurImpl.php',
-    'Application\Service\Indicateur\Agrement\AttenteAgrementCAIndicateurImpl'                                             => __DIR__ . '/src/Application/Service/Indicateur/Agrement/AttenteAgrementCAIndicateurImpl.php',
-    'Application\Service\Indicateur\PieceJointe\AttentePieceJustifIndicateurImpl'                                         => __DIR__ . '/src/Application/Service/Indicateur/PieceJointe/AttentePieceJustifIndicateurImpl.php',
-    'Application\Service\Indicateur\PieceJointe\AttenteValidationPieceJustifIndicateurImpl'                               => __DIR__ . '/src/Application/Service/Indicateur/PieceJointe/AttenteValidationPieceJustifIndicateurImpl.php',
-    'Application\Service\Indicateur\DateAwareIndicateurImplInterface'                                                     => __DIR__ . '/src/Application/Service/Indicateur/DateAwareIndicateurImplInterface.php',
-    'Application\Service\Indicateur\Paiement\AttenteMepPermIndicateurImpl'                                                => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteMepPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Paiement\AttenteMepAbstractIndicateurImpl'                                            => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteMepAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\Paiement\AttenteDemandeMepVacIndicateurImpl'                                          => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepVacIndicateurImpl.php',
-    'Application\Service\Indicateur\Paiement\AttenteMepVacIndicateurImpl'                                                 => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteMepVacIndicateurImpl.php',
-    'Application\Service\Indicateur\Paiement\AttenteDemandeMepPermIndicateurImpl'                                         => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepPermIndicateurImpl.php',
-    'Application\Service\Indicateur\Paiement\AttenteDemandeMepAbstractIndicateurImpl'                                     => __DIR__ . '/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepAbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\AbstractIndicateurImpl'                                                               => __DIR__ . '/src/Application/Service/Indicateur/AbstractIndicateurImpl.php',
-    'Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl'                                              => __DIR__ . '/src/Application/Service/Indicateur/AbstractIntervenantResultIndicateurImpl.php',
-    'Application\Service\Indicateur\IndicateurImplInterface'                                                              => __DIR__ . '/src/Application/Service/Indicateur/IndicateurImplInterface.php',
-    'Application\Service\TypeAgrementStatut'                                                                              => __DIR__ . '/src/Application/Service/TypeAgrementStatut.php',
-    'Application\Service\FonctionReferentiel'                                                                             => __DIR__ . '/src/Application/Service/FonctionReferentiel.php',
-    'Application\Service\Agrement'                                                                                        => __DIR__ . '/src/Application/Service/Agrement.php',
-    'Application\Service\Personnel'                                                                                       => __DIR__ . '/src/Application/Service/Personnel.php',
-    'Application\Service\ElementModulateur'                                                                               => __DIR__ . '/src/Application/Service/ElementModulateur.php',
-    'Application\Service\Source'                                                                                          => __DIR__ . '/src/Application/Service/Source.php',
-    'Application\Service\FormuleIntervenant'                                                                              => __DIR__ . '/src/Application/Service/FormuleIntervenant.php',
-    'Application\Service\WfEtape'                                                                                         => __DIR__ . '/src/Application/Service/WfEtape.php',
-    'Application\Service\TypePieceJointeStatut'                                                                           => __DIR__ . '/src/Application/Service/TypePieceJointeStatut.php',
-    'Application\Service\FormuleServiceReferentiel'                                                                       => __DIR__ . '/src/Application/Service/FormuleServiceReferentiel.php',
-    'Application\Service\LocalContext'                                                                                    => __DIR__ . '/src/Application/Service/LocalContext.php',
-    'Application\Service\VolumeHoraire'                                                                                   => __DIR__ . '/src/Application/Service/VolumeHoraire.php',
-    'Application\Service\NiveauEtape'                                                                                     => __DIR__ . '/src/Application/Service/NiveauEtape.php',
-    'Application\Traits\RoleAwareTrait'                                                                                   => __DIR__ . '/src/Application/Traits/RoleAwareTrait.php',
-    'Application\Traits\ObligatoireSelonSeuilHeuresAwareTrait'                                                            => __DIR__ . '/src/Application/Traits/ObligatoireSelonSeuilHeuresAwareTrait.php',
-    'Application\Traits\NiveauEtapeAwareTrait'                                                                            => __DIR__ . '/src/Application/Traits/NiveauEtapeAwareTrait.php',
-    'Application\Traits\ServiceAPayerAwareTrait'                                                                          => __DIR__ . '/src/Application/Traits/ServiceAPayerAwareTrait.php',
-    'Application\Assertion\ModificationServiceDuAssertion'                                                                => __DIR__ . '/src/Application/Assertion/ModificationServiceDuAssertion.php',
-    'Application\Assertion\IntervenantAssertion'                                                                          => __DIR__ . '/src/Application/Assertion/IntervenantAssertion.php',
-    'Application\Assertion\ContratAssertion'                                                                              => __DIR__ . '/src/Application/Assertion/ContratAssertion.php',
-    'Application\Assertion\OffreDeFormationAssertion'                                                                     => __DIR__ . '/src/Application/Assertion/OffreDeFormationAssertion.php',
-    'Application\Assertion\ValidationServiceAssertion'                                                                    => __DIR__ . '/src/Application/Assertion/ValidationServiceAssertion.php',
-    'Application\Assertion\ValidationDossierAssertion'                                                                    => __DIR__ . '/src/Application/Assertion/ValidationDossierAssertion.php',
-    'Application\Assertion\ValidationEnsRefAbstractAssertion'                                                             => __DIR__ . '/src/Application/Assertion/ValidationEnsRefAbstractAssertion.php',
-    'Application\Assertion\MiseEnPaiementAssertion'                                                                       => __DIR__ . '/src/Application/Assertion/MiseEnPaiementAssertion.php',
-    'Application\Assertion\OldAbstractAssertion'                                                                          => __DIR__ . '/src/Application/Assertion/OldAbstractAssertion.php',
-    'Application\Assertion\ValidationReferentielAssertion'                                                                => __DIR__ . '/src/Application/Assertion/ValidationReferentielAssertion.php',
-    'Application\Exception\DbException'                                                                                   => __DIR__ . '/src/Application/Exception/DbException.php',
-    'Application\Acl\Role'                                                                                                => __DIR__ . '/src/Application/Acl/Role.php',
-    'Application\View\Helper\Intervenant\IntervenantViewHelper'                                                           => __DIR__ . '/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php',
-    'Application\View\Helper\Intervenant\TotauxHetdViewHelper'                                                            => __DIR__ . '/src/Application/View/Helper/Intervenant/TotauxHetdViewHelper.php',
-    'Application\View\Helper\UserProfileSelectRadioItem'                                                                  => __DIR__ . '/src/Application/View/Helper/UserProfileSelectRadioItem.php',
-    'Application\View\Helper\ValidationViewHelper'                                                                        => __DIR__ . '/src/Application/View/Helper/ValidationViewHelper.php',
-    'Application\View\Helper\Service\Liste'                                                                               => __DIR__ . '/src/Application/View/Helper/Service/Liste.php',
-    'Application\View\Helper\Service\Resume'                                                                              => __DIR__ . '/src/Application/View/Helper/Service/Resume.php',
-    'Application\View\Helper\Service\SaisieForm'                                                                          => __DIR__ . '/src/Application/View/Helper/Service/SaisieForm.php',
-    'Application\View\Helper\Service\Ligne'                                                                               => __DIR__ . '/src/Application/View/Helper/Service/Ligne.php',
-    'Application\View\Helper\Service\ListeFactory'                                                                        => __DIR__ . '/src/Application/View/Helper/Service/ListeFactory.php',
-    'Application\View\Helper\Service\LigneFactory'                                                                        => __DIR__ . '/src/Application/View/Helper/Service/LigneFactory.php',
-    'Application\View\Helper\OffreFormation\FieldsetElementPedagogiqueRecherche'                                          => __DIR__ . '/src/Application/View/Helper/OffreFormation/FieldsetElementPedagogiqueRecherche.php',
-    'Application\View\Helper\OffreFormation\EtapeModulateursSaisieForm'                                                   => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeModulateursSaisieForm.php',
-    'Application\View\Helper\OffreFormation\EtapeViewHelper'                                                              => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeViewHelper.php',
-    'Application\View\Helper\OffreFormation\ElementPedagogiqueViewHelper'                                                 => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementPedagogiqueViewHelper.php',
-    'Application\View\Helper\OffreFormation\ElementCentreCoutFieldsetViewHelper'                                          => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementCentreCoutFieldsetViewHelper.php',
-    'Application\View\Helper\OffreFormation\EtapeCentreCoutFormViewHelper'                                                => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeCentreCoutFormViewHelper.php',
-    'Application\View\Helper\OffreFormation\ElementModulateursSaisieFieldset'                                             => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementModulateursSaisieFieldset.php',
-    'Application\View\Helper\EtablissementViewHelper'                                                                     => __DIR__ . '/src/Application/View/Helper/EtablissementViewHelper.php',
-    'Application\View\Helper\VolumeHoraire\Liste'                                                                         => __DIR__ . '/src/Application/View/Helper/VolumeHoraire/Liste.php',
-    'Application\View\Helper\AgrementViewHelper'                                                                          => __DIR__ . '/src/Application/View/Helper/AgrementViewHelper.php',
-    'Application\View\Helper\UserProfileSelectRadioItemFactory'                                                           => __DIR__ . '/src/Application/View/Helper/UserProfileSelectRadioItemFactory.php',
-    'Application\View\Helper\AppLinkFactory'                                                                              => __DIR__ . '/src/Application/View/Helper/AppLinkFactory.php',
-    'Application\View\Helper\Paiement\DemandeMiseEnPaiementViewHelper'                                                    => __DIR__ . '/src/Application/View/Helper/Paiement/DemandeMiseEnPaiementViewHelper.php',
-    'Application\View\Helper\Paiement\TypeHeuresViewHelper'                                                               => __DIR__ . '/src/Application/View/Helper/Paiement/TypeHeuresViewHelper.php',
-    'Application\View\Helper\UtilisateurViewHelper'                                                                       => __DIR__ . '/src/Application/View/Helper/UtilisateurViewHelper.php',
-    'Application\View\Helper\ServiceReferentiel\Liste'                                                                    => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/Liste.php',
-    'Application\View\Helper\ServiceReferentiel\FormSaisie'                                                               => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/FormSaisie.php',
-    'Application\View\Helper\ServiceReferentiel\Ligne'                                                                    => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/Ligne.php',
-    'Application\View\Helper\ServiceReferentiel\ListeFactory'                                                             => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/ListeFactory.php',
-    'Application\View\Helper\ServiceReferentiel\FonctionReferentielViewHelper'                                            => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/FonctionReferentielViewHelper.php',
-    'Application\View\Helper\ServiceReferentiel\LigneFactory'                                                             => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/LigneFactory.php',
-    'Application\View\Helper\StructureViewHelper'                                                                         => __DIR__ . '/src/Application/View/Helper/StructureViewHelper.php',
-    'Application\View\Helper\VolumeHoraireReferentiel\Liste'                                                              => __DIR__ . '/src/Application/View/Helper/VolumeHoraireReferentiel/Liste.php',
-    'Application\View\Helper\AppLink'                                                                                     => __DIR__ . '/src/Application/View/Helper/AppLink.php',
-    'Application\Controller\NotificationController'                                                                       => __DIR__ . '/src/Application/Controller/NotificationController.php',
-    'IndicateurIntervenantsMailer'                                                                                        => __DIR__ . '/src/Application/Controller/NotificationController.php',
-    'Application\Controller\GestionController'                                                                            => __DIR__ . '/src/Application/Controller/GestionController.php',
-    'Application\Controller\EtablissementController'                                                                      => __DIR__ . '/src/Application/Controller/EtablissementController.php',
-    'Application\Controller\PaiementController'                                                                           => __DIR__ . '/src/Application/Controller/PaiementController.php',
-    'Application\Controller\OffreFormationController'                                                                     => __DIR__ . '/src/Application/Controller/OffreFormationController.php',
-    'Application\Controller\IndexController'                                                                              => __DIR__ . '/src/Application/Controller/IndexController.php',
-    'Application\Controller\StructureController'                                                                          => __DIR__ . '/src/Application/Controller/StructureController.php',
-    'Application\Controller\ModificationServiceDuController'                                                              => __DIR__ . '/src/Application/Controller/ModificationServiceDuController.php',
-    'Application\Controller\OffreFormation\ModulateurController'                                                          => __DIR__ . '/src/Application/Controller/OffreFormation/ModulateurController.php',
-    'Application\Controller\OffreFormation\EtapeController'                                                               => __DIR__ . '/src/Application/Controller/OffreFormation/EtapeController.php',
-    'Application\Controller\OffreFormation\ElementPedagogiqueController'                                                  => __DIR__ . '/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php',
-    'Application\Controller\OffreFormation\EtapeCentreCoutController'                                                     => __DIR__ . '/src/Application/Controller/OffreFormation/EtapeCentreCoutController.php',
-    'Application\Controller\RechercheController'                                                                          => __DIR__ . '/src/Application/Controller/RechercheController.php',
-    'Application\Controller\ServiceReferentielController'                                                                 => __DIR__ . '/src/Application/Controller/ServiceReferentielController.php',
-    'Application\Controller\VolumeHoraireReferentielController'                                                           => __DIR__ . '/src/Application/Controller/VolumeHoraireReferentielController.php',
-    'Application\Controller\DroitsController'                                                                             => __DIR__ . '/src/Application/Controller/DroitsController.php',
-    'Application\Controller\DossierController'                                                                            => __DIR__ . '/src/Application/Controller/DossierController.php',
-    'Application\Controller\ServiceController'                                                                            => __DIR__ . '/src/Application/Controller/ServiceController.php',
-    'Application\Controller\AgrementController'                                                                           => __DIR__ . '/src/Application/Controller/AgrementController.php',
-    'Application\Controller\IntervenantController'                                                                        => __DIR__ . '/src/Application/Controller/IntervenantController.php',
-    'Application\Controller\PieceJointeController'                                                                        => __DIR__ . '/src/Application/Controller/PieceJointeController.php',
-    'Application\Controller\UtilisateurController'                                                                        => __DIR__ . '/src/Application/Controller/UtilisateurController.php',
-    'Application\Controller\VolumeHoraireController'                                                                      => __DIR__ . '/src/Application/Controller/VolumeHoraireController.php',
-    'Application\Controller\ContratController'                                                                            => __DIR__ . '/src/Application/Controller/ContratController.php',
-    'Application\Controller\Plugin\Context'                                                                               => __DIR__ . '/src/Application/Controller/Plugin/Context.php',
-    'Application\Controller\Plugin\MailWithLogPluginFactory'                                                              => __DIR__ . '/src/Application/Controller/Plugin/MailWithLogPluginFactory.php',
-    'Application\Controller\Plugin\MailWithLogPlugin'                                                                     => __DIR__ . '/src/Application/Controller/Plugin/MailWithLogPlugin.php',
-    'Application\Controller\Plugin\Em'                                                                                    => __DIR__ . '/src/Application/Controller/Plugin/Em.php',
-    'Application\Controller\DisciplineController'                                                                         => __DIR__ . '/src/Application/Controller/DisciplineController.php',
-    'Application\Controller\WorkflowController'                                                                           => __DIR__ . '/src/Application/Controller/WorkflowController.php',
-    'Application\Controller\IndicateurController'                                                                         => __DIR__ . '/src/Application/Controller/IndicateurController.php',
-    'Application\Util'                                                                                                    => __DIR__ . '/src/Application/Util.php',
-    'Application\Provider\Role\RoleProvider'                                                                              => __DIR__ . '/src/Application/Provider/Role/RoleProvider.php',
-    'Application\Provider\Role\RoleProviderFactory'                                                                       => __DIR__ . '/src/Application/Provider/Role/RoleProviderFactory.php',
-    'Application\Provider\Privilege\Privileges'                                                                           => __DIR__ . '/src/Application/Provider/Privilege/Privileges.php',
-    'Application\Provider\Identity\IdentityProviderFactory'                                                               => __DIR__ . '/src/Application/Provider/Identity/IdentityProviderFactory.php',
-    'Application\Provider\Identity\IdentityProvider'                                                                      => __DIR__ . '/src/Application/Provider/Identity/IdentityProvider.php',
-    'Application\Form\Interfaces\DisciplineFormAwareInterface'                                                            => __DIR__ . '/src/Application/Form/Interfaces/DisciplineFormAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\ModificationServiceDuFieldsetAwareInterface'                                 => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/ModificationServiceDuFieldsetAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\EditionFormAwareInterface'                                                   => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/EditionFormAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\ModificationServiceDuFormAwareInterface'                                     => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/ModificationServiceDuFormAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\HeuresCompFormAwareInterface'                                                => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/HeuresCompFormAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\DossierAwareInterface'                                                       => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/DossierAwareInterface.php',
-    'Application\Form\Intervenant\Interfaces\MotifModificationServiceDuFieldsetAwareInterface'                            => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/MotifModificationServiceDuFieldsetAwareInterface.php',
-    'Application\Form\Intervenant\HeuresCompForm'                                                                         => __DIR__ . '/src/Application/Form/Intervenant/HeuresCompForm.php',
-    'Application\Form\Intervenant\ContratValidation'                                                                      => __DIR__ . '/src/Application/Form/Intervenant/ContratValidation.php',
-    'Application\Form\Intervenant\DossierHydrator'                                                                        => __DIR__ . '/src/Application/Form/Intervenant/DossierHydrator.php',
-    'Application\Form\Intervenant\DossierFieldsetHydrator'                                                                => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldsetHydrator.php',
-    'Application\Form\Intervenant\Traits\ModificationServiceDuFormAwareTrait'                                             => __DIR__ . '/src/Application/Form/Intervenant/Traits/ModificationServiceDuFormAwareTrait.php',
-    'Application\Form\Intervenant\Traits\MotifModificationServiceDuFieldsetAwareTrait'                                    => __DIR__ . '/src/Application/Form/Intervenant/Traits/MotifModificationServiceDuFieldsetAwareTrait.php',
-    'Application\Form\Intervenant\Traits\HeuresCompFormAwareTrait'                                                        => __DIR__ . '/src/Application/Form/Intervenant/Traits/HeuresCompFormAwareTrait.php',
-    'Application\Form\Intervenant\Traits\DossierAwareTrait'                                                               => __DIR__ . '/src/Application/Form/Intervenant/Traits/DossierAwareTrait.php',
-    'Application\Form\Intervenant\Traits\ModificationServiceDuFieldsetAwareTrait'                                         => __DIR__ . '/src/Application/Form/Intervenant/Traits/ModificationServiceDuFieldsetAwareTrait.php',
-    'Application\Form\Intervenant\Traits\EditionFormAwareTrait'                                                           => __DIR__ . '/src/Application/Form/Intervenant/Traits/EditionFormAwareTrait.php',
-    'Application\Form\Intervenant\DossierFieldset'                                                                        => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
-    'PaysSelect'                                                                                                          => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
-    'PaysProxy'                                                                                                           => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
-    'StatutSelect'                                                                                                        => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
-    'StatutIntervenantProxy'                                                                                              => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
-    'Application\Form\Intervenant\ModificationServiceDuFieldset'                                                          => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuFieldset.php',
-    'ModificationServiceDuFieldsetHydrator'                                                                               => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuFieldset.php',
-    'Application\Form\Intervenant\DossierFieldsetDoctrineHydrator'                                                        => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldsetDoctrineHydrator.php',
-    'Application\Form\Intervenant\Dossier'                                                                                => __DIR__ . '/src/Application/Form/Intervenant/Dossier.php',
-    'Application\Form\Intervenant\MotifModificationServiceDuFieldset'                                                     => __DIR__ . '/src/Application/Form/Intervenant/MotifModificationServiceDuFieldset.php',
-    'MotifModificationServiceDuHydrator'                                                                                  => __DIR__ . '/src/Application/Form/Intervenant/MotifModificationServiceDuFieldset.php',
-    'Application\Form\Intervenant\ContratRetour'                                                                          => __DIR__ . '/src/Application/Form/Intervenant/ContratRetour.php',
-    'Application\Form\Intervenant\EditionForm'                                                                            => __DIR__ . '/src/Application/Form/Intervenant/EditionForm.php',
-    'IntervenantFormHydrator'                                                                                             => __DIR__ . '/src/Application/Form/Intervenant/EditionForm.php',
-    'Application\Form\Intervenant\ModificationServiceDuForm'                                                              => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuForm.php',
-    'Application\Form\Supprimer'                                                                                          => __DIR__ . '/src/Application/Form/Supprimer.php',
-    'Application\Form\DisciplineForm'                                                                                     => __DIR__ . '/src/Application/Form/DisciplineForm.php',
-    'DisciplineFormHydrator'                                                                                              => __DIR__ . '/src/Application/Form/DisciplineForm.php',
-    'Application\Form\Droits\Interfaces\RoleFormAwareInterface'                                                           => __DIR__ . '/src/Application/Form/Droits/Interfaces/RoleFormAwareInterface.php',
-    'Application\Form\Droits\Interfaces\AffectationFormAwareInterface'                                                    => __DIR__ . '/src/Application/Form/Droits/Interfaces/AffectationFormAwareInterface.php',
-    'Application\Form\Droits\AffectationForm'                                                                             => __DIR__ . '/src/Application/Form/Droits/AffectationForm.php',
-    'AffectationFormHydrator'                                                                                             => __DIR__ . '/src/Application/Form/Droits/AffectationForm.php',
-    'Application\Form\Droits\Traits\AffectationFormAwareTrait'                                                            => __DIR__ . '/src/Application/Form/Droits/Traits/AffectationFormAwareTrait.php',
-    'Application\Form\Droits\Traits\RoleFormAwareTrait'                                                                   => __DIR__ . '/src/Application/Form/Droits/Traits/RoleFormAwareTrait.php',
-    'Application\Form\Droits\RoleForm'                                                                                    => __DIR__ . '/src/Application/Form/Droits/RoleForm.php',
-    'RoleFormHydrator'                                                                                                    => __DIR__ . '/src/Application/Form/Droits/RoleForm.php',
-    'Application\Form\Service\SaisieFieldset'                                                                             => __DIR__ . '/src/Application/Form/Service/SaisieFieldset.php',
-    'Application\Form\Service\Interfaces\RechercheFormAwareInterface'                                                     => __DIR__ . '/src/Application/Form/Service/Interfaces/RechercheFormAwareInterface.php',
-    'Application\Form\Service\Interfaces\SaisieAwareInterface'                                                            => __DIR__ . '/src/Application/Form/Service/Interfaces/SaisieAwareInterface.php',
-    'Application\Form\Service\Interfaces\SaisieFieldsetAwareInterface'                                                    => __DIR__ . '/src/Application/Form/Service/Interfaces/SaisieFieldsetAwareInterface.php',
-    'Application\Form\Service\RechercheFormHydrator'                                                                      => __DIR__ . '/src/Application/Form/Service/RechercheFormHydrator.php',
-    'Application\Form\Service\Traits\SaisieFieldsetAwareTrait'                                                            => __DIR__ . '/src/Application/Form/Service/Traits/SaisieFieldsetAwareTrait.php',
-    'Application\Form\Service\Traits\RechercheFormAwareTrait'                                                             => __DIR__ . '/src/Application/Form/Service/Traits/RechercheFormAwareTrait.php',
-    'Application\Form\Service\Traits\SaisieAwareTrait'                                                                    => __DIR__ . '/src/Application/Form/Service/Traits/SaisieAwareTrait.php',
-    'Application\Form\Service\SaisieFieldsetHydrator'                                                                     => __DIR__ . '/src/Application/Form/Service/SaisieFieldsetHydrator.php',
-    'Application\Form\Service\SaisieHydrator'                                                                             => __DIR__ . '/src/Application/Form/Service/SaisieHydrator.php',
-    'Application\Form\Service\Saisie'                                                                                     => __DIR__ . '/src/Application/Form/Service/Saisie.php',
-    'Application\Form\Service\RechercheForm'                                                                              => __DIR__ . '/src/Application/Form/Service/RechercheForm.php',
-    'Application\Form\OffreFormation\ElementModulateursFieldset'                                                          => __DIR__ . '/src/Application/Form/OffreFormation/ElementModulateursFieldset.php',
-    'Application\Form\OffreFormation\Interfaces\ElementPedagogiqueSaisieAwareInterface'                                   => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementPedagogiqueSaisieAwareInterface.php',
-    'Application\Form\OffreFormation\Interfaces\ElementModulateursFieldsetAwareInterface'                                 => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementModulateursFieldsetAwareInterface.php',
-    'Application\Form\OffreFormation\Interfaces\EtapeModulateursSaisieAwareInterface'                                     => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/EtapeModulateursSaisieAwareInterface.php',
-    'Application\Form\OffreFormation\Interfaces\EtapeSaisieAwareInterface'                                                => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/EtapeSaisieAwareInterface.php',
-    'Application\Form\OffreFormation\Interfaces\ElementPedagogiqueRechercheFieldsetAwareInterface'                        => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementPedagogiqueRechercheFieldsetAwareInterface.php',
-    'Application\Form\OffreFormation\EtapeSaisie'                                                                         => __DIR__ . '/src/Application/Form/OffreFormation/EtapeSaisie.php',
-    'EtapeSaisieHydrator'                                                                                                 => __DIR__ . '/src/Application/Form/OffreFormation/EtapeSaisie.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\Interfaces\ElementCentreCoutFieldsetAwareInterface'                  => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Interfaces/ElementCentreCoutFieldsetAwareInterface.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\Interfaces\EtapeCentreCoutFormAwareInterface'                        => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Interfaces/EtapeCentreCoutFormAwareInterface.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\Traits\EtapeCentreCoutFormAwareTrait'                                => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Traits/EtapeCentreCoutFormAwareTrait.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\Traits\ElementCentreCoutFieldsetAwareTrait'                          => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Traits/ElementCentreCoutFieldsetAwareTrait.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\EtapeCentreCoutForm'                                                 => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php',
-    'EtapeCentreCoutFormHydrator'                                                                                         => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php',
-    'Application\Form\OffreFormation\EtapeCentreCout\ElementCentreCoutFieldset'                                           => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php',
-    'ElementCentreCoutFieldsetHydrator'                                                                                   => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php',
-    'Application\Form\OffreFormation\ElementPedagogiqueRechercheFieldset'                                                 => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php',
-    'Application\Form\OffreFormation\ElementPedagogiqueRechercheHydrator'                                                 => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueRechercheHydrator.php',
-    'Application\Form\OffreFormation\Traits\ElementPedagogiqueSaisieAwareTrait'                                           => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementPedagogiqueSaisieAwareTrait.php',
-    'Application\Form\OffreFormation\Traits\ElementModulateursFieldsetAwareTrait'                                         => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementModulateursFieldsetAwareTrait.php',
-    'Application\Form\OffreFormation\Traits\EtapeModulateursSaisieAwareTrait'                                             => __DIR__ . '/src/Application/Form/OffreFormation/Traits/EtapeModulateursSaisieAwareTrait.php',
-    'Application\Form\OffreFormation\Traits\ElementPedagogiqueRechercheFieldsetAwareTrait'                                => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementPedagogiqueRechercheFieldsetAwareTrait.php',
-    'Application\Form\OffreFormation\Traits\EtapeSaisieAwareTrait'                                                        => __DIR__ . '/src/Application/Form/OffreFormation/Traits/EtapeSaisieAwareTrait.php',
-    'Application\Form\OffreFormation\ElementPedagogiqueSaisie'                                                            => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueSaisie.php',
-    'ElementPedagogiqueSaisieHydrator'                                                                                    => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueSaisie.php',
-    'Application\Form\OffreFormation\ElementModulateursHydrator'                                                          => __DIR__ . '/src/Application/Form/OffreFormation/ElementModulateursHydrator.php',
-    'Application\Form\OffreFormation\EtapeModulateursHydrator'                                                            => __DIR__ . '/src/Application/Form/OffreFormation/EtapeModulateursHydrator.php',
-    'Application\Form\OffreFormation\EtapeModulateursSaisie'                                                              => __DIR__ . '/src/Application/Form/OffreFormation/EtapeModulateursSaisie.php',
-    'Application\Form\Agrement\Interfaces\SaisieAwareInterface'                                                           => __DIR__ . '/src/Application/Form/Agrement/Interfaces/SaisieAwareInterface.php',
-    'Application\Form\Agrement\Traits\SaisieAwareTrait'                                                                   => __DIR__ . '/src/Application/Form/Agrement/Traits/SaisieAwareTrait.php',
-    'Application\Form\Agrement\Saisie'                                                                                    => __DIR__ . '/src/Application/Form/Agrement/Saisie.php',
-    'Application\Form\Traits\DisciplineFormAwareTrait'                                                                    => __DIR__ . '/src/Application/Form/Traits/DisciplineFormAwareTrait.php',
-    'Application\Form\VolumeHoraire\Interfaces\SaisieAwareInterface'                                                      => __DIR__ . '/src/Application/Form/VolumeHoraire/Interfaces/SaisieAwareInterface.php',
-    'Application\Form\VolumeHoraire\Interfaces\SaisieMultipleFieldsetAwareInterface'                                      => __DIR__ . '/src/Application/Form/VolumeHoraire/Interfaces/SaisieMultipleFieldsetAwareInterface.php',
-    'Application\Form\VolumeHoraire\SaisieMultipleHydrator'                                                               => __DIR__ . '/src/Application/Form/VolumeHoraire/SaisieMultipleHydrator.php',
-    'Application\Form\VolumeHoraire\Traits\SaisieMultipleFieldsetAwareTrait'                                              => __DIR__ . '/src/Application/Form/VolumeHoraire/Traits/SaisieMultipleFieldsetAwareTrait.php',
-    'Application\Form\VolumeHoraire\Traits\SaisieAwareTrait'                                                              => __DIR__ . '/src/Application/Form/VolumeHoraire/Traits/SaisieAwareTrait.php',
-    'Application\Form\VolumeHoraire\Saisie'                                                                               => __DIR__ . '/src/Application/Form/VolumeHoraire/Saisie.php',
-    'Application\Form\VolumeHoraire\SaisieMultipleFieldset'                                                               => __DIR__ . '/src/Application/Form/VolumeHoraire/SaisieMultipleFieldset.php',
-    'Application\Form\Paiement\Interfaces\MiseEnPaiementFormAwareInterface'                                               => __DIR__ . '/src/Application/Form/Paiement/Interfaces/MiseEnPaiementFormAwareInterface.php',
-    'Application\Form\Paiement\Interfaces\MiseEnPaiementRechercheFormAwareInterface'                                      => __DIR__ . '/src/Application/Form/Paiement/Interfaces/MiseEnPaiementRechercheFormAwareInterface.php',
-    'Application\Form\Paiement\Traits\MiseEnPaiementFormAwareTrait'                                                       => __DIR__ . '/src/Application/Form/Paiement/Traits/MiseEnPaiementFormAwareTrait.php',
-    'Application\Form\Paiement\Traits\MiseEnPaiementRechercheFormAwareTrait'                                              => __DIR__ . '/src/Application/Form/Paiement/Traits/MiseEnPaiementRechercheFormAwareTrait.php',
-    'Application\Form\Paiement\MiseEnPaiementForm'                                                                        => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementForm.php',
-    'Application\Form\Paiement\MiseEnPaiementRechercheForm'                                                               => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php',
-    'MiseEnPaiementRechercheFormHydrator'                                                                                 => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php',
-    'Application\Form\ServiceReferentiel\SaisieFieldset'                                                                  => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieFieldset.php',
-    'Application\Form\ServiceReferentiel\Interfaces\SaisieAwareInterface'                                                 => __DIR__ . '/src/Application/Form/ServiceReferentiel/Interfaces/SaisieAwareInterface.php',
-    'Application\Form\ServiceReferentiel\Interfaces\SaisieFieldsetAwareInterface'                                         => __DIR__ . '/src/Application/Form/ServiceReferentiel/Interfaces/SaisieFieldsetAwareInterface.php',
-    'Application\Form\ServiceReferentiel\Traits\SaisieFieldsetAwareTrait'                                                 => __DIR__ . '/src/Application/Form/ServiceReferentiel/Traits/SaisieFieldsetAwareTrait.php',
-    'Application\Form\ServiceReferentiel\Traits\SaisieAwareTrait'                                                         => __DIR__ . '/src/Application/Form/ServiceReferentiel/Traits/SaisieAwareTrait.php',
-    'Application\Form\ServiceReferentiel\SaisieFieldsetHydrator'                                                          => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieFieldsetHydrator.php',
-    'Application\Form\ServiceReferentiel\SaisieHydrator'                                                                  => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieHydrator.php',
-    'Application\Form\ServiceReferentiel\Saisie'                                                                          => __DIR__ . '/src/Application/Form/ServiceReferentiel/Saisie.php',
-    'Application\Form\VolumeHoraireReferentiel\Interfaces\SaisieAwareInterface'                                           => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/Interfaces/SaisieAwareInterface.php',
-    'Application\Form\VolumeHoraireReferentiel\Interfaces\SaisieMultipleFieldsetAwareInterface'                           => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/Interfaces/SaisieMultipleFieldsetAwareInterface.php',
-    'Application\Form\VolumeHoraireReferentiel\SaisieMultipleHydrator'                                                    => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/SaisieMultipleHydrator.php',
-    'Application\Form\VolumeHoraireReferentiel\Traits\SaisieMultipleFieldsetAwareTrait'                                   => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/Traits/SaisieMultipleFieldsetAwareTrait.php',
-    'Application\Form\VolumeHoraireReferentiel\Traits\SaisieAwareTrait'                                                   => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/Traits/SaisieAwareTrait.php',
-    'Application\Form\VolumeHoraireReferentiel\Saisie'                                                                    => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/Saisie.php',
-    'Application\Form\VolumeHoraireReferentiel\SaisieMultipleFieldset'                                                    => __DIR__ . '/src/Application/Form/VolumeHoraireReferentiel/SaisieMultipleFieldset.php',
+    'Application\Module'                                                                                 => __DIR__ . '/Module.php',
+    'Application\Validator\DepartementNaissanceValidator'                                                => __DIR__ . '/src/Application/Validator/DepartementNaissanceValidator.php',
+    'Application\Validator\PaysNaissanceValidator'                                                       => __DIR__ . '/src/Application/Validator/PaysNaissanceValidator.php',
+    'Application\Validator\StatutIntervenantValidator'                                                   => __DIR__ . '/src/Application/Validator/StatutIntervenantValidator.php',
+    'Application\Validator\NumeroINSEEValidator'                                                         => __DIR__ . '/src/Application/Validator/NumeroINSEEValidator.php',
+    'Application\Interfaces\NiveauEtapeAwareInterface'                                                   => __DIR__ . '/src/Application/Interfaces/NiveauEtapeAwareInterface.php',
+    'Application\Interfaces\ServiceAPayerAwareInterface'                                                 => __DIR__ . '/src/Application/Interfaces/ServiceAPayerAwareInterface.php',
+    'Application\Interfaces\RoleAwareInterface'                                                          => __DIR__ . '/src/Application/Interfaces/RoleAwareInterface.php',
+    'Application\Entity\Collection'                                                                      => __DIR__ . '/src/Application/Entity/Collection.php',
+    'Application\Entity\Db\TypeModulateur'                                                               => __DIR__ . '/src/Application/Entity/Db/TypeModulateur.php',
+    'Application\Entity\Db\ServiceReferentiel'                                                           => __DIR__ . '/src/Application/Entity/Db/ServiceReferentiel.php',
+    'Application\Entity\Db\AffectationRecherche'                                                         => __DIR__ . '/src/Application/Entity/Db/AffectationRecherche.php',
+    'Application\Entity\Db\CheminPedagogique'                                                            => __DIR__ . '/src/Application/Entity/Db/CheminPedagogique.php',
+    'Application\Entity\Db\Interfaces\ContratAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/ContratAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CentreCoutEpAwareInterface'                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/CentreCoutEpAwareInterface.php',
+    'Application\Entity\Db\Interfaces\SituationFamilialeAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/SituationFamilialeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VolumeHoraireEnsAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireEnsAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicDepassHcHorsRemuFcAwareInterface'                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDepassHcHorsRemuFcAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VolumeHoraireReferentielAwareInterface'                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeModulateurStructureAwareInterface'                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeModulateurStructureAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicDepassRefAwareInterface'                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDepassRefAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AdresseStructureAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/AdresseStructureAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeHeuresAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeHeuresAwareInterface.php',
+    'Application\Entity\Db\Interfaces\MiseEnPaiementIntervenantStructureAwareInterface'                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/MiseEnPaiementIntervenantStructureAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AffectationRechercheAwareInterface'                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/AffectationRechercheAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CorpsAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/CorpsAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CentreCoutAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/CentreCoutAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeContratAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeContratAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ServiceAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/ServiceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleResultatServiceReferentielAwareInterface'                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatServiceReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteValidationServiceRefAwareInterface'                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidationServiceRefAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeModulateurAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeModulateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeRessourceAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeRessourceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FichierAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/FichierAwareInterface.php',
+    'Application\Entity\Db\Interfaces\EtablissementAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtablissementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeAgrementStatutAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeAgrementStatutAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ServiceReferentielAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/ServiceReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\RoleAwareInterface'                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/RoleAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AnneeAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/AnneeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\PersonnelAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/PersonnelAwareInterface.php',
+    'Application\Entity\Db\Interfaces\PerimetreAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/PerimetreAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeDotationAwareInterface'                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeDotationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\StatutIntervenantAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/StatutIntervenantAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleVolumeHoraireAwareInterface'                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleVolumeHoraireAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleVolumeHoraireReferentielAwareInterface'                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleVolumeHoraireReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteValidRefAutreAwareInterface'                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidRefAutreAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeVolumeHoraireAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeVolumeHoraireAwareInterface.php',
+    'Application\Entity\Db\Interfaces\PeriodeAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/PeriodeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleResultatAwareInterface'                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatAwareInterface.php',
+    'Application\Entity\Db\Interfaces\PaysAwareInterface'                                                => __DIR__ . '/src/Application/Entity/Db/Interfaces/PaysAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeFormationAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeFormationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\NotificationIndicateurAwareInterface'                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/NotificationIndicateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\IntervenantAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/IntervenantAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeValidationAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeValidationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleIntervenantAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleIntervenantAwareInterface.php',
+    'Application\Entity\Db\Interfaces\DotationAwareInterface'                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/DotationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\MiseEnPaiementAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/MiseEnPaiementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ModulateurAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/ModulateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypePieceJointeStatutAwareInterface'                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePieceJointeStatutAwareInterface.php',
+    'Application\Entity\Db\Interfaces\DomaineFonctionnelAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/DomaineFonctionnelAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleServiceModifieAwareInterface'                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceModifieAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypePosteAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePosteAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CheminPedagogiqueAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/CheminPedagogiqueAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TblAgrementAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/TblAgrementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VServiceNonValideAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/VServiceNonValideAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteDemandeMepAwareInterface'                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteDemandeMepAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AgrementAwareInterface'                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/AgrementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\DisciplineAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/DisciplineAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AffectationAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/AffectationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleResultatVolumeHoraireAwareInterface'                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatVolumeHoraireAwareInterface.php',
+    'Application\Entity\Db\Interfaces\EtapeAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtapeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeAgrementAwareInterface'                                        => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeAgrementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeInterventionAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeInterventionAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteValidEnsAutreAwareInterface'                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidEnsAutreAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleResultatServiceAwareInterface'                              => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatServiceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\NiveauFormationAwareInterface'                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/NiveauFormationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CcActiviteAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/CcActiviteAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteValidationServiceAwareInterface'                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteValidationServiceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\IndicModifDossierAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/IndicModifDossierAwareInterface.php',
+    'Application\Entity\Db\Interfaces\MotifNonPaiementAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/MotifNonPaiementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\PieceJointeAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/PieceJointeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\DossierAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/DossierAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleServiceReferentielAwareInterface'                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\IndicateurAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/IndicateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ModificationServiceDuAwareInterface'                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/ModificationServiceDuAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeCentreCoutAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeCentreCoutAwareInterface.php',
+    'Application\Entity\Db\Interfaces\CiviliteAwareInterface'                                            => __DIR__ . '/src/Application/Entity/Db/Interfaces/CiviliteAwareInterface.php',
+    'Application\Entity\Db\Interfaces\MotifModificationServiceDuAwareInterface'                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/MotifModificationServiceDuAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeStructureAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeStructureAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VolumeHoraireAwareInterface'                                       => __DIR__ . '/src/Application/Entity/Db/Interfaces/VolumeHoraireAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VServiceValideAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/VServiceValideAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ElementPedagogiqueAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/ElementPedagogiqueAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicAttenteMepAwareInterface'                                    => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicAttenteMepAwareInterface.php',
+    'Application\Entity\Db\Interfaces\DepartementAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/DepartementAwareInterface.php',
+    'Application\Entity\Db\Interfaces\GroupeTypeFormationAwareInterface'                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/GroupeTypeFormationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ElementModulateurAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/ElementModulateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleServiceAwareInterface'                                      => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleServiceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\VIndicDiffDossierAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/VIndicDiffDossierAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypePieceJointeAwareInterface'                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypePieceJointeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\AdresseIntervenantAwareInterface'                                  => __DIR__ . '/src/Application/Entity/Db/Interfaces/AdresseIntervenantAwareInterface.php',
+    'Application\Entity\Db\Interfaces\HistoIntervenantServiceAwareInterface'                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/HistoIntervenantServiceAwareInterface.php',
+    'Application\Entity\Db\Interfaces\UtilisateurAwareInterface'                                         => __DIR__ . '/src/Application/Entity/Db/Interfaces/UtilisateurAwareInterface.php',
+    'Application\Entity\Db\Interfaces\TypeIntervenantAwareInterface'                                     => __DIR__ . '/src/Application/Entity/Db/Interfaces/TypeIntervenantAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ParametreAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/ParametreAwareInterface.php',
+    'Application\Entity\Db\Interfaces\ValidationAwareInterface'                                          => __DIR__ . '/src/Application/Entity/Db/Interfaces/ValidationAwareInterface.php',
+    'Application\Entity\Db\Interfaces\EtatVolumeHoraireAwareInterface'                                   => __DIR__ . '/src/Application/Entity/Db/Interfaces/EtatVolumeHoraireAwareInterface.php',
+    'Application\Entity\Db\Interfaces\GradeAwareInterface'                                               => __DIR__ . '/src/Application/Entity/Db/Interfaces/GradeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FormuleResultatVolumeHoraireReferentielAwareInterface'             => __DIR__ . '/src/Application/Entity/Db/Interfaces/FormuleResultatVolumeHoraireReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\FonctionReferentielAwareInterface'                                 => __DIR__ . '/src/Application/Entity/Db/Interfaces/FonctionReferentielAwareInterface.php',
+    'Application\Entity\Db\Interfaces\WfEtapeAwareInterface'                                             => __DIR__ . '/src/Application/Entity/Db/Interfaces/WfEtapeAwareInterface.php',
+    'Application\Entity\Db\Interfaces\StructureAwareInterface'                                           => __DIR__ . '/src/Application/Entity/Db/Interfaces/StructureAwareInterface.php',
+    'Application\Entity\Db\ServiceAPayerInterface'                                                       => __DIR__ . '/src/Application/Entity/Db/ServiceAPayerInterface.php',
+    'Application\Entity\Db\Modulateur'                                                                   => __DIR__ . '/src/Application/Entity/Db/Modulateur.php',
+    'Application\Entity\Db\TypeValidation'                                                               => __DIR__ . '/src/Application/Entity/Db/TypeValidation.php',
+    'Application\Entity\Db\ModificationServiceDu'                                                        => __DIR__ . '/src/Application/Entity/Db/ModificationServiceDu.php',
+    'Application\Entity\Db\TblPieceJointeFournie'                                                        => __DIR__ . '/src/Application/Entity/Db/TblPieceJointeFournie.php',
+    'Application\Entity\Db\FormuleService'                                                               => __DIR__ . '/src/Application/Entity/Db/FormuleService.php',
+    'Application\Entity\Db\Departement'                                                                  => __DIR__ . '/src/Application/Entity/Db/Departement.php',
+    'Application\Entity\Db\FormuleVolumeHoraireReferentiel'                                              => __DIR__ . '/src/Application/Entity/Db/FormuleVolumeHoraireReferentiel.php',
+    'Application\Entity\Db\FormuleResultatVolumeHoraireReferentiel'                                      => __DIR__ . '/src/Application/Entity/Db/FormuleResultatVolumeHoraireReferentiel.php',
+    'Application\Entity\Db\EtatVolumeHoraire'                                                            => __DIR__ . '/src/Application/Entity/Db/EtatVolumeHoraire.php',
+    'Application\Entity\Db\FormuleResultatService'                                                       => __DIR__ . '/src/Application/Entity/Db/FormuleResultatService.php',
+    'Application\Entity\Db\TblWorkflow'                                                                  => __DIR__ . '/src/Application/Entity/Db/TblWorkflow.php',
+    'Application\Entity\Db\TblPieceJointe'                                                               => __DIR__ . '/src/Application/Entity/Db/TblPieceJointe.php',
+    'Application\Entity\Db\TypeContrat'                                                                  => __DIR__ . '/src/Application/Entity/Db/TypeContrat.php',
+    'Application\Entity\Db\ServiceAPayerTrait'                                                           => __DIR__ . '/src/Application/Entity/Db/ServiceAPayerTrait.php',
+    'Application\Entity\Db\AdresseStructure'                                                             => __DIR__ . '/src/Application/Entity/Db/AdresseStructure.php',
+    'Application\Entity\Db\TypeAgrement'                                                                 => __DIR__ . '/src/Application/Entity/Db/TypeAgrement.php',
+    'Application\Entity\Db\Corps'                                                                        => __DIR__ . '/src/Application/Entity/Db/Corps.php',
+    'Application\Entity\Db\ElementPedagogique'                                                           => __DIR__ . '/src/Application/Entity/Db/ElementPedagogique.php',
+    'Application\Entity\Db\MiseEnPaiementIntervenantStructure'                                           => __DIR__ . '/src/Application/Entity/Db/MiseEnPaiementIntervenantStructure.php',
+    'Application\Entity\Db\Pays'                                                                         => __DIR__ . '/src/Application/Entity/Db/Pays.php',
+    'Application\Entity\Db\MotifModificationServiceDu'                                                   => __DIR__ . '/src/Application/Entity/Db/MotifModificationServiceDu.php',
+    'Application\Entity\Db\Annee'                                                                        => __DIR__ . '/src/Application/Entity/Db/Annee.php',
+    'Application\Entity\Db\TypeVolumeHoraire'                                                            => __DIR__ . '/src/Application/Entity/Db/TypeVolumeHoraire.php',
+    'Application\Entity\Db\Structure'                                                                    => __DIR__ . '/src/Application/Entity/Db/Structure.php',
+    'Application\Entity\Db\Perimetre'                                                                    => __DIR__ . '/src/Application/Entity/Db/Perimetre.php',
+    'Application\Entity\Db\PieceJointe'                                                                  => __DIR__ . '/src/Application/Entity/Db/PieceJointe.php',
+    'Application\Entity\Db\TypeFormation'                                                                => __DIR__ . '/src/Application/Entity/Db/TypeFormation.php',
+    'Application\Entity\Db\TypeRessource'                                                                => __DIR__ . '/src/Application/Entity/Db/TypeRessource.php',
+    'Application\Entity\Db\Intervenant'                                                                  => __DIR__ . '/src/Application/Entity/Db/Intervenant.php',
+    'Application\Entity\Db\Service'                                                                      => __DIR__ . '/src/Application/Entity/Db/Service.php',
+    'Application\Entity\Db\MotifNonPaiement'                                                             => __DIR__ . '/src/Application/Entity/Db/MotifNonPaiement.php',
+    'Application\Entity\Db\TypeHeures'                                                                   => __DIR__ . '/src/Application/Entity/Db/TypeHeures.php',
+    'Application\Entity\Db\FormuleVolumeHoraire'                                                         => __DIR__ . '/src/Application/Entity/Db/FormuleVolumeHoraire.php',
+    'Application\Entity\Db\TblServiceReferentiel'                                                        => __DIR__ . '/src/Application/Entity/Db/TblServiceReferentiel.php',
+    'Application\Entity\Db\Fichier'                                                                      => __DIR__ . '/src/Application/Entity/Db/Fichier.php',
+    'Application\Entity\Db\TblValidationEnseignement'                                                    => __DIR__ . '/src/Application/Entity/Db/TblValidationEnseignement.php',
+    'Application\Entity\Db\FormuleServiceModifie'                                                        => __DIR__ . '/src/Application/Entity/Db/FormuleServiceModifie.php',
+    'Application\Entity\Db\CentreCout'                                                                   => __DIR__ . '/src/Application/Entity/Db/CentreCout.php',
+    'Application\Entity\Db\Civilite'                                                                     => __DIR__ . '/src/Application/Entity/Db/Civilite.php',
+    'Application\Entity\Db\Validation'                                                                   => __DIR__ . '/src/Application/Entity/Db/Validation.php',
+    'Application\Entity\Db\CcActivite'                                                                   => __DIR__ . '/src/Application/Entity/Db/CcActivite.php',
+    'Application\Entity\Db\HistoIntervenantService'                                                      => __DIR__ . '/src/Application/Entity/Db/HistoIntervenantService.php',
+    'Application\Entity\Db\Indicateur'                                                                   => __DIR__ . '/src/Application/Entity/Db/Indicateur.php',
+    'Application\Entity\Db\TblDossier'                                                                   => __DIR__ . '/src/Application/Entity/Db/TblDossier.php',
+    'Application\Entity\Db\Traits\FormuleResultatAwareTrait'                                             => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleVolumeHoraireReferentielAwareTrait'                             => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleVolumeHoraireReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\ServiceReferentielAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/ServiceReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\ModulateurAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/ModulateurAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicDepassRefAwareTrait'                                             => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDepassRefAwareTrait.php',
+    'Application\Entity\Db\Traits\IndicateurAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/IndicateurAwareTrait.php',
+    'Application\Entity\Db\Traits\ElementModulateurAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/ElementModulateurAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeRessourceAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeRessourceAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleServiceReferentielAwareTrait'                                   => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\CorpsAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/CorpsAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeInterventionAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/TypeInterventionAwareTrait.php',
+    'Application\Entity\Db\Traits\MotifModificationServiceDuAwareTrait'                                  => __DIR__ . '/src/Application/Entity/Db/Traits/MotifModificationServiceDuAwareTrait.php',
+    'Application\Entity\Db\Traits\ModificationServiceDuAwareTrait'                                       => __DIR__ . '/src/Application/Entity/Db/Traits/ModificationServiceDuAwareTrait.php',
+    'Application\Entity\Db\Traits\RoleAwareTrait'                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/RoleAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleResultatVolumeHoraireAwareTrait'                                => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatVolumeHoraireAwareTrait.php',
+    'Application\Entity\Db\Traits\VolumeHoraireReferentielAwareTrait'                                    => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\ElementPedagogiqueAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/ElementPedagogiqueAwareTrait.php',
+    'Application\Entity\Db\Traits\WfEtapeAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/WfEtapeAwareTrait.php',
+    'Application\Entity\Db\Traits\MotifNonPaiementAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/MotifNonPaiementAwareTrait.php',
+    'Application\Entity\Db\Traits\EtatVolumeHoraireAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/EtatVolumeHoraireAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteValidRefAutreAwareTrait'                                  => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidRefAutreAwareTrait.php',
+    'Application\Entity\Db\Traits\EtablissementAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/EtablissementAwareTrait.php',
+    'Application\Entity\Db\Traits\IndicModifDossierAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/IndicModifDossierAwareTrait.php',
+    'Application\Entity\Db\Traits\StructureAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/StructureAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleVolumeHoraireAwareTrait'                                        => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleVolumeHoraireAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeContratAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/TypeContratAwareTrait.php',
+    'Application\Entity\Db\Traits\TypePosteAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/TypePosteAwareTrait.php',
+    'Application\Entity\Db\Traits\VServiceNonValideAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/VServiceNonValideAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeValidationAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/TypeValidationAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeAgrementStatutAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/TypeAgrementStatutAwareTrait.php',
+    'Application\Entity\Db\Traits\DisciplineAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/DisciplineAwareTrait.php',
+    'Application\Entity\Db\Traits\SituationFamilialeAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/SituationFamilialeAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeModulateurStructureAwareTrait'                                     => __DIR__ . '/src/Application/Entity/Db/Traits/TypeModulateurStructureAwareTrait.php',
+    'Application\Entity\Db\Traits\TypePieceJointeAwareTrait'                                             => __DIR__ . '/src/Application/Entity/Db/Traits/TypePieceJointeAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleServiceModifieAwareTrait'                                       => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceModifieAwareTrait.php',
+    'Application\Entity\Db\Traits\FichierAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/FichierAwareTrait.php',
+    'Application\Entity\Db\Traits\VolumeHoraireAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireAwareTrait.php',
+    'Application\Entity\Db\Traits\FonctionReferentielAwareTrait'                                         => __DIR__ . '/src/Application/Entity/Db/Traits/FonctionReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\VolumeHoraireEnsAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/VolumeHoraireEnsAwareTrait.php',
+    'Application\Entity\Db\Traits\PieceJointeAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/PieceJointeAwareTrait.php',
+    'Application\Entity\Db\Traits\NotificationIndicateurAwareTrait'                                      => __DIR__ . '/src/Application/Entity/Db/Traits/NotificationIndicateurAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeDotationAwareTrait'                                                => __DIR__ . '/src/Application/Entity/Db/Traits/TypeDotationAwareTrait.php',
+    'Application\Entity\Db\Traits\GroupeTypeFormationAwareTrait'                                         => __DIR__ . '/src/Application/Entity/Db/Traits/GroupeTypeFormationAwareTrait.php',
+    'Application\Entity\Db\Traits\ServiceAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/ServiceAwareTrait.php',
+    'Application\Entity\Db\Traits\TblAgrementAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/TblAgrementAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeModulateurAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/TypeModulateurAwareTrait.php',
+    'Application\Entity\Db\Traits\AdresseStructureAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/AdresseStructureAwareTrait.php',
+    'Application\Entity\Db\Traits\MiseEnPaiementIntervenantStructureAwareTrait'                          => __DIR__ . '/src/Application/Entity/Db/Traits/MiseEnPaiementIntervenantStructureAwareTrait.php',
+    'Application\Entity\Db\Traits\GradeAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/GradeAwareTrait.php',
+    'Application\Entity\Db\Traits\ValidationAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/ValidationAwareTrait.php',
+    'Application\Entity\Db\Traits\TypePieceJointeStatutAwareTrait'                                       => __DIR__ . '/src/Application/Entity/Db/Traits/TypePieceJointeStatutAwareTrait.php',
+    'Application\Entity\Db\Traits\CheminPedagogiqueAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/CheminPedagogiqueAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeHeuresAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/TypeHeuresAwareTrait.php',
+    'Application\Entity\Db\Traits\PaysAwareTrait'                                                        => __DIR__ . '/src/Application/Entity/Db/Traits/PaysAwareTrait.php',
+    'Application\Entity\Db\Traits\HistoIntervenantServiceAwareTrait'                                     => __DIR__ . '/src/Application/Entity/Db/Traits/HistoIntervenantServiceAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleServiceAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleServiceAwareTrait.php',
+    'Application\Entity\Db\Traits\AgrementAwareTrait'                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/AgrementAwareTrait.php',
+    'Application\Entity\Db\Traits\DepartementAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/DepartementAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeStructureAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeStructureAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicDiffDossierAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDiffDossierAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleResultatServiceAwareTrait'                                      => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatServiceAwareTrait.php',
+    'Application\Entity\Db\Traits\ContratAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/ContratAwareTrait.php',
+    'Application\Entity\Db\Traits\DossierAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/DossierAwareTrait.php',
+    'Application\Entity\Db\Traits\CentreCoutAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/CentreCoutAwareTrait.php',
+    'Application\Entity\Db\Traits\ParametreAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/ParametreAwareTrait.php',
+    'Application\Entity\Db\Traits\PerimetreAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/PerimetreAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteValidationServiceAwareTrait'                              => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidationServiceAwareTrait.php',
+    'Application\Entity\Db\Traits\MiseEnPaiementAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/MiseEnPaiementAwareTrait.php',
+    'Application\Entity\Db\Traits\PeriodeAwareTrait'                                                     => __DIR__ . '/src/Application/Entity/Db/Traits/PeriodeAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteValidationServiceRefAwareTrait'                           => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidationServiceRefAwareTrait.php',
+    'Application\Entity\Db\Traits\IntervenantAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeCentreCoutAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/TypeCentreCoutAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleResultatVolumeHoraireReferentielAwareTrait'                     => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatVolumeHoraireReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\DomaineFonctionnelAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/DomaineFonctionnelAwareTrait.php',
+    'Application\Entity\Db\Traits\EtapeAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/EtapeAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicDepassHcHorsRemuFcAwareTrait'                                    => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicDepassHcHorsRemuFcAwareTrait.php',
+    'Application\Entity\Db\Traits\NiveauFormationAwareTrait'                                             => __DIR__ . '/src/Application/Entity/Db/Traits/NiveauFormationAwareTrait.php',
+    'Application\Entity\Db\Traits\AffectationAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/AffectationAwareTrait.php',
+    'Application\Entity\Db\Traits\AnneeAwareTrait'                                                       => __DIR__ . '/src/Application/Entity/Db/Traits/AnneeAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeFormationAwareTrait'                                               => __DIR__ . '/src/Application/Entity/Db/Traits/TypeFormationAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleIntervenantAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleIntervenantAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeIntervenantAwareTrait'                                             => __DIR__ . '/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php',
+    'Application\Entity\Db\Traits\VServiceValideAwareTrait'                                              => __DIR__ . '/src/Application/Entity/Db/Traits/VServiceValideAwareTrait.php',
+    'Application\Entity\Db\Traits\FormuleResultatServiceReferentielAwareTrait'                           => __DIR__ . '/src/Application/Entity/Db/Traits/FormuleResultatServiceReferentielAwareTrait.php',
+    'Application\Entity\Db\Traits\PersonnelAwareTrait'                                                   => __DIR__ . '/src/Application/Entity/Db/Traits/PersonnelAwareTrait.php',
+    'Application\Entity\Db\Traits\CiviliteAwareTrait'                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/CiviliteAwareTrait.php',
+    'Application\Entity\Db\Traits\StatutIntervenantAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/StatutIntervenantAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteDemandeMepAwareTrait'                                     => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteDemandeMepAwareTrait.php',
+    'Application\Entity\Db\Traits\AdresseIntervenantAwareTrait'                                          => __DIR__ . '/src/Application/Entity/Db/Traits/AdresseIntervenantAwareTrait.php',
+    'Application\Entity\Db\Traits\CentreCoutEpAwareTrait'                                                => __DIR__ . '/src/Application/Entity/Db/Traits/CentreCoutEpAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteValidEnsAutreAwareTrait'                                  => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteValidEnsAutreAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait'                                           => __DIR__ . '/src/Application/Entity/Db/Traits/TypeVolumeHoraireAwareTrait.php',
+    'Application\Entity\Db\Traits\CcActiviteAwareTrait'                                                  => __DIR__ . '/src/Application/Entity/Db/Traits/CcActiviteAwareTrait.php',
+    'Application\Entity\Db\Traits\UtilisateurAwareTrait'                                                 => __DIR__ . '/src/Application/Entity/Db/Traits/UtilisateurAwareTrait.php',
+    'Application\Entity\Db\Traits\VIndicAttenteMepAwareTrait'                                            => __DIR__ . '/src/Application/Entity/Db/Traits/VIndicAttenteMepAwareTrait.php',
+    'Application\Entity\Db\Traits\TypeAgrementAwareTrait'                                                => __DIR__ . '/src/Application/Entity/Db/Traits/TypeAgrementAwareTrait.php',
+    'Application\Entity\Db\Traits\AffectationRechercheAwareTrait'                                        => __DIR__ . '/src/Application/Entity/Db/Traits/AffectationRechercheAwareTrait.php',
+    'Application\Entity\Db\Traits\DotationAwareTrait'                                                    => __DIR__ . '/src/Application/Entity/Db/Traits/DotationAwareTrait.php',
+    'Application\Entity\Db\NotificationIndicateur'                                                       => __DIR__ . '/src/Application/Entity/Db/NotificationIndicateur.php',
+    'Application\Entity\Db\Affectation'                                                                  => __DIR__ . '/src/Application/Entity/Db/Affectation.php',
+    'Application\Entity\Db\TypeCentreCout'                                                               => __DIR__ . '/src/Application/Entity/Db/TypeCentreCout.php',
+    'Application\Entity\Db\StatutIntervenant'                                                            => __DIR__ . '/src/Application/Entity/Db/StatutIntervenant.php',
+    'Application\Entity\Db\VServiceNonValide'                                                            => __DIR__ . '/src/Application/Entity/Db/VServiceNonValide.php',
+    'Application\Entity\Db\GroupeTypeFormation'                                                          => __DIR__ . '/src/Application/Entity/Db/GroupeTypeFormation.php',
+    'Application\Entity\Db\Contrat'                                                                      => __DIR__ . '/src/Application/Entity/Db/Contrat.php',
+    'Application\Entity\Db\TblPaiement'                                                                  => __DIR__ . '/src/Application/Entity/Db/TblPaiement.php',
+    'Application\Entity\Db\TypeStructure'                                                                => __DIR__ . '/src/Application/Entity/Db/TypeStructure.php',
+    'Application\Entity\Db\TblServiceSaisie'                                                             => __DIR__ . '/src/Application/Entity/Db/TblServiceSaisie.php',
+    'Application\Entity\Db\MiseEnPaiement'                                                               => __DIR__ . '/src/Application/Entity/Db/MiseEnPaiement.php',
+    'Application\Entity\Db\AdresseIntervenant'                                                           => __DIR__ . '/src/Application/Entity/Db/AdresseIntervenant.php',
+    'Application\Entity\Db\CampagneSaisie'                                                               => __DIR__ . '/src/Application/Entity/Db/CampagneSaisie.php',
+    'Application\Entity\Db\TblContrat'                                                                   => __DIR__ . '/src/Application/Entity/Db/TblContrat.php',
+    'Application\Entity\Db\WfEtapeDep'                                                                   => __DIR__ . '/src/Application/Entity/Db/WfEtapeDep.php',
+    'Application\Entity\Db\Utilisateur'                                                                  => __DIR__ . '/src/Application/Entity/Db/Utilisateur.php',
+    'Application\Entity\Db\Etape'                                                                        => __DIR__ . '/src/Application/Entity/Db/Etape.php',
+    'Application\Entity\Db\IntervenantInterface'                                                         => __DIR__ . '/src/Application/Entity/Db/IntervenantInterface.php',
+    'Application\Entity\Db\Role'                                                                         => __DIR__ . '/src/Application/Entity/Db/Role.php',
+    'Application\Entity\Db\TblAgrement'                                                                  => __DIR__ . '/src/Application/Entity/Db/TblAgrement.php',
+    'Application\Entity\Db\Hydrator\DateInfSupStrategy'                                                  => __DIR__ . '/src/Application/Entity/Db/Hydrator/DateInfSupStrategy.php',
+    'Application\Entity\Db\Hydrator\IntervenantHydrator'                                                 => __DIR__ . '/src/Application/Entity/Db/Hydrator/IntervenantHydrator.php',
+    'Application\Entity\Db\Hydrator\Intervenant'                                                         => __DIR__ . '/src/Application/Entity/Db/Hydrator/Intervenant.php',
+    'Application\Entity\Db\Hydrator\CiviliteHydrator'                                                    => __DIR__ . '/src/Application/Entity/Db/Hydrator/CiviliteHydrator.php',
+    'Application\Entity\Db\VolumeHoraireReferentiel'                                                     => __DIR__ . '/src/Application/Entity/Db/VolumeHoraireReferentiel.php',
+    'Application\Entity\Db\WfDepBloquante'                                                               => __DIR__ . '/src/Application/Entity/Db/WfDepBloquante.php',
+    'Application\Entity\Db\FormuleResultatVolumeHoraire'                                                 => __DIR__ . '/src/Application/Entity/Db/FormuleResultatVolumeHoraire.php',
+    'Application\Entity\Db\CentreCoutEp'                                                                 => __DIR__ . '/src/Application/Entity/Db/CentreCoutEp.php',
+    'Application\Entity\Db\Periode'                                                                      => __DIR__ . '/src/Application/Entity/Db/Periode.php',
+    'Application\Entity\Db\NiveauFormation'                                                              => __DIR__ . '/src/Application/Entity/Db/NiveauFormation.php',
+    'Application\Entity\Db\VolumeHoraireEns'                                                             => __DIR__ . '/src/Application/Entity/Db/VolumeHoraireEns.php',
+    'Application\Entity\Db\Dotation'                                                                     => __DIR__ . '/src/Application/Entity/Db/Dotation.php',
+    'Application\Entity\Db\TblPieceJointeDemande'                                                        => __DIR__ . '/src/Application/Entity/Db/TblPieceJointeDemande.php',
+    'Application\Entity\Db\IndicModifDossier'                                                            => __DIR__ . '/src/Application/Entity/Db/IndicModifDossier.php',
+    'Application\Entity\Db\FormuleResultat'                                                              => __DIR__ . '/src/Application/Entity/Db/FormuleResultat.php',
+    'Application\Entity\Db\Etablissement'                                                                => __DIR__ . '/src/Application/Entity/Db/Etablissement.php',
+    'Application\Entity\Db\TblDmepLiquidation'                                                           => __DIR__ . '/src/Application/Entity/Db/TblDmepLiquidation.php',
+    'Application\Entity\Db\DomaineFonctionnel'                                                           => __DIR__ . '/src/Application/Entity/Db/DomaineFonctionnel.php',
+    'Application\Entity\Db\Discipline'                                                                   => __DIR__ . '/src/Application/Entity/Db/Discipline.php',
+    'Application\Entity\Db\Dossier'                                                                      => __DIR__ . '/src/Application/Entity/Db/Dossier.php',
+    'Application\Entity\Db\Parametre'                                                                    => __DIR__ . '/src/Application/Entity/Db/Parametre.php',
+    'Application\Entity\Db\TypePieceJointe'                                                              => __DIR__ . '/src/Application/Entity/Db/TypePieceJointe.php',
+    'Application\Entity\Db\TypeIntervention'                                                             => __DIR__ . '/src/Application/Entity/Db/TypeIntervention.php',
+    'Application\Entity\Db\TypeIntervenant'                                                              => __DIR__ . '/src/Application/Entity/Db/TypeIntervenant.php',
+    'Application\Entity\Db\FormuleResultatServiceReferentiel'                                            => __DIR__ . '/src/Application/Entity/Db/FormuleResultatServiceReferentiel.php',
+    'Application\Entity\Db\TypePoste'                                                                    => __DIR__ . '/src/Application/Entity/Db/TypePoste.php',
+    'Application\Entity\Db\Indicateur\Indicateur110'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur110.php',
+    'Application\Entity\Db\Indicateur\Indicateur670'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur670.php',
+    'Application\Entity\Db\Indicateur\Indicateur320'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur320.php',
+    'Application\Entity\Db\Indicateur\Indicateur330'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur330.php',
+    'Application\Entity\Db\Indicateur\Indicateur220'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur220.php',
+    'Application\Entity\Db\Indicateur\AbstractIndicateur'                                                => __DIR__ . '/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php',
+    'Application\Entity\Db\Indicateur\Indicateur310'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur310.php',
+    'Application\Entity\Db\Indicateur\Indicateur410'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur410.php',
+    'Application\Entity\Db\Indicateur\Indicateur520'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur520.php',
+    'Application\Entity\Db\Indicateur\Indicateur1020'                                                    => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur1020.php',
+    'Application\Entity\Db\Indicateur\Indicateur210'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur210.php',
+    'Application\Entity\Db\Indicateur\Indicateur710'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur710.php',
+    'Application\Entity\Db\Indicateur\Indicateur360'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur360.php',
+    'Application\Entity\Db\Indicateur\Indicateur810'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur810.php',
+    'Application\Entity\Db\Indicateur\Indicateur130'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur130.php',
+    'Application\Entity\Db\Indicateur\Indicateur530'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur530.php',
+    'Application\Entity\Db\Indicateur\Indicateur350'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur350.php',
+    'Application\Entity\Db\Indicateur\Indicateur510'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur510.php',
+    'Application\Entity\Db\Indicateur\Indicateur650'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur650.php',
+    'Application\Entity\Db\Indicateur\Indicateur620'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur620.php',
+    'Application\Entity\Db\Indicateur\Indicateur910'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur910.php',
+    'Application\Entity\Db\Indicateur\Indicateur920'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur920.php',
+    'Application\Entity\Db\Indicateur\Indicateur340'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur340.php',
+    'Application\Entity\Db\Indicateur\Indicateur720'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur720.php',
+    'Application\Entity\Db\Indicateur\Indicateur660'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur660.php',
+    'Application\Entity\Db\Indicateur\Indicateur610'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur610.php',
+    'Application\Entity\Db\Indicateur\Indicateur640'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur640.php',
+    'Application\Entity\Db\Indicateur\Indicateur820'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur820.php',
+    'Application\Entity\Db\Indicateur\Indicateur1010'                                                    => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur1010.php',
+    'Application\Entity\Db\Indicateur\Indicateur120'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur120.php',
+    'Application\Entity\Db\Indicateur\Indicateur630'                                                     => __DIR__ . '/src/Application/Entity/Db/Indicateur/Indicateur630.php',
+    'Application\Entity\Db\TypeAgrementStatut'                                                           => __DIR__ . '/src/Application/Entity/Db/TypeAgrementStatut.php',
+    'Application\Entity\Db\FonctionReferentiel'                                                          => __DIR__ . '/src/Application/Entity/Db/FonctionReferentiel.php',
+    'Application\Entity\Db\Agrement'                                                                     => __DIR__ . '/src/Application/Entity/Db/Agrement.php',
+    'Application\Entity\Db\Personnel'                                                                    => __DIR__ . '/src/Application/Entity/Db/Personnel.php',
+    'Application\Entity\Db\TblValidationReferentiel'                                                     => __DIR__ . '/src/Application/Entity/Db/TblValidationReferentiel.php',
+    'Application\Entity\Db\TblService'                                                                   => __DIR__ . '/src/Application/Entity/Db/TblService.php',
+    'Application\Entity\Db\ElementModulateur'                                                            => __DIR__ . '/src/Application/Entity/Db/ElementModulateur.php',
+    'Application\Entity\Db\FormuleIntervenant'                                                           => __DIR__ . '/src/Application/Entity/Db/FormuleIntervenant.php',
+    'Application\Entity\Db\WfEtape'                                                                      => __DIR__ . '/src/Application/Entity/Db/WfEtape.php',
+    'Application\Entity\Db\TypeDotation'                                                                 => __DIR__ . '/src/Application/Entity/Db/TypeDotation.php',
+    'Application\Entity\Db\TypePieceJointeStatut'                                                        => __DIR__ . '/src/Application/Entity/Db/TypePieceJointeStatut.php',
+    'Application\Entity\Db\VServiceValide'                                                               => __DIR__ . '/src/Application/Entity/Db/VServiceValide.php',
+    'Application\Entity\Db\TblClotureRealise'                                                            => __DIR__ . '/src/Application/Entity/Db/TblClotureRealise.php',
+    'Application\Entity\Db\FormuleServiceReferentiel'                                                    => __DIR__ . '/src/Application/Entity/Db/FormuleServiceReferentiel.php',
+    'Application\Entity\Db\Effectifs'                                                                    => __DIR__ . '/src/Application/Entity/Db/Effectifs.php',
+    'Application\Entity\Db\Grade'                                                                        => __DIR__ . '/src/Application/Entity/Db/Grade.php',
+    'Application\Entity\Db\TypeModulateurStructure'                                                      => __DIR__ . '/src/Application/Entity/Db/TypeModulateurStructure.php',
+    'Application\Entity\Db\VolumeHoraire'                                                                => __DIR__ . '/src/Application/Entity/Db/VolumeHoraire.php',
+    'Application\Entity\Db\RegleStructureValidation'                                                     => __DIR__ . '/src/Application/Entity/Db/RegleStructureValidation.php',
+    'Application\Entity\Db\FormuleResultatTypesHeuresTrait'                                              => __DIR__ . '/src/Application/Entity/Db/FormuleResultatTypesHeuresTrait.php',
+    'Application\Entity\Service\Recherche'                                                               => __DIR__ . '/src/Application/Entity/Service/Recherche.php',
+    'Application\Entity\WorkflowEtape'                                                                   => __DIR__ . '/src/Application/Entity/WorkflowEtape.php',
+    'Application\Entity\VolumeHoraireListe'                                                              => __DIR__ . '/src/Application/Entity/VolumeHoraireListe.php',
+    'Application\Entity\VolumeHoraireReferentielListe'                                                   => __DIR__ . '/src/Application/Entity/VolumeHoraireReferentielListe.php',
+    'Application\Entity\MiseEnPaiementListe'                                                             => __DIR__ . '/src/Application/Entity/MiseEnPaiementListe.php',
+    'Application\Entity\Paiement\MiseEnPaiementRecherche'                                                => __DIR__ . '/src/Application/Entity/Paiement/MiseEnPaiementRecherche.php',
+    'Application\Entity\NiveauEtape'                                                                     => __DIR__ . '/src/Application/Entity/NiveauEtape.php',
+    'Application\Service\TypeModulateur'                                                                 => __DIR__ . '/src/Application/Service/TypeModulateur.php',
+    'Application\Service\PilotageService'                                                                => __DIR__ . '/src/Application/Service/PilotageService.php',
+    'Application\Service\NavigationFactory'                                                              => __DIR__ . '/src/Application/Service/NavigationFactory.php',
+    'Application\Service\ServiceReferentiel'                                                             => __DIR__ . '/src/Application/Service/ServiceReferentiel.php',
+    'Application\Service\CheminPedagogique'                                                              => __DIR__ . '/src/Application/Service/CheminPedagogique.php',
+    'Application\Service\Interfaces\ContratAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/ContratAwareInterface.php',
+    'Application\Service\Interfaces\LocalContextAwareInterface'                                          => __DIR__ . '/src/Application/Service/Interfaces/LocalContextAwareInterface.php',
+    'Application\Service\Interfaces\CentreCoutEpAwareInterface'                                          => __DIR__ . '/src/Application/Service/Interfaces/CentreCoutEpAwareInterface.php',
+    'Application\Service\Interfaces\IndicateurServiceAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/IndicateurServiceAwareInterface.php',
+    'Application\Service\Interfaces\VolumeHoraireReferentielAwareInterface'                              => __DIR__ . '/src/Application/Service/Interfaces/VolumeHoraireReferentielAwareInterface.php',
+    'Application\Service\Interfaces\PrivilegeAwareInterface'                                             => __DIR__ . '/src/Application/Service/Interfaces/PrivilegeAwareInterface.php',
+    'Application\Service\Interfaces\TypeHeuresAwareInterface'                                            => __DIR__ . '/src/Application/Service/Interfaces/TypeHeuresAwareInterface.php',
+    'Application\Service\Interfaces\MiseEnPaiementIntervenantStructureAwareInterface'                    => __DIR__ . '/src/Application/Service/Interfaces/MiseEnPaiementIntervenantStructureAwareInterface.php',
+    'Application\Service\Interfaces\NiveauEtapeAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/NiveauEtapeAwareInterface.php',
+    'Application\Service\Interfaces\CentreCoutAwareInterface'                                            => __DIR__ . '/src/Application/Service/Interfaces/CentreCoutAwareInterface.php',
+    'Application\Service\Interfaces\TypeContratAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/TypeContratAwareInterface.php',
+    'Application\Service\Interfaces\ServiceAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/ServiceAwareInterface.php',
+    'Application\Service\Interfaces\ServiceAPayerAwareInterface'                                         => __DIR__ . '/src/Application/Service/Interfaces/ServiceAPayerAwareInterface.php',
+    'Application\Service\Interfaces\FormuleResultatServiceReferentielAwareInterface'                     => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatServiceReferentielAwareInterface.php',
+    'Application\Service\Interfaces\DotationServiceAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/DotationServiceAwareInterface.php',
+    'Application\Service\Interfaces\TypeModulateurAwareInterface'                                        => __DIR__ . '/src/Application/Service/Interfaces/TypeModulateurAwareInterface.php',
+    'Application\Service\Interfaces\PilotageServiceAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/PilotageServiceAwareInterface.php',
+    'Application\Service\Interfaces\EtablissementAwareInterface'                                         => __DIR__ . '/src/Application/Service/Interfaces/EtablissementAwareInterface.php',
+    'Application\Service\Interfaces\TypeAgrementStatutAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/TypeAgrementStatutAwareInterface.php',
+    'Application\Service\Interfaces\ServiceReferentielAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/ServiceReferentielAwareInterface.php',
+    'Application\Service\Interfaces\RoleAwareInterface'                                                  => __DIR__ . '/src/Application/Service/Interfaces/RoleAwareInterface.php',
+    'Application\Service\Interfaces\AnneeAwareInterface'                                                 => __DIR__ . '/src/Application/Service/Interfaces/AnneeAwareInterface.php',
+    'Application\Service\Interfaces\PersonnelAwareInterface'                                             => __DIR__ . '/src/Application/Service/Interfaces/PersonnelAwareInterface.php',
+    'Application\Service\Interfaces\PerimetreAwareInterface'                                             => __DIR__ . '/src/Application/Service/Interfaces/PerimetreAwareInterface.php',
+    'Application\Service\Interfaces\StatutIntervenantAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/StatutIntervenantAwareInterface.php',
+    'Application\Service\Interfaces\FormuleVolumeHoraireAwareInterface'                                  => __DIR__ . '/src/Application/Service/Interfaces/FormuleVolumeHoraireAwareInterface.php',
+    'Application\Service\Interfaces\FormuleVolumeHoraireReferentielAwareInterface'                       => __DIR__ . '/src/Application/Service/Interfaces/FormuleVolumeHoraireReferentielAwareInterface.php',
+    'Application\Service\Interfaces\TblAgrementServiceAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/TblAgrementServiceAwareInterface.php',
+    'Application\Service\Interfaces\TypeVolumeHoraireAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/TypeVolumeHoraireAwareInterface.php',
+    'Application\Service\Interfaces\PeriodeAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/PeriodeAwareInterface.php',
+    'Application\Service\Interfaces\FormuleResultatAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatAwareInterface.php',
+    'Application\Service\Interfaces\ContextAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/ContextAwareInterface.php',
+    'Application\Service\Interfaces\PaysAwareInterface'                                                  => __DIR__ . '/src/Application/Service/Interfaces/PaysAwareInterface.php',
+    'Application\Service\Interfaces\ServiceServiceAwareInterface'                                        => __DIR__ . '/src/Application/Service/Interfaces/ServiceServiceAwareInterface.php',
+    'Application\Service\Interfaces\TypeFormationAwareInterface'                                         => __DIR__ . '/src/Application/Service/Interfaces/TypeFormationAwareInterface.php',
+    'Application\Service\Interfaces\NotificationIndicateurAwareInterface'                                => __DIR__ . '/src/Application/Service/Interfaces/NotificationIndicateurAwareInterface.php',
+    'Application\Service\Interfaces\IntervenantAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/IntervenantAwareInterface.php',
+    'Application\Service\Interfaces\TypeValidationAwareInterface'                                        => __DIR__ . '/src/Application/Service/Interfaces/TypeValidationAwareInterface.php',
+    'Application\Service\Interfaces\FormuleServiceServiceAwareInterface'                                 => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceServiceAwareInterface.php',
+    'Application\Service\Interfaces\ParametresAwareInterface'                                            => __DIR__ . '/src/Application/Service/Interfaces/ParametresAwareInterface.php',
+    'Application\Service\Interfaces\FormuleIntervenantAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/FormuleIntervenantAwareInterface.php',
+    'Application\Service\Interfaces\MiseEnPaiementAwareInterface'                                        => __DIR__ . '/src/Application/Service/Interfaces/MiseEnPaiementAwareInterface.php',
+    'Application\Service\Interfaces\ModulateurAwareInterface'                                            => __DIR__ . '/src/Application/Service/Interfaces/ModulateurAwareInterface.php',
+    'Application\Service\Interfaces\TypePieceJointeStatutAwareInterface'                                 => __DIR__ . '/src/Application/Service/Interfaces/TypePieceJointeStatutAwareInterface.php',
+    'Application\Service\Interfaces\DomaineFonctionnelAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/DomaineFonctionnelAwareInterface.php',
+    'Application\Service\Interfaces\FormuleServiceModifieAwareInterface'                                 => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceModifieAwareInterface.php',
+    'Application\Service\Interfaces\CheminPedagogiqueAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/CheminPedagogiqueAwareInterface.php',
+    'Application\Service\Interfaces\PrivilegeServiceAwareInterface'                                      => __DIR__ . '/src/Application/Service/Interfaces/PrivilegeServiceAwareInterface.php',
+    'Application\Service\Interfaces\AgrementAwareInterface'                                              => __DIR__ . '/src/Application/Service/Interfaces/AgrementAwareInterface.php',
+    'Application\Service\Interfaces\AffectationAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/AffectationAwareInterface.php',
+    'Application\Service\Interfaces\FormuleResultatVolumeHoraireAwareInterface'                          => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatVolumeHoraireAwareInterface.php',
+    'Application\Service\Interfaces\EtapeAwareInterface'                                                 => __DIR__ . '/src/Application/Service/Interfaces/EtapeAwareInterface.php',
+    'Application\Service\Interfaces\TypeAgrementAwareInterface'                                          => __DIR__ . '/src/Application/Service/Interfaces/TypeAgrementAwareInterface.php',
+    'Application\Service\Interfaces\TypeInterventionAwareInterface'                                      => __DIR__ . '/src/Application/Service/Interfaces/TypeInterventionAwareInterface.php',
+    'Application\Service\Interfaces\NiveauFormationAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/NiveauFormationAwareInterface.php',
+    'Application\Service\Interfaces\MotifNonPaiementAwareInterface'                                      => __DIR__ . '/src/Application/Service/Interfaces/MotifNonPaiementAwareInterface.php',
+    'Application\Service\Interfaces\PieceJointeAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/PieceJointeAwareInterface.php',
+    'Application\Service\Interfaces\DossierAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/DossierAwareInterface.php',
+    'Application\Service\Interfaces\FormuleServiceReferentielAwareInterface'                             => __DIR__ . '/src/Application/Service/Interfaces/FormuleServiceReferentielAwareInterface.php',
+    'Application\Service\Interfaces\ModificationServiceDuAwareInterface'                                 => __DIR__ . '/src/Application/Service/Interfaces/ModificationServiceDuAwareInterface.php',
+    'Application\Service\Interfaces\CiviliteAwareInterface'                                              => __DIR__ . '/src/Application/Service/Interfaces/CiviliteAwareInterface.php',
+    'Application\Service\Interfaces\MotifModificationServiceDuAwareInterface'                            => __DIR__ . '/src/Application/Service/Interfaces/MotifModificationServiceDuAwareInterface.php',
+    'Application\Service\Interfaces\TypeStructureAwareInterface'                                         => __DIR__ . '/src/Application/Service/Interfaces/TypeStructureAwareInterface.php',
+    'Application\Service\Interfaces\TypeRessourceServiceAwareInterface'                                  => __DIR__ . '/src/Application/Service/Interfaces/TypeRessourceServiceAwareInterface.php',
+    'Application\Service\Interfaces\VolumeHoraireAwareInterface'                                         => __DIR__ . '/src/Application/Service/Interfaces/VolumeHoraireAwareInterface.php',
+    'Application\Service\Interfaces\ElementPedagogiqueAwareInterface'                                    => __DIR__ . '/src/Application/Service/Interfaces/ElementPedagogiqueAwareInterface.php',
+    'Application\Service\Interfaces\DepartementAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/DepartementAwareInterface.php',
+    'Application\Service\Interfaces\GroupeTypeFormationAwareInterface'                                   => __DIR__ . '/src/Application/Service/Interfaces/GroupeTypeFormationAwareInterface.php',
+    'Application\Service\Interfaces\FormuleResultatServiceServiceAwareInterface'                         => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatServiceServiceAwareInterface.php',
+    'Application\Service\Interfaces\ElementModulateurAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/ElementModulateurAwareInterface.php',
+    'Application\Service\Interfaces\TypePieceJointeAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/TypePieceJointeAwareInterface.php',
+    'Application\Service\Interfaces\DisciplineServiceAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/DisciplineServiceAwareInterface.php',
+    'Application\Service\Interfaces\UtilisateurAwareInterface'                                           => __DIR__ . '/src/Application/Service/Interfaces/UtilisateurAwareInterface.php',
+    'Application\Service\Interfaces\TypeIntervenantAwareInterface'                                       => __DIR__ . '/src/Application/Service/Interfaces/TypeIntervenantAwareInterface.php',
+    'Application\Service\Interfaces\SourceAwareInterface'                                                => __DIR__ . '/src/Application/Service/Interfaces/SourceAwareInterface.php',
+    'Application\Service\Interfaces\ValidationAwareInterface'                                            => __DIR__ . '/src/Application/Service/Interfaces/ValidationAwareInterface.php',
+    'Application\Service\Interfaces\EtatVolumeHoraireAwareInterface'                                     => __DIR__ . '/src/Application/Service/Interfaces/EtatVolumeHoraireAwareInterface.php',
+    'Application\Service\Interfaces\FormuleResultatVolumeHoraireReferentielAwareInterface'               => __DIR__ . '/src/Application/Service/Interfaces/FormuleResultatVolumeHoraireReferentielAwareInterface.php',
+    'Application\Service\Interfaces\FonctionReferentielAwareInterface'                                   => __DIR__ . '/src/Application/Service/Interfaces/FonctionReferentielAwareInterface.php',
+    'Application\Service\Interfaces\WfEtapeAwareInterface'                                               => __DIR__ . '/src/Application/Service/Interfaces/WfEtapeAwareInterface.php',
+    'Application\Service\Interfaces\StructureAwareInterface'                                             => __DIR__ . '/src/Application/Service/Interfaces/StructureAwareInterface.php',
+    'Application\Service\TypeRessourceService'                                                           => __DIR__ . '/src/Application/Service/TypeRessourceService.php',
+    'Application\Service\Modulateur'                                                                     => __DIR__ . '/src/Application/Service/Modulateur.php',
+    'Application\Service\TypeValidation'                                                                 => __DIR__ . '/src/Application/Service/TypeValidation.php',
+    'Application\Service\ModificationServiceDu'                                                          => __DIR__ . '/src/Application/Service/ModificationServiceDu.php',
+    'Application\Service\DotationService'                                                                => __DIR__ . '/src/Application/Service/DotationService.php',
+    'Application\Service\WorkflowService'                                                                => __DIR__ . '/src/Application/Service/WorkflowService.php',
+    'Application\Service\Departement'                                                                    => __DIR__ . '/src/Application/Service/Departement.php',
+    'Application\Service\FormuleVolumeHoraireReferentiel'                                                => __DIR__ . '/src/Application/Service/FormuleVolumeHoraireReferentiel.php',
+    'Application\Service\IndicateurService'                                                              => __DIR__ . '/src/Application/Service/IndicateurService.php',
+    'Application\Service\FormuleResultatVolumeHoraireReferentiel'                                        => __DIR__ . '/src/Application/Service/FormuleResultatVolumeHoraireReferentiel.php',
+    'Application\Service\EtatVolumeHoraire'                                                              => __DIR__ . '/src/Application/Service/EtatVolumeHoraire.php',
+    'Application\Service\TypeContrat'                                                                    => __DIR__ . '/src/Application/Service/TypeContrat.php',
+    'Application\Service\TypeAgrement'                                                                   => __DIR__ . '/src/Application/Service/TypeAgrement.php',
+    'Application\Service\ElementPedagogique'                                                             => __DIR__ . '/src/Application/Service/ElementPedagogique.php',
+    'Application\Service\MiseEnPaiementIntervenantStructure'                                             => __DIR__ . '/src/Application/Service/MiseEnPaiementIntervenantStructure.php',
+    'Application\Service\Pays'                                                                           => __DIR__ . '/src/Application/Service/Pays.php',
+    'Application\Service\Context'                                                                        => __DIR__ . '/src/Application/Service/Context.php',
+    'Application\Service\MotifModificationServiceDu'                                                     => __DIR__ . '/src/Application/Service/MotifModificationServiceDu.php',
+    'Application\Service\DisciplineService'                                                              => __DIR__ . '/src/Application/Service/DisciplineService.php',
+    'Application\Service\Annee'                                                                          => __DIR__ . '/src/Application/Service/Annee.php',
+    'Application\Service\TypeVolumeHoraire'                                                              => __DIR__ . '/src/Application/Service/TypeVolumeHoraire.php',
+    'Application\Service\Structure'                                                                      => __DIR__ . '/src/Application/Service/Structure.php',
+    'Application\Service\Perimetre'                                                                      => __DIR__ . '/src/Application/Service/Perimetre.php',
+    'Application\Service\PieceJointe'                                                                    => __DIR__ . '/src/Application/Service/PieceJointe.php',
+    'Application\Service\TypeFormation'                                                                  => __DIR__ . '/src/Application/Service/TypeFormation.php',
+    'Application\Service\Intervenant'                                                                    => __DIR__ . '/src/Application/Service/Intervenant.php',
+    'Application\Service\MotifNonPaiement'                                                               => __DIR__ . '/src/Application/Service/MotifNonPaiement.php',
+    'Application\Service\TypeHeures'                                                                     => __DIR__ . '/src/Application/Service/TypeHeures.php',
+    'Application\Service\FormuleVolumeHoraire'                                                           => __DIR__ . '/src/Application/Service/FormuleVolumeHoraire.php',
+    'Application\Service\FormuleServiceModifie'                                                          => __DIR__ . '/src/Application/Service/FormuleServiceModifie.php',
+    'Application\Service\CentreCout'                                                                     => __DIR__ . '/src/Application/Service/CentreCout.php',
+    'Application\Service\Civilite'                                                                       => __DIR__ . '/src/Application/Service/Civilite.php',
+    'Application\Service\TblAgrementService'                                                             => __DIR__ . '/src/Application/Service/TblAgrementService.php',
+    'Application\Service\Validation'                                                                     => __DIR__ . '/src/Application/Service/Validation.php',
+    'Application\Service\Traits\FormuleResultatAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/FormuleResultatAwareTrait.php',
+    'Application\Service\Traits\FormuleVolumeHoraireReferentielAwareTrait'                               => __DIR__ . '/src/Application/Service/Traits/FormuleVolumeHoraireReferentielAwareTrait.php',
+    'Application\Service\Traits\ServiceReferentielAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/ServiceReferentielAwareTrait.php',
+    'Application\Service\Traits\ModulateurAwareTrait'                                                    => __DIR__ . '/src/Application/Service/Traits/ModulateurAwareTrait.php',
+    'Application\Service\Traits\ElementModulateurAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/ElementModulateurAwareTrait.php',
+    'Application\Service\Traits\FormuleServiceReferentielAwareTrait'                                     => __DIR__ . '/src/Application/Service/Traits/FormuleServiceReferentielAwareTrait.php',
+    'Application\Service\Traits\TypeInterventionAwareTrait'                                              => __DIR__ . '/src/Application/Service/Traits/TypeInterventionAwareTrait.php',
+    'Application\Service\Traits\RegleStructureValidationServiceAwareTrait'                               => __DIR__ . '/src/Application/Service/Traits/RegleStructureValidationServiceAwareTrait.php',
+    'Application\Service\Traits\MotifModificationServiceDuAwareTrait'                                    => __DIR__ . '/src/Application/Service/Traits/MotifModificationServiceDuAwareTrait.php',
+    'Application\Service\Traits\ModificationServiceDuAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/ModificationServiceDuAwareTrait.php',
+    'Application\Service\Traits\RoleAwareTrait'                                                          => __DIR__ . '/src/Application/Service/Traits/RoleAwareTrait.php',
+    'Application\Service\Traits\FormuleResultatVolumeHoraireAwareTrait'                                  => __DIR__ . '/src/Application/Service/Traits/FormuleResultatVolumeHoraireAwareTrait.php',
+    'Application\Service\Traits\VolumeHoraireReferentielAwareTrait'                                      => __DIR__ . '/src/Application/Service/Traits/VolumeHoraireReferentielAwareTrait.php',
+    'Application\Service\Traits\ElementPedagogiqueAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/ElementPedagogiqueAwareTrait.php',
+    'Application\Service\Traits\WfEtapeAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/WfEtapeAwareTrait.php',
+    'Application\Service\Traits\MotifNonPaiementAwareTrait'                                              => __DIR__ . '/src/Application/Service/Traits/MotifNonPaiementAwareTrait.php',
+    'Application\Service\Traits\FormuleServiceServiceAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/FormuleServiceServiceAwareTrait.php',
+    'Application\Service\Traits\EtatVolumeHoraireAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/EtatVolumeHoraireAwareTrait.php',
+    'Application\Service\Traits\IndicateurServiceAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/IndicateurServiceAwareTrait.php',
+    'Application\Service\Traits\EtablissementAwareTrait'                                                 => __DIR__ . '/src/Application/Service/Traits/EtablissementAwareTrait.php',
+    'Application\Service\Traits\StructureAwareTrait'                                                     => __DIR__ . '/src/Application/Service/Traits/StructureAwareTrait.php',
+    'Application\Service\Traits\FormuleVolumeHoraireAwareTrait'                                          => __DIR__ . '/src/Application/Service/Traits/FormuleVolumeHoraireAwareTrait.php',
+    'Application\Service\Traits\TypeContratAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/TypeContratAwareTrait.php',
+    'Application\Service\Traits\TypeValidationAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/TypeValidationAwareTrait.php',
+    'Application\Service\Traits\TypeAgrementStatutAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/TypeAgrementStatutAwareTrait.php',
+    'Application\Service\Traits\TypePieceJointeAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/TypePieceJointeAwareTrait.php',
+    'Application\Service\Traits\FormuleServiceModifieAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/FormuleServiceModifieAwareTrait.php',
+    'Application\Service\Traits\VolumeHoraireAwareTrait'                                                 => __DIR__ . '/src/Application/Service/Traits/VolumeHoraireAwareTrait.php',
+    'Application\Service\Traits\FonctionReferentielAwareTrait'                                           => __DIR__ . '/src/Application/Service/Traits/FonctionReferentielAwareTrait.php',
+    'Application\Service\Traits\TypeRessourceServiceAwareTrait'                                          => __DIR__ . '/src/Application/Service/Traits/TypeRessourceServiceAwareTrait.php',
+    'Application\Service\Traits\PieceJointeAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/PieceJointeAwareTrait.php',
+    'Application\Service\Traits\NotificationIndicateurAwareTrait'                                        => __DIR__ . '/src/Application/Service/Traits/NotificationIndicateurAwareTrait.php',
+    'Application\Service\Traits\ParametresAwareTrait'                                                    => __DIR__ . '/src/Application/Service/Traits/ParametresAwareTrait.php',
+    'Application\Service\Traits\SourceAwareTrait'                                                        => __DIR__ . '/src/Application/Service/Traits/SourceAwareTrait.php',
+    'Application\Service\Traits\GroupeTypeFormationAwareTrait'                                           => __DIR__ . '/src/Application/Service/Traits/GroupeTypeFormationAwareTrait.php',
+    'Application\Service\Traits\ServiceAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/ServiceAwareTrait.php',
+    'Application\Service\Traits\TypeModulateurAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/TypeModulateurAwareTrait.php',
+    'Application\Service\Traits\MiseEnPaiementIntervenantStructureAwareTrait'                            => __DIR__ . '/src/Application/Service/Traits/MiseEnPaiementIntervenantStructureAwareTrait.php',
+    'Application\Service\Traits\ValidationAwareTrait'                                                    => __DIR__ . '/src/Application/Service/Traits/ValidationAwareTrait.php',
+    'Application\Service\Traits\TypePieceJointeStatutAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/TypePieceJointeStatutAwareTrait.php',
+    'Application\Service\Traits\CheminPedagogiqueAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/CheminPedagogiqueAwareTrait.php',
+    'Application\Service\Traits\TypeHeuresAwareTrait'                                                    => __DIR__ . '/src/Application/Service/Traits/TypeHeuresAwareTrait.php',
+    'Application\Service\Traits\ServiceServiceAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/ServiceServiceAwareTrait.php',
+    'Application\Service\Traits\PaysAwareTrait'                                                          => __DIR__ . '/src/Application/Service/Traits/PaysAwareTrait.php',
+    'Application\Service\Traits\DisciplineServiceAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/DisciplineServiceAwareTrait.php',
+    'Application\Service\Traits\DotationServiceAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/DotationServiceAwareTrait.php',
+    'Application\Service\Traits\AgrementAwareTrait'                                                      => __DIR__ . '/src/Application/Service/Traits/AgrementAwareTrait.php',
+    'Application\Service\Traits\DepartementAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/DepartementAwareTrait.php',
+    'Application\Service\Traits\TypeStructureAwareTrait'                                                 => __DIR__ . '/src/Application/Service/Traits/TypeStructureAwareTrait.php',
+    'Application\Service\Traits\FormuleResultatServiceServiceAwareTrait'                                 => __DIR__ . '/src/Application/Service/Traits/FormuleResultatServiceServiceAwareTrait.php',
+    'Application\Service\Traits\ContratAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/ContratAwareTrait.php',
+    'Application\Service\Traits\DossierAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/DossierAwareTrait.php',
+    'Application\Service\Traits\CentreCoutAwareTrait'                                                    => __DIR__ . '/src/Application/Service/Traits/CentreCoutAwareTrait.php',
+    'Application\Service\Traits\ContextAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/ContextAwareTrait.php',
+    'Application\Service\Traits\WorkflowServiceAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/WorkflowServiceAwareTrait.php',
+    'Application\Service\Traits\PerimetreAwareTrait'                                                     => __DIR__ . '/src/Application/Service/Traits/PerimetreAwareTrait.php',
+    'Application\Service\Traits\MiseEnPaiementAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/MiseEnPaiementAwareTrait.php',
+    'Application\Service\Traits\PeriodeAwareTrait'                                                       => __DIR__ . '/src/Application/Service/Traits/PeriodeAwareTrait.php',
+    'Application\Service\Traits\IntervenantAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/IntervenantAwareTrait.php',
+    'Application\Service\Traits\CampagneSaisieServiceAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/CampagneSaisieServiceAwareTrait.php',
+    'Application\Service\Traits\NiveauEtapeAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/NiveauEtapeAwareTrait.php',
+    'Application\Service\Traits\ServiceAPayerAwareTrait'                                                 => __DIR__ . '/src/Application/Service/Traits/ServiceAPayerAwareTrait.php',
+    'Application\Service\Traits\LocalContextAwareTrait'                                                  => __DIR__ . '/src/Application/Service/Traits/LocalContextAwareTrait.php',
+    'Application\Service\Traits\FormuleResultatVolumeHoraireReferentielAwareTrait'                       => __DIR__ . '/src/Application/Service/Traits/FormuleResultatVolumeHoraireReferentielAwareTrait.php',
+    'Application\Service\Traits\DomaineFonctionnelAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/DomaineFonctionnelAwareTrait.php',
+    'Application\Service\Traits\EtapeAwareTrait'                                                         => __DIR__ . '/src/Application/Service/Traits/EtapeAwareTrait.php',
+    'Application\Service\Traits\NiveauFormationAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/NiveauFormationAwareTrait.php',
+    'Application\Service\Traits\AffectationAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/AffectationAwareTrait.php',
+    'Application\Service\Traits\WfEtapeDepServiceAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/WfEtapeDepServiceAwareTrait.php',
+    'Application\Service\Traits\AnneeAwareTrait'                                                         => __DIR__ . '/src/Application/Service/Traits/AnneeAwareTrait.php',
+    'Application\Service\Traits\TypeFormationAwareTrait'                                                 => __DIR__ . '/src/Application/Service/Traits/TypeFormationAwareTrait.php',
+    'Application\Service\Traits\FormuleIntervenantAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/FormuleIntervenantAwareTrait.php',
+    'Application\Service\Traits\TypeIntervenantAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/TypeIntervenantAwareTrait.php',
+    'Application\Service\Traits\FormuleResultatServiceReferentielAwareTrait'                             => __DIR__ . '/src/Application/Service/Traits/FormuleResultatServiceReferentielAwareTrait.php',
+    'Application\Service\Traits\PrivilegeAwareTrait'                                                     => __DIR__ . '/src/Application/Service/Traits/PrivilegeAwareTrait.php',
+    'Application\Service\Traits\PilotageServiceAwareTrait'                                               => __DIR__ . '/src/Application/Service/Traits/PilotageServiceAwareTrait.php',
+    'Application\Service\Traits\PersonnelAwareTrait'                                                     => __DIR__ . '/src/Application/Service/Traits/PersonnelAwareTrait.php',
+    'Application\Service\Traits\FichierServiceAwareTrait'                                                => __DIR__ . '/src/Application/Service/Traits/FichierServiceAwareTrait.php',
+    'Application\Service\Traits\CiviliteAwareTrait'                                                      => __DIR__ . '/src/Application/Service/Traits/CiviliteAwareTrait.php',
+    'Application\Service\Traits\StatutIntervenantAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/StatutIntervenantAwareTrait.php',
+    'Application\Service\Traits\TblAgrementServiceAwareTrait'                                            => __DIR__ . '/src/Application/Service/Traits/TblAgrementServiceAwareTrait.php',
+    'Application\Service\Traits\CentreCoutEpAwareTrait'                                                  => __DIR__ . '/src/Application/Service/Traits/CentreCoutEpAwareTrait.php',
+    'Application\Service\Traits\TblPieceJointeServiceAwareTrait'                                         => __DIR__ . '/src/Application/Service/Traits/TblPieceJointeServiceAwareTrait.php',
+    'Application\Service\Traits\PrivilegeServiceAwareTrait'                                              => __DIR__ . '/src/Application/Service/Traits/PrivilegeServiceAwareTrait.php',
+    'Application\Service\Traits\TypeVolumeHoraireAwareTrait'                                             => __DIR__ . '/src/Application/Service/Traits/TypeVolumeHoraireAwareTrait.php',
+    'Application\Service\Traits\UtilisateurAwareTrait'                                                   => __DIR__ . '/src/Application/Service/Traits/UtilisateurAwareTrait.php',
+    'Application\Service\Traits\TypeAgrementAwareTrait'                                                  => __DIR__ . '/src/Application/Service/Traits/TypeAgrementAwareTrait.php',
+    'Application\Service\NotificationIndicateur'                                                         => __DIR__ . '/src/Application/Service/NotificationIndicateur.php',
+    'Application\Service\Affectation'                                                                    => __DIR__ . '/src/Application/Service/Affectation.php',
+    'Application\Service\StatutIntervenant'                                                              => __DIR__ . '/src/Application/Service/StatutIntervenant.php',
+    'Application\Service\GroupeTypeFormation'                                                            => __DIR__ . '/src/Application/Service/GroupeTypeFormation.php',
+    'Application\Service\Contrat'                                                                        => __DIR__ . '/src/Application/Service/Contrat.php',
+    'Application\Service\TypeStructure'                                                                  => __DIR__ . '/src/Application/Service/TypeStructure.php',
+    'Application\Service\MiseEnPaiement'                                                                 => __DIR__ . '/src/Application/Service/MiseEnPaiement.php',
+    'Application\Service\Utilisateur'                                                                    => __DIR__ . '/src/Application/Service/Utilisateur.php',
+    'Application\Service\Etape'                                                                          => __DIR__ . '/src/Application/Service/Etape.php',
+    'Application\Service\Role'                                                                           => __DIR__ . '/src/Application/Service/Role.php',
+    'Application\Service\ServiceService'                                                                 => __DIR__ . '/src/Application/Service/ServiceService.php',
+    'Application\Service\FormuleResultatServiceService'                                                  => __DIR__ . '/src/Application/Service/FormuleResultatServiceService.php',
+    'Application\Service\PrivilegeService'                                                               => __DIR__ . '/src/Application/Service/PrivilegeService.php',
+    'Application\Service\TblPieceJointeService'                                                          => __DIR__ . '/src/Application/Service/TblPieceJointeService.php',
+    'Application\Service\VolumeHoraireReferentiel'                                                       => __DIR__ . '/src/Application/Service/VolumeHoraireReferentiel.php',
+    'Application\Service\Parametres'                                                                     => __DIR__ . '/src/Application/Service/Parametres.php',
+    'Application\Service\FormuleResultatVolumeHoraire'                                                   => __DIR__ . '/src/Application/Service/FormuleResultatVolumeHoraire.php',
+    'Application\Service\CentreCoutEp'                                                                   => __DIR__ . '/src/Application/Service/CentreCoutEp.php',
+    'Application\Service\ServiceAPayer'                                                                  => __DIR__ . '/src/Application/Service/ServiceAPayer.php',
+    'Application\Service\CampagneSaisieService'                                                          => __DIR__ . '/src/Application/Service/CampagneSaisieService.php',
+    'Application\Service\Periode'                                                                        => __DIR__ . '/src/Application/Service/Periode.php',
+    'Application\Service\RegleStructureValidationService'                                                => __DIR__ . '/src/Application/Service/RegleStructureValidationService.php',
+    'Application\Service\FormuleServiceService'                                                          => __DIR__ . '/src/Application/Service/FormuleServiceService.php',
+    'Application\Service\NiveauFormation'                                                                => __DIR__ . '/src/Application/Service/NiveauFormation.php',
+    'Application\Service\FichierService'                                                                 => __DIR__ . '/src/Application/Service/FichierService.php',
+    'Application\Service\NavigationFactoryFactory'                                                       => __DIR__ . '/src/Application/Service/NavigationFactoryFactory.php',
+    'Application\Service\FormuleResultat'                                                                => __DIR__ . '/src/Application/Service/FormuleResultat.php',
+    'Application\Service\Etablissement'                                                                  => __DIR__ . '/src/Application/Service/Etablissement.php',
+    'Application\Service\DomaineFonctionnel'                                                             => __DIR__ . '/src/Application/Service/DomaineFonctionnel.php',
+    'Application\Service\Dossier'                                                                        => __DIR__ . '/src/Application/Service/Dossier.php',
+    'Application\Service\AbstractEntityService'                                                          => __DIR__ . '/src/Application/Service/AbstractEntityService.php',
+    'Application\Service\TypePieceJointe'                                                                => __DIR__ . '/src/Application/Service/TypePieceJointe.php',
+    'Application\Service\WfEtapeDepService'                                                              => __DIR__ . '/src/Application/Service/WfEtapeDepService.php',
+    'Application\Service\TypeIntervention'                                                               => __DIR__ . '/src/Application/Service/TypeIntervention.php',
+    'Application\Service\TypeIntervenant'                                                                => __DIR__ . '/src/Application/Service/TypeIntervenant.php',
+    'Application\Service\FormuleResultatServiceReferentiel'                                              => __DIR__ . '/src/Application/Service/FormuleResultatServiceReferentiel.php',
+    'Application\Service\AbstractService'                                                                => __DIR__ . '/src/Application/Service/AbstractService.php',
+    'Application\Service\TypeAgrementStatut'                                                             => __DIR__ . '/src/Application/Service/TypeAgrementStatut.php',
+    'Application\Service\FonctionReferentiel'                                                            => __DIR__ . '/src/Application/Service/FonctionReferentiel.php',
+    'Application\Service\Agrement'                                                                       => __DIR__ . '/src/Application/Service/Agrement.php',
+    'Application\Service\Personnel'                                                                      => __DIR__ . '/src/Application/Service/Personnel.php',
+    'Application\Service\ElementModulateur'                                                              => __DIR__ . '/src/Application/Service/ElementModulateur.php',
+    'Application\Service\Source'                                                                         => __DIR__ . '/src/Application/Service/Source.php',
+    'Application\Service\FormuleIntervenant'                                                             => __DIR__ . '/src/Application/Service/FormuleIntervenant.php',
+    'Application\Service\WfEtape'                                                                        => __DIR__ . '/src/Application/Service/WfEtape.php',
+    'Application\Service\TypePieceJointeStatut'                                                          => __DIR__ . '/src/Application/Service/TypePieceJointeStatut.php',
+    'Application\Service\FormuleServiceReferentiel'                                                      => __DIR__ . '/src/Application/Service/FormuleServiceReferentiel.php',
+    'Application\Service\LocalContext'                                                                   => __DIR__ . '/src/Application/Service/LocalContext.php',
+    'Application\Service\VolumeHoraire'                                                                  => __DIR__ . '/src/Application/Service/VolumeHoraire.php',
+    'Application\Service\NiveauEtape'                                                                    => __DIR__ . '/src/Application/Service/NiveauEtape.php',
+    'Application\Processus\ServiceReferentielProcessus'                                                  => __DIR__ . '/src/Application/Processus/ServiceReferentielProcessus.php',
+    'Application\Processus\ServiceProcessus'                                                             => __DIR__ . '/src/Application/Processus/ServiceProcessus.php',
+    'Application\Processus\ValidationEnseignementProcessus'                                              => __DIR__ . '/src/Application/Processus/ValidationEnseignementProcessus.php',
+    'Application\Processus\IntervenantProcessus'                                                         => __DIR__ . '/src/Application/Processus/IntervenantProcessus.php',
+    'Application\Processus\ValidationReferentielProcessus'                                               => __DIR__ . '/src/Application/Processus/ValidationReferentielProcessus.php',
+    'Application\Processus\Traits\ServiceProcessusAwareTrait'                                            => __DIR__ . '/src/Application/Processus/Traits/ServiceProcessusAwareTrait.php',
+    'Application\Processus\Traits\ValidationReferentielProcessusAwareTrait'                              => __DIR__ . '/src/Application/Processus/Traits/ValidationReferentielProcessusAwareTrait.php',
+    'Application\Processus\Traits\IntervenantProcessusAwareTrait'                                        => __DIR__ . '/src/Application/Processus/Traits/IntervenantProcessusAwareTrait.php',
+    'Application\Processus\Traits\ValidationEnseignementProcessusAwareTrait'                             => __DIR__ . '/src/Application/Processus/Traits/ValidationEnseignementProcessusAwareTrait.php',
+    'Application\Processus\Traits\ServiceReferentielProcessusAwareTrait'                                 => __DIR__ . '/src/Application/Processus/Traits/ServiceReferentielProcessusAwareTrait.php',
+    'Application\Processus\Traits\ContratProcessusAwareTrait'                                            => __DIR__ . '/src/Application/Processus/Traits/ContratProcessusAwareTrait.php',
+    'Application\Processus\AbstractProcessus'                                                            => __DIR__ . '/src/Application/Processus/AbstractProcessus.php',
+    'Application\Processus\ContratProcessus'                                                             => __DIR__ . '/src/Application/Processus/ContratProcessus.php',
+    'Application\Traits\RoleAwareTrait'                                                                  => __DIR__ . '/src/Application/Traits/RoleAwareTrait.php',
+    'Application\Traits\ObligatoireSelonSeuilHeuresAwareTrait'                                           => __DIR__ . '/src/Application/Traits/ObligatoireSelonSeuilHeuresAwareTrait.php',
+    'Application\Traits\NiveauEtapeAwareTrait'                                                           => __DIR__ . '/src/Application/Traits/NiveauEtapeAwareTrait.php',
+    'Application\Traits\ServiceAPayerAwareTrait'                                                         => __DIR__ . '/src/Application/Traits/ServiceAPayerAwareTrait.php',
+    'Application\Assertion\InformationAssertion'                                                         => __DIR__ . '/src/Application/Assertion/InformationAssertion.php',
+    'Application\Assertion\WorkflowAssertion'                                                            => __DIR__ . '/src/Application/Assertion/WorkflowAssertion.php',
+    'Application\Assertion\ModificationServiceDuAssertion'                                               => __DIR__ . '/src/Application/Assertion/ModificationServiceDuAssertion.php',
+    'Application\Assertion\IntervenantAssertion'                                                         => __DIR__ . '/src/Application/Assertion/IntervenantAssertion.php',
+    'Application\Assertion\ContratAssertion'                                                             => __DIR__ . '/src/Application/Assertion/ContratAssertion.php',
+    'Application\Assertion\OffreDeFormationAssertion'                                                    => __DIR__ . '/src/Application/Assertion/OffreDeFormationAssertion.php',
+    'Application\Assertion\GestionAssertion'                                                             => __DIR__ . '/src/Application/Assertion/GestionAssertion.php',
+    'Application\Assertion\AgrementAssertion'                                                            => __DIR__ . '/src/Application/Assertion/AgrementAssertion.php',
+    'Application\Assertion\BudgetAssertion'                                                              => __DIR__ . '/src/Application/Assertion/BudgetAssertion.php',
+    'Application\Assertion\PaiementAssertion'                                                            => __DIR__ . '/src/Application/Assertion/PaiementAssertion.php',
+    'Application\Assertion\ServiceAssertion'                                                             => __DIR__ . '/src/Application/Assertion/ServiceAssertion.php',
+    'Application\Assertion\DossierPiecesAssertion'                                                       => __DIR__ . '/src/Application/Assertion/DossierPiecesAssertion.php',
+    'Application\Assertion\OldAbstractAssertion'                                                         => __DIR__ . '/src/Application/Assertion/OldAbstractAssertion.php',
+    'Application\Exception\DbException'                                                                  => __DIR__ . '/src/Application/Exception/DbException.php',
+    'Application\Hydrator\Service\Interfaces\RechercheHydratorAwareInterface'                            => __DIR__ . '/src/Application/Hydrator/Service/Interfaces/RechercheHydratorAwareInterface.php',
+    'Application\Hydrator\Service\RechercheHydrator'                                                     => __DIR__ . '/src/Application/Hydrator/Service/RechercheHydrator.php',
+    'Application\Hydrator\Service\Traits\RechercheHydratorAwareTrait'                                    => __DIR__ . '/src/Application/Hydrator/Service/Traits/RechercheHydratorAwareTrait.php',
+    'Application\Filter\IntervenantEmailFormatter'                                                       => __DIR__ . '/src/Application/Filter/IntervenantEmailFormatter.php',
+    'Application\Filter\NomCompletFormatter'                                                             => __DIR__ . '/src/Application/Filter/NomCompletFormatter.php',
+    'Application\Filter\FloatFromString'                                                                 => __DIR__ . '/src/Application/Filter/FloatFromString.php',
+    'Application\Filter\StringFromFloat'                                                                 => __DIR__ . '/src/Application/Filter/StringFromFloat.php',
+    'Application\Acl\Role'                                                                               => __DIR__ . '/src/Application/Acl/Role.php',
+    'Application\View\Renderer\PhpRenderer'                                                              => __DIR__ . '/src/Application/View/Renderer/PhpRenderer.php',
+    'Application\View\Helper\Intervenant\IntervenantViewHelper'                                          => __DIR__ . '/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php',
+    'Application\View\Helper\Intervenant\FeuilleDeRouteViewHelper'                                       => __DIR__ . '/src/Application/View/Helper/Intervenant/FeuilleDeRouteViewHelper.php',
+    'Application\View\Helper\Intervenant\TotauxHetdViewHelper'                                           => __DIR__ . '/src/Application/View/Helper/Intervenant/TotauxHetdViewHelper.php',
+    'Application\View\Helper\UserProfileSelectRadioItem'                                                 => __DIR__ . '/src/Application/View/Helper/UserProfileSelectRadioItem.php',
+    'Application\View\Helper\ValidationViewHelper'                                                       => __DIR__ . '/src/Application/View/Helper/ValidationViewHelper.php',
+    'Application\View\Helper\Service\Liste'                                                              => __DIR__ . '/src/Application/View/Helper/Service/Liste.php',
+    'Application\View\Helper\Service\Resume'                                                             => __DIR__ . '/src/Application/View/Helper/Service/Resume.php',
+    'Application\View\Helper\Service\SaisieForm'                                                         => __DIR__ . '/src/Application/View/Helper/Service/SaisieForm.php',
+    'Application\View\Helper\Service\Ligne'                                                              => __DIR__ . '/src/Application/View/Helper/Service/Ligne.php',
+    'Application\View\Helper\Service\ListeFactory'                                                       => __DIR__ . '/src/Application/View/Helper/Service/ListeFactory.php',
+    'Application\View\Helper\Service\LigneFactory'                                                       => __DIR__ . '/src/Application/View/Helper/Service/LigneFactory.php',
+    'Application\View\Helper\OffreFormation\FieldsetElementPedagogiqueRecherche'                         => __DIR__ . '/src/Application/View/Helper/OffreFormation/FieldsetElementPedagogiqueRecherche.php',
+    'Application\View\Helper\OffreFormation\EtapeModulateursSaisieForm'                                  => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeModulateursSaisieForm.php',
+    'Application\View\Helper\OffreFormation\EtapeViewHelper'                                             => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeViewHelper.php',
+    'Application\View\Helper\OffreFormation\ElementPedagogiqueViewHelper'                                => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementPedagogiqueViewHelper.php',
+    'Application\View\Helper\OffreFormation\ElementCentreCoutFieldsetViewHelper'                         => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementCentreCoutFieldsetViewHelper.php',
+    'Application\View\Helper\OffreFormation\EtapeCentreCoutFormViewHelper'                               => __DIR__ . '/src/Application/View/Helper/OffreFormation/EtapeCentreCoutFormViewHelper.php',
+    'Application\View\Helper\OffreFormation\ElementModulateursSaisieFieldset'                            => __DIR__ . '/src/Application/View/Helper/OffreFormation/ElementModulateursSaisieFieldset.php',
+    'Application\View\Helper\EtablissementViewHelper'                                                    => __DIR__ . '/src/Application/View/Helper/EtablissementViewHelper.php',
+    'Application\View\Helper\Import\CheminPedagogiqueViewHelper'                                         => __DIR__ . '/src/Application/View/Helper/Import/CheminPedagogiqueViewHelper.php',
+    'Application\View\Helper\Import\IntervenantViewHelper'                                               => __DIR__ . '/src/Application/View/Helper/Import/IntervenantViewHelper.php',
+    'Application\View\Helper\Import\EtapeViewHelper'                                                     => __DIR__ . '/src/Application/View/Helper/Import/EtapeViewHelper.php',
+    'Application\View\Helper\Import\ElementPedagogiqueViewHelper'                                        => __DIR__ . '/src/Application/View/Helper/Import/ElementPedagogiqueViewHelper.php',
+    'Application\View\Helper\Import\PersonnelViewHelper'                                                 => __DIR__ . '/src/Application/View/Helper/Import/PersonnelViewHelper.php',
+    'Application\View\Helper\CartridgeViewHelper'                                                        => __DIR__ . '/src/Application/View/Helper/CartridgeViewHelper.php',
+    'Application\View\Helper\VolumeHoraire\Liste'                                                        => __DIR__ . '/src/Application/View/Helper/VolumeHoraire/Liste.php',
+    'Application\View\Helper\AgrementViewHelper'                                                         => __DIR__ . '/src/Application/View/Helper/AgrementViewHelper.php',
+    'Application\View\Helper\UserProfileSelectRadioItemFactory'                                          => __DIR__ . '/src/Application/View/Helper/UserProfileSelectRadioItemFactory.php',
+    'Application\View\Helper\AppLinkFactory'                                                             => __DIR__ . '/src/Application/View/Helper/AppLinkFactory.php',
+    'Application\View\Helper\Paiement\DemandeMiseEnPaiementViewHelper'                                   => __DIR__ . '/src/Application/View/Helper/Paiement/DemandeMiseEnPaiementViewHelper.php',
+    'Application\View\Helper\Paiement\TypeHeuresViewHelper'                                              => __DIR__ . '/src/Application/View/Helper/Paiement/TypeHeuresViewHelper.php',
+    'Application\View\Helper\FormButtonGroupViewHelper'                                                  => __DIR__ . '/src/Application/View/Helper/FormButtonGroupViewHelper.php',
+    'Application\View\Helper\FormSupprimerViewHelper'                                                    => __DIR__ . '/src/Application/View/Helper/FormSupprimerViewHelper.php',
+    'Application\View\Helper\UtilisateurViewHelper'                                                      => __DIR__ . '/src/Application/View/Helper/UtilisateurViewHelper.php',
+    'Application\View\Helper\ServiceReferentiel\Liste'                                                   => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/Liste.php',
+    'Application\View\Helper\ServiceReferentiel\FormSaisie'                                              => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/FormSaisie.php',
+    'Application\View\Helper\ServiceReferentiel\Ligne'                                                   => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/Ligne.php',
+    'Application\View\Helper\ServiceReferentiel\ListeFactory'                                            => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/ListeFactory.php',
+    'Application\View\Helper\ServiceReferentiel\FonctionReferentielViewHelper'                           => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/FonctionReferentielViewHelper.php',
+    'Application\View\Helper\ServiceReferentiel\LigneFactory'                                            => __DIR__ . '/src/Application/View/Helper/ServiceReferentiel/LigneFactory.php',
+    'Application\View\Helper\StructureViewHelper'                                                        => __DIR__ . '/src/Application/View/Helper/StructureViewHelper.php',
+    'Application\View\Helper\AppLink'                                                                    => __DIR__ . '/src/Application/View/Helper/AppLink.php',
+    'Application\Controller\NotificationController'                                                      => __DIR__ . '/src/Application/Controller/NotificationController.php',
+    'IndicateurIntervenantsMailer'                                                                       => __DIR__ . '/src/Application/Controller/NotificationController.php',
+    'Application\Controller\GestionController'                                                           => __DIR__ . '/src/Application/Controller/GestionController.php',
+    'Application\Controller\EtablissementController'                                                     => __DIR__ . '/src/Application/Controller/EtablissementController.php',
+    'Application\Controller\PaiementController'                                                          => __DIR__ . '/src/Application/Controller/PaiementController.php',
+    'Application\Controller\OffreFormationController'                                                    => __DIR__ . '/src/Application/Controller/OffreFormationController.php',
+    'Application\Controller\IndexController'                                                             => __DIR__ . '/src/Application/Controller/IndexController.php',
+    'Application\Controller\StructureController'                                                         => __DIR__ . '/src/Application/Controller/StructureController.php',
+    'Application\Controller\ModificationServiceDuController'                                             => __DIR__ . '/src/Application/Controller/ModificationServiceDuController.php',
+    'Application\Controller\OffreFormation\ModulateurController'                                         => __DIR__ . '/src/Application/Controller/OffreFormation/ModulateurController.php',
+    'Application\Controller\OffreFormation\EtapeController'                                              => __DIR__ . '/src/Application/Controller/OffreFormation/EtapeController.php',
+    'Application\Controller\OffreFormation\ElementPedagogiqueController'                                 => __DIR__ . '/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php',
+    'Application\Controller\OffreFormation\EtapeCentreCoutController'                                    => __DIR__ . '/src/Application/Controller/OffreFormation/EtapeCentreCoutController.php',
+    'Application\Controller\BudgetController'                                                            => __DIR__ . '/src/Application/Controller/BudgetController.php',
+    'Application\Controller\RechercheController'                                                         => __DIR__ . '/src/Application/Controller/RechercheController.php',
+    'Application\Controller\ServiceReferentielController'                                                => __DIR__ . '/src/Application/Controller/ServiceReferentielController.php',
+    'Application\Controller\PilotageController'                                                          => __DIR__ . '/src/Application/Controller/PilotageController.php',
+    'Application\Controller\AbstractController'                                                          => __DIR__ . '/src/Application/Controller/AbstractController.php',
+    'Application\Controller\DroitsController'                                                            => __DIR__ . '/src/Application/Controller/DroitsController.php',
+    'Application\Controller\DossierController'                                                           => __DIR__ . '/src/Application/Controller/DossierController.php',
+    'Application\Controller\ServiceController'                                                           => __DIR__ . '/src/Application/Controller/ServiceController.php',
+    'Application\Controller\AgrementController'                                                          => __DIR__ . '/src/Application/Controller/AgrementController.php',
+    'Application\Controller\IntervenantController'                                                       => __DIR__ . '/src/Application/Controller/IntervenantController.php',
+    'Application\Controller\PieceJointeController'                                                       => __DIR__ . '/src/Application/Controller/PieceJointeController.php',
+    'Application\Controller\UtilisateurController'                                                       => __DIR__ . '/src/Application/Controller/UtilisateurController.php',
+    'Application\Controller\VolumeHoraireController'                                                     => __DIR__ . '/src/Application/Controller/VolumeHoraireController.php',
+    'Application\Controller\ContratController'                                                           => __DIR__ . '/src/Application/Controller/ContratController.php',
+    'Application\Controller\Plugin\Context'                                                              => __DIR__ . '/src/Application/Controller/Plugin/Context.php',
+    'Application\Controller\Plugin\MailWithLogPluginFactory'                                             => __DIR__ . '/src/Application/Controller/Plugin/MailWithLogPluginFactory.php',
+    'Application\Controller\Plugin\MailWithLogPlugin'                                                    => __DIR__ . '/src/Application/Controller/Plugin/MailWithLogPlugin.php',
+    'Application\Controller\Plugin\Em'                                                                   => __DIR__ . '/src/Application/Controller/Plugin/Em.php',
+    'Application\Controller\DisciplineController'                                                        => __DIR__ . '/src/Application/Controller/DisciplineController.php',
+    'Application\Controller\WorkflowController'                                                          => __DIR__ . '/src/Application/Controller/WorkflowController.php',
+    'Application\Controller\IndicateurController'                                                        => __DIR__ . '/src/Application/Controller/IndicateurController.php',
+    'Application\ORM\Query\Functions\Replace'                                                            => __DIR__ . '/src/Application/ORM/Query/Functions/Replace.php',
+    'Application\ORM\Query\Functions\OseDivers\CompriseEntre'                                            => __DIR__ . '/src/Application/ORM/Query/Functions/OseDivers/CompriseEntre.php',
+    'Application\ORM\Query\Functions\OseDivers\PasHistorise'                                             => __DIR__ . '/src/Application/ORM/Query/Functions/OseDivers/PasHistorise.php',
+    'Application\ORM\Query\Functions\Convert'                                                            => __DIR__ . '/src/Application/ORM/Query/Functions/Convert.php',
+    'Application\ORM\Filter\AbstractFilter'                                                              => __DIR__ . '/src/Application/ORM/Filter/AbstractFilter.php',
+    'Application\ORM\Filter\AnneeFilter'                                                                 => __DIR__ . '/src/Application/ORM/Filter/AnneeFilter.php',
+    'Application\ORM\Filter\HistoriqueFilter'                                                            => __DIR__ . '/src/Application/ORM/Filter/HistoriqueFilter.php',
+    'Application\Util'                                                                                   => __DIR__ . '/src/Application/Util.php',
+    'Application\Resource\WorkflowResource'                                                              => __DIR__ . '/src/Application/Resource/WorkflowResource.php',
+    'Application\Constants'                                                                              => __DIR__ . '/src/Application/Constants.php',
+    'Application\Provider\Role\RoleProvider'                                                             => __DIR__ . '/src/Application/Provider/Role/RoleProvider.php',
+    'Application\Provider\Role\RoleProviderFactory'                                                      => __DIR__ . '/src/Application/Provider/Role/RoleProviderFactory.php',
+    'Application\Provider\Privilege\Privileges'                                                          => __DIR__ . '/src/Application/Provider/Privilege/Privileges.php',
+    'Application\Provider\Identity\IdentityProviderFactory'                                              => __DIR__ . '/src/Application/Provider/Identity/IdentityProviderFactory.php',
+    'Application\Provider\Identity\IdentityProvider'                                                     => __DIR__ . '/src/Application/Provider/Identity/IdentityProvider.php',
+    'Application\Form\Interfaces\DisciplineFormAwareInterface'                                           => __DIR__ . '/src/Application/Form/Interfaces/DisciplineFormAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\ModificationServiceDuFieldsetAwareInterface'                => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/ModificationServiceDuFieldsetAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\EditionFormAwareInterface'                                  => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/EditionFormAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\ModificationServiceDuFormAwareInterface'                    => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/ModificationServiceDuFormAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\HeuresCompFormAwareInterface'                               => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/HeuresCompFormAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\ContratRetourAwareInterface'                                => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/ContratRetourAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\DossierAwareInterface'                                      => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/DossierAwareInterface.php',
+    'Application\Form\Intervenant\Interfaces\MotifModificationServiceDuFieldsetAwareInterface'           => __DIR__ . '/src/Application/Form/Intervenant/Interfaces/MotifModificationServiceDuFieldsetAwareInterface.php',
+    'Application\Form\Intervenant\HeuresCompForm'                                                        => __DIR__ . '/src/Application/Form/Intervenant/HeuresCompForm.php',
+    'Application\Form\Intervenant\ContratValidation'                                                     => __DIR__ . '/src/Application/Form/Intervenant/ContratValidation.php',
+    'Application\Form\Intervenant\DossierHydrator'                                                       => __DIR__ . '/src/Application/Form/Intervenant/DossierHydrator.php',
+    'Application\Form\Intervenant\DossierFieldsetHydrator'                                               => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldsetHydrator.php',
+    'Application\Form\Intervenant\Traits\ModificationServiceDuFormAwareTrait'                            => __DIR__ . '/src/Application/Form/Intervenant/Traits/ModificationServiceDuFormAwareTrait.php',
+    'Application\Form\Intervenant\Traits\MotifModificationServiceDuFieldsetAwareTrait'                   => __DIR__ . '/src/Application/Form/Intervenant/Traits/MotifModificationServiceDuFieldsetAwareTrait.php',
+    'Application\Form\Intervenant\Traits\HeuresCompFormAwareTrait'                                       => __DIR__ . '/src/Application/Form/Intervenant/Traits/HeuresCompFormAwareTrait.php',
+    'Application\Form\Intervenant\Traits\ContratRetourAwareTrait'                                        => __DIR__ . '/src/Application/Form/Intervenant/Traits/ContratRetourAwareTrait.php',
+    'Application\Form\Intervenant\Traits\DossierAwareTrait'                                              => __DIR__ . '/src/Application/Form/Intervenant/Traits/DossierAwareTrait.php',
+    'Application\Form\Intervenant\Traits\ModificationServiceDuFieldsetAwareTrait'                        => __DIR__ . '/src/Application/Form/Intervenant/Traits/ModificationServiceDuFieldsetAwareTrait.php',
+    'Application\Form\Intervenant\Traits\EditionFormAwareTrait'                                          => __DIR__ . '/src/Application/Form/Intervenant/Traits/EditionFormAwareTrait.php',
+    'Application\Form\Intervenant\DossierFieldset'                                                       => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
+    'PaysSelect'                                                                                         => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
+    'PaysProxy'                                                                                          => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
+    'StatutSelect'                                                                                       => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
+    'StatutIntervenantProxy'                                                                             => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldset.php',
+    'Application\Form\Intervenant\ModificationServiceDuFieldset'                                         => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuFieldset.php',
+    'ModificationServiceDuFieldsetHydrator'                                                              => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuFieldset.php',
+    'Application\Form\Intervenant\DossierFieldsetDoctrineHydrator'                                       => __DIR__ . '/src/Application/Form/Intervenant/DossierFieldsetDoctrineHydrator.php',
+    'Application\Form\Intervenant\Dossier'                                                               => __DIR__ . '/src/Application/Form/Intervenant/Dossier.php',
+    'Application\Form\Intervenant\MotifModificationServiceDuFieldset'                                    => __DIR__ . '/src/Application/Form/Intervenant/MotifModificationServiceDuFieldset.php',
+    'MotifModificationServiceDuHydrator'                                                                 => __DIR__ . '/src/Application/Form/Intervenant/MotifModificationServiceDuFieldset.php',
+    'Application\Form\Intervenant\ContratRetour'                                                         => __DIR__ . '/src/Application/Form/Intervenant/ContratRetour.php',
+    'Application\Form\Intervenant\EditionForm'                                                           => __DIR__ . '/src/Application/Form/Intervenant/EditionForm.php',
+    'IntervenantFormHydrator'                                                                            => __DIR__ . '/src/Application/Form/Intervenant/EditionForm.php',
+    'Application\Form\Intervenant\ModificationServiceDuForm'                                             => __DIR__ . '/src/Application/Form/Intervenant/ModificationServiceDuForm.php',
+    'Application\Form\Supprimer'                                                                         => __DIR__ . '/src/Application/Form/Supprimer.php',
+    'Application\Form\DisciplineForm'                                                                    => __DIR__ . '/src/Application/Form/DisciplineForm.php',
+    'DisciplineFormHydrator'                                                                             => __DIR__ . '/src/Application/Form/DisciplineForm.php',
+    'Application\Form\Droits\Interfaces\RoleFormAwareInterface'                                          => __DIR__ . '/src/Application/Form/Droits/Interfaces/RoleFormAwareInterface.php',
+    'Application\Form\Droits\Interfaces\AffectationFormAwareInterface'                                   => __DIR__ . '/src/Application/Form/Droits/Interfaces/AffectationFormAwareInterface.php',
+    'Application\Form\Droits\AffectationForm'                                                            => __DIR__ . '/src/Application/Form/Droits/AffectationForm.php',
+    'AffectationFormHydrator'                                                                            => __DIR__ . '/src/Application/Form/Droits/AffectationForm.php',
+    'Application\Form\Droits\Traits\AffectationFormAwareTrait'                                           => __DIR__ . '/src/Application/Form/Droits/Traits/AffectationFormAwareTrait.php',
+    'Application\Form\Droits\Traits\RoleFormAwareTrait'                                                  => __DIR__ . '/src/Application/Form/Droits/Traits/RoleFormAwareTrait.php',
+    'Application\Form\Droits\RoleForm'                                                                   => __DIR__ . '/src/Application/Form/Droits/RoleForm.php',
+    'RoleFormHydrator'                                                                                   => __DIR__ . '/src/Application/Form/Droits/RoleForm.php',
+    'Application\Form\Service\SaisieFieldset'                                                            => __DIR__ . '/src/Application/Form/Service/SaisieFieldset.php',
+    'SaisieFieldsetHydrator'                                                                             => __DIR__ . '/src/Application/Form/Service/SaisieFieldset.php',
+    'Application\Form\Service\Interfaces\RechercheFormAwareInterface'                                    => __DIR__ . '/src/Application/Form/Service/Interfaces/RechercheFormAwareInterface.php',
+    'Application\Form\Service\Interfaces\SaisieAwareInterface'                                           => __DIR__ . '/src/Application/Form/Service/Interfaces/SaisieAwareInterface.php',
+    'Application\Form\Service\Interfaces\SaisieFieldsetAwareInterface'                                   => __DIR__ . '/src/Application/Form/Service/Interfaces/SaisieFieldsetAwareInterface.php',
+    'Application\Form\Service\RechercheFormHydrator'                                                     => __DIR__ . '/src/Application/Form/Service/RechercheFormHydrator.php',
+    'Application\Form\Service\Traits\SaisieFieldsetAwareTrait'                                           => __DIR__ . '/src/Application/Form/Service/Traits/SaisieFieldsetAwareTrait.php',
+    'Application\Form\Service\Traits\RechercheFormAwareTrait'                                            => __DIR__ . '/src/Application/Form/Service/Traits/RechercheFormAwareTrait.php',
+    'Application\Form\Service\Traits\SaisieAwareTrait'                                                   => __DIR__ . '/src/Application/Form/Service/Traits/SaisieAwareTrait.php',
+    'Application\Form\Service\Saisie'                                                                    => __DIR__ . '/src/Application/Form/Service/Saisie.php',
+    'SaisieHydrator'                                                                                     => __DIR__ . '/src/Application/Form/Service/Saisie.php',
+    'Application\Form\Service\RechercheForm'                                                             => __DIR__ . '/src/Application/Form/Service/RechercheForm.php',
+    'Application\Form\AbstractForm'                                                                      => __DIR__ . '/src/Application/Form/AbstractForm.php',
+    'Application\Form\OffreFormation\ElementModulateursFieldset'                                         => __DIR__ . '/src/Application/Form/OffreFormation/ElementModulateursFieldset.php',
+    'Application\Form\OffreFormation\Interfaces\ElementPedagogiqueSaisieAwareInterface'                  => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementPedagogiqueSaisieAwareInterface.php',
+    'Application\Form\OffreFormation\Interfaces\ElementModulateursFieldsetAwareInterface'                => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementModulateursFieldsetAwareInterface.php',
+    'Application\Form\OffreFormation\Interfaces\EtapeModulateursSaisieAwareInterface'                    => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/EtapeModulateursSaisieAwareInterface.php',
+    'Application\Form\OffreFormation\Interfaces\EtapeSaisieAwareInterface'                               => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/EtapeSaisieAwareInterface.php',
+    'Application\Form\OffreFormation\Interfaces\ElementPedagogiqueRechercheFieldsetAwareInterface'       => __DIR__ . '/src/Application/Form/OffreFormation/Interfaces/ElementPedagogiqueRechercheFieldsetAwareInterface.php',
+    'Application\Form\OffreFormation\EtapeSaisie'                                                        => __DIR__ . '/src/Application/Form/OffreFormation/EtapeSaisie.php',
+    'EtapeSaisieHydrator'                                                                                => __DIR__ . '/src/Application/Form/OffreFormation/EtapeSaisie.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\Interfaces\ElementCentreCoutFieldsetAwareInterface' => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Interfaces/ElementCentreCoutFieldsetAwareInterface.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\Interfaces\EtapeCentreCoutFormAwareInterface'       => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Interfaces/EtapeCentreCoutFormAwareInterface.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\Traits\EtapeCentreCoutFormAwareTrait'               => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Traits/EtapeCentreCoutFormAwareTrait.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\Traits\ElementCentreCoutFieldsetAwareTrait'         => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/Traits/ElementCentreCoutFieldsetAwareTrait.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\EtapeCentreCoutForm'                                => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php',
+    'EtapeCentreCoutFormHydrator'                                                                        => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php',
+    'Application\Form\OffreFormation\EtapeCentreCout\ElementCentreCoutFieldset'                          => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php',
+    'ElementCentreCoutFieldsetHydrator'                                                                  => __DIR__ . '/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php',
+    'Application\Form\OffreFormation\ElementPedagogiqueRechercheFieldset'                                => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php',
+    'Application\Form\OffreFormation\ElementPedagogiqueRechercheHydrator'                                => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueRechercheHydrator.php',
+    'Application\Form\OffreFormation\Traits\ElementPedagogiqueSaisieAwareTrait'                          => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementPedagogiqueSaisieAwareTrait.php',
+    'Application\Form\OffreFormation\Traits\ElementModulateursFieldsetAwareTrait'                        => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementModulateursFieldsetAwareTrait.php',
+    'Application\Form\OffreFormation\Traits\EtapeModulateursSaisieAwareTrait'                            => __DIR__ . '/src/Application/Form/OffreFormation/Traits/EtapeModulateursSaisieAwareTrait.php',
+    'Application\Form\OffreFormation\Traits\ElementPedagogiqueRechercheFieldsetAwareTrait'               => __DIR__ . '/src/Application/Form/OffreFormation/Traits/ElementPedagogiqueRechercheFieldsetAwareTrait.php',
+    'Application\Form\OffreFormation\Traits\EtapeSaisieAwareTrait'                                       => __DIR__ . '/src/Application/Form/OffreFormation/Traits/EtapeSaisieAwareTrait.php',
+    'Application\Form\OffreFormation\ElementPedagogiqueSaisie'                                           => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueSaisie.php',
+    'ElementPedagogiqueSaisieHydrator'                                                                   => __DIR__ . '/src/Application/Form/OffreFormation/ElementPedagogiqueSaisie.php',
+    'Application\Form\OffreFormation\ElementModulateursHydrator'                                         => __DIR__ . '/src/Application/Form/OffreFormation/ElementModulateursHydrator.php',
+    'Application\Form\OffreFormation\EtapeModulateursHydrator'                                           => __DIR__ . '/src/Application/Form/OffreFormation/EtapeModulateursHydrator.php',
+    'Application\Form\OffreFormation\EtapeModulateursSaisie'                                             => __DIR__ . '/src/Application/Form/OffreFormation/EtapeModulateursSaisie.php',
+    'Application\Form\AbstractFieldset'                                                                  => __DIR__ . '/src/Application/Form/AbstractFieldset.php',
+    'Application\Form\Agrement\Interfaces\SaisieAwareInterface'                                          => __DIR__ . '/src/Application/Form/Agrement/Interfaces/SaisieAwareInterface.php',
+    'Application\Form\Agrement\Traits\SaisieAwareTrait'                                                  => __DIR__ . '/src/Application/Form/Agrement/Traits/SaisieAwareTrait.php',
+    'Application\Form\Agrement\Saisie'                                                                   => __DIR__ . '/src/Application/Form/Agrement/Saisie.php',
+    'Application\Form\Traits\DisciplineFormAwareTrait'                                                   => __DIR__ . '/src/Application/Form/Traits/DisciplineFormAwareTrait.php',
+    'Application\Form\VolumeHoraire\Interfaces\SaisieAwareInterface'                                     => __DIR__ . '/src/Application/Form/VolumeHoraire/Interfaces/SaisieAwareInterface.php',
+    'Application\Form\VolumeHoraire\Interfaces\SaisieMultipleFieldsetAwareInterface'                     => __DIR__ . '/src/Application/Form/VolumeHoraire/Interfaces/SaisieMultipleFieldsetAwareInterface.php',
+    'Application\Form\VolumeHoraire\SaisieMultipleHydrator'                                              => __DIR__ . '/src/Application/Form/VolumeHoraire/SaisieMultipleHydrator.php',
+    'Application\Form\VolumeHoraire\Traits\SaisieMultipleFieldsetAwareTrait'                             => __DIR__ . '/src/Application/Form/VolumeHoraire/Traits/SaisieMultipleFieldsetAwareTrait.php',
+    'Application\Form\VolumeHoraire\Traits\SaisieAwareTrait'                                             => __DIR__ . '/src/Application/Form/VolumeHoraire/Traits/SaisieAwareTrait.php',
+    'Application\Form\VolumeHoraire\Saisie'                                                              => __DIR__ . '/src/Application/Form/VolumeHoraire/Saisie.php',
+    'Application\Form\VolumeHoraire\SaisieMultipleFieldset'                                              => __DIR__ . '/src/Application/Form/VolumeHoraire/SaisieMultipleFieldset.php',
+    'Application\Form\Paiement\Interfaces\MiseEnPaiementFormAwareInterface'                              => __DIR__ . '/src/Application/Form/Paiement/Interfaces/MiseEnPaiementFormAwareInterface.php',
+    'Application\Form\Paiement\Interfaces\MiseEnPaiementRechercheFormAwareInterface'                     => __DIR__ . '/src/Application/Form/Paiement/Interfaces/MiseEnPaiementRechercheFormAwareInterface.php',
+    'Application\Form\Paiement\Traits\MiseEnPaiementFormAwareTrait'                                      => __DIR__ . '/src/Application/Form/Paiement/Traits/MiseEnPaiementFormAwareTrait.php',
+    'Application\Form\Paiement\Traits\MiseEnPaiementRechercheFormAwareTrait'                             => __DIR__ . '/src/Application/Form/Paiement/Traits/MiseEnPaiementRechercheFormAwareTrait.php',
+    'Application\Form\Paiement\MiseEnPaiementForm'                                                       => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementForm.php',
+    'Application\Form\Paiement\MiseEnPaiementRechercheForm'                                              => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php',
+    'MiseEnPaiementRechercheFormHydrator'                                                                => __DIR__ . '/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php',
+    'Application\Form\ServiceReferentiel\SaisieFieldset'                                                 => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieFieldset.php',
+    'Application\Form\ServiceReferentiel\Interfaces\SaisieAwareInterface'                                => __DIR__ . '/src/Application/Form/ServiceReferentiel/Interfaces/SaisieAwareInterface.php',
+    'Application\Form\ServiceReferentiel\Interfaces\SaisieFieldsetAwareInterface'                        => __DIR__ . '/src/Application/Form/ServiceReferentiel/Interfaces/SaisieFieldsetAwareInterface.php',
+    'Application\Form\ServiceReferentiel\Traits\SaisieFieldsetAwareTrait'                                => __DIR__ . '/src/Application/Form/ServiceReferentiel/Traits/SaisieFieldsetAwareTrait.php',
+    'Application\Form\ServiceReferentiel\Traits\SaisieAwareTrait'                                        => __DIR__ . '/src/Application/Form/ServiceReferentiel/Traits/SaisieAwareTrait.php',
+    'Application\Form\ServiceReferentiel\SaisieFieldsetHydrator'                                         => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieFieldsetHydrator.php',
+    'Application\Form\ServiceReferentiel\SaisieHydrator'                                                 => __DIR__ . '/src/Application/Form/ServiceReferentiel/SaisieHydrator.php',
+    'Application\Form\ServiceReferentiel\Saisie'                                                         => __DIR__ . '/src/Application/Form/ServiceReferentiel/Saisie.php',
+    'Application\Form\Workflow\Traits\DependanceFormAwareTrait'                                          => __DIR__ . '/src/Application/Form/Workflow/Traits/DependanceFormAwareTrait.php',
+    'Application\Form\Workflow\DependanceForm'                                                           => __DIR__ . '/src/Application/Form/Workflow/DependanceForm.php',
+    'DependanceFormHydrator'                                                                             => __DIR__ . '/src/Application/Form/Workflow/DependanceForm.php',
+    'Application\Form\Budget\Interfaces\DotationSaisieFormAwareInterface'                                => __DIR__ . '/src/Application/Form/Budget/Interfaces/DotationSaisieFormAwareInterface.php',
+    'Application\Form\Budget\Traits\DotationSaisieFormAwareTrait'                                        => __DIR__ . '/src/Application/Form/Budget/Traits/DotationSaisieFormAwareTrait.php',
+    'Application\Form\Budget\DotationSaisieForm'                                                         => __DIR__ . '/src/Application/Form/Budget/DotationSaisieForm.php',
 );
diff --git a/module/Application/config/indicateur.config.php b/module/Application/config/indicateur.config.php
index 6417b6798e3f5657cbb2b72ea3343e1b3cdf3c13..1388e9aebce4e99b2514b948a291b899e16ae5d0 100644
--- a/module/Application/config/indicateur.config.php
+++ b/module/Application/config/indicateur.config.php
@@ -142,40 +142,6 @@ return [
         'invokables'   => [
             'applicationIndicateur'                    => Service\IndicateurService::class,
             'NotificationIndicateurService'            => Service\NotificationIndicateur::class,
-            'AttenteAgrementCR'                        => Service\Indicateur\Agrement\AttenteAgrementCRIndicateurImpl::class,
-            'AttenteAgrementCA'                        => Service\Indicateur\Agrement\AttenteAgrementCAIndicateurImpl::class,
-            'AgrementCAMaisPasContrat'                 => Service\Indicateur\Contrat\AgrementCAMaisPasContratIndicateurImpl::class,
-            'AttenteContrat'                           => Service\Indicateur\Contrat\AttenteContratIndicateurImpl::class,
-            'AttenteAvenant'                           => Service\Indicateur\Contrat\AttenteAvenantIndicateurImpl::class,
-            'AttenteRetourContrat'                     => Service\Indicateur\Contrat\AttenteRetourContratIndicateurImpl::class,
-            'ContratAvenantDeposes'                    => Service\Indicateur\Contrat\ContratAvenantDeposesIndicateurImpl::class,
-            'SaisieServiceApresContratAvenant'         => Service\Indicateur\Contrat\SaisieServiceApresContratAvenantIndicateurImpl::class,
-            'AttenteValidationDonneesPerso'            => Service\Indicateur\Dossier\AttenteValidationDonneesPersoIndicateurImpl::class,
-            'DonneesPersoDiffImport'                   => Service\Indicateur\Dossier\DonneesPersoDiffImportIndicateurImpl::class,
-            'DonneesPersoModif'                        => Service\Indicateur\Dossier\DonneesPersoModifIndicateurImpl::class,
-            'AttenteDemandeMepVac'                     => Service\Indicateur\Paiement\AttenteDemandeMepVacIndicateurImpl::class,
-            'AttenteDemandeMepPerm'                    => Service\Indicateur\Paiement\AttenteDemandeMepPermIndicateurImpl::class,
-            'AttenteMepVac'                            => Service\Indicateur\Paiement\AttenteMepVacIndicateurImpl::class,
-            'AttenteMepPerm'                           => Service\Indicateur\Paiement\AttenteMepPermIndicateurImpl::class,
-            'AttentePieceJustif'                       => Service\Indicateur\PieceJointe\AttentePieceJustifIndicateurImpl::class,
-            'AttenteValidationPieceJustif'             => Service\Indicateur\PieceJointe\AttenteValidationPieceJustifIndicateurImpl::class,
-            'PermAffectAutreIntervMeme'                => Service\Indicateur\Service\Affectation\PermAffectAutreIntervMemeIndicateurImpl::class,
-            'PermAffectMemeIntervAutre'                => Service\Indicateur\Service\Affectation\PermAffectMemeIntervAutreIndicateurImpl::class,
-            'BiatssAffectMemeIntervAutre'              => Service\Indicateur\Service\Affectation\BiatssAffectMemeIntervAutreIndicateurImpl::class,
-            'PlafondHcPrevuHorsRemuFcDepasse'          => Service\Indicateur\Service\Plafond\PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl::class,
-            'PlafondHcRealiseHorsRemuFcDepasse'        => Service\Indicateur\Service\Plafond\PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl::class,
-            'PlafondRefPrevuDepasse'                   => Service\Indicateur\Service\Plafond\PlafondRefPrevuDepasseIndicateurImpl::class,
-            'PlafondRefRealiseDepasse'                 => Service\Indicateur\Service\Plafond\PlafondRefRealiseDepasseIndicateurImpl::class,
-            'AttenteValidationEnsPrevuVac'             => Service\Indicateur\Service\Validation\Enseignement\Prevu\AttenteValidationVacIndicateurImpl::class,
-            'AttenteValidationEnsPrevuPerm'            => Service\Indicateur\Service\Validation\Enseignement\Prevu\AttenteValidationPermIndicateurImpl::class,
-            'AttenteValidationEnsRealiseVac'           => Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationVacIndicateurImpl::class,
-            'AttenteValidationEnsRealisePerm'          => Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationPermIndicateurImpl::class,
-            'AttenteValidationEnsRealisePermAutreComp' => Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationPermAutreCompIndicateurImpl::class,
-            'AttenteValidationRefPrevuPerm'            => Service\Indicateur\Service\Validation\Referentiel\Prevu\AttenteValidationPermIndicateurImpl::class,
-            'AttenteValidationRefRealisePerm'          => Service\Indicateur\Service\Validation\Referentiel\Realise\AttenteValidationPermIndicateurImpl::class,
-            'AttenteValidationRefRealisePermAutreComp' => Service\Indicateur\Service\Validation\Referentiel\Realise\AttenteValidationPermAutreCompIndicateurImpl::class,
-            'EnsHisto'                                 => Service\Indicateur\Service\EnsHistoIndicateurImpl::class,
-            'EnsRealisePermSaisieNonCloturee'          => Service\Indicateur\Service\EnsRealisePermSaisieNonClotureeIndicateurImpl::class,
         ],
     ],
 ];
\ No newline at end of file
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 308fc0b13a5e089e7245d9f9b091ee1021d2e37f..3f23f85b861e0c6cfcb2791ce08296b2957d1369 100755
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -234,6 +234,7 @@ $main = [
             '115_' => 'js/droits.js',
             '116_' => 'js/piece-jointe.js',
             '117_' => 'https://gest.unicaen.fr/public/bootstrap-select-1.9.4/dist/js/bootstrap-select.min.js',
+            '118_' => 'js/indicateur.js',
         ],
         'stylesheets'    => [
             '010_jquery-ui'           => 'https://gest.unicaen.fr/public/jquery-ui-1.11.4.minimal/jquery-ui.min.css',
diff --git a/module/Application/config/validation.config.php b/module/Application/config/validation.config.php
index 428297e0fc8e3b308501988784d10a69bb95bb60..131b4e017e0611b4569de6d8d0bfe4882dea82a4 100644
--- a/module/Application/config/validation.config.php
+++ b/module/Application/config/validation.config.php
@@ -3,7 +3,6 @@
 namespace Application;
 
 use Application\Entity\Db\WfEtape;
-use UnicaenAuth\Guard\PrivilegeController;
 
 return [
     'router' => [
diff --git a/module/Application/src/Application/Acl/Role.php b/module/Application/src/Application/Acl/Role.php
index ac060da6c76cf53ae9628aa5b933ab2694280f0a..b334bd5c994e70ed8b4d1a8b1f16fd19ef2edcdc 100644
--- a/module/Application/src/Application/Acl/Role.php
+++ b/module/Application/src/Application/Acl/Role.php
@@ -28,7 +28,10 @@ class Role extends NamedRole
      */
     protected $privileges = [];
 
-
+    /**
+     * @var \Application\Entity\Db\Role
+     */
+    protected $dbRole;
 
     const ROLE_ID = 'role';
 
@@ -41,7 +44,31 @@ class Role extends NamedRole
 
 
 
-    public function initPrivileges( array $privileges )
+    /**
+     * @return \Application\Entity\Db\Role
+     */
+    public function getDbRole()
+    {
+        return $this->dbRole;
+    }
+
+
+
+    /**
+     * @param \Application\Entity\Db\Role $dbRole
+     *
+     * @return Role
+     */
+    public function setDbRole($dbRole)
+    {
+        $this->dbRole = $dbRole;
+
+        return $this;
+    }
+
+
+
+    public function initPrivileges(array $privileges)
     {
         $this->privileges = $privileges;
     }
@@ -55,11 +82,12 @@ class Role extends NamedRole
 
 
 
-    public function hasPrivilege( $privilege )
+    public function hasPrivilege($privilege)
     {
-        if ($privilege instanceof Privilege){
+        if ($privilege instanceof Privilege) {
             $privilege = $privilege->getFullCode();
         }
+
         return in_array($privilege, $this->privileges);
     }
 
diff --git a/module/Application/src/Application/Assertion/GestionAssertion.php b/module/Application/src/Application/Assertion/GestionAssertion.php
index 33b8711a546fd1d7f3876aaf23d5ca4a6c7d3725..d759b2d0fc140ef50d07d51a9a4726cf1c68b498 100644
--- a/module/Application/src/Application/Assertion/GestionAssertion.php
+++ b/module/Application/src/Application/Assertion/GestionAssertion.php
@@ -15,20 +15,36 @@ use Application\Acl\Role;
  */
 class GestionAssertion extends AbstractAssertion
 {
+    /**
+     * @var boolean[]
+     */
+    protected $cache=[];
+
+
 
     protected function assertController($controller, $action = null, $privilege = null)
     {
-        $role        = $this->getRole();
+        $role = $this->getRole();
 
-        // Si le rôle n'est pas renseigné alors on s'en va...
-        if (!$role instanceof Role) return false;
-        // pareil si le rôle ne possède pas le privilège adéquat
-        if ($privilege && !$role->hasPrivilege($privilege)) return false;
+        $key = $controller.'.'.$action.'>'.$privilege;
 
-        if ($role->getIntervenant()) return false; // les intervenants n'ont pour le moment pas accès au menu Gestion
-
-        return true;
+        if (!isset($this->cache[$key])){
+            $this->cache[$key] = $this->asserts([
+                $role instanceof Role,
+                $this->assertIntervenant($role, $privilege)
+            ]);
+        }
+        return $this->cache[$key];
     }
 
 
+
+    protected function assertIntervenant( Role $role, $privilege )
+    {
+        return $this->asserts([
+            !$privilege || $role->hasPrivilege($privilege), // pareil si le rôle ne possède pas le privilège adéquat
+            !$role->getIntervenant() // les intervenants n'ont pour le moment pas accès au menu Gestion
+        ]);
+    }
+
 }
\ No newline at end of file
diff --git a/module/Application/src/Application/Assertion/ServiceAssertion.php b/module/Application/src/Application/Assertion/ServiceAssertion.php
index ae92a2b22fd237841ecbd5286223ec44a7563630..7fe1982d3f0d0a42e9e2424ff58ab592afe1adbd 100755
--- a/module/Application/src/Application/Assertion/ServiceAssertion.php
+++ b/module/Application/src/Application/Assertion/ServiceAssertion.php
@@ -280,15 +280,16 @@ class ServiceAssertion extends AbstractAssertion
 
     protected function assertCloture(Role $role, Intervenant $intervenant)
     {
-        if (!$role->hasPrivilege(Privileges::CLOTURE_EDITION_SERVICES)) { // si on peut éditer toujours alors pas la peine de tester...
-            $cloture = $this->getServiceValidation()->getValidationClotureServices($intervenant);
-            if ($cloture->getId() !== null) return false; // pas de saisie si c'est clôturé
-        }else{
-            if ($intervenant->hasMiseEnPaiement()){
-                return false;
+        if ($intervenant->getStatut()->getPeutCloturerSaisie()) {
+            if (!$role->hasPrivilege(Privileges::CLOTURE_EDITION_SERVICES)) { // si on peut éditer toujours alors pas la peine de tester...
+                $cloture = $this->getServiceValidation()->getValidationClotureServices($intervenant);
+                if ($cloture->getId() !== null) return false; // pas de saisie si c'est clôturé
+            } else {
+                if ($intervenant->hasMiseEnPaiement()) {
+                    return false;
+                }
             }
         }
-
         return true;
     }
 
diff --git a/module/Application/src/Application/Controller/IndicateurController.php b/module/Application/src/Application/Controller/IndicateurController.php
index cc234618bb9acf8df390f16580ceb69d1d0aa74a..882096bb042f9bcecac8285f95e644c87626e6c0 100644
--- a/module/Application/src/Application/Controller/IndicateurController.php
+++ b/module/Application/src/Application/Controller/IndicateurController.php
@@ -2,86 +2,66 @@
 
 namespace Application\Controller;
 
-use Application\Entity\Db\Structure as StructureEntity;
+use Application\Entity\Db\Structure;
 use Application\Entity\Db\VIndicModifDossier;
 use Application\Service\Indicateur as IndicateurService;
-use Application\Service\NotificationIndicateur as NotificationIndicateurService;
 use Application\Entity\Db\Indicateur;
+use Application\Service\Traits\AffectationAwareTrait;
+use Application\Service\Traits\NotificationIndicateurAwareTrait;
 use Doctrine\ORM\Query\Expr\Join;
 use Exception;
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
 
-/**
- * Opérations autour des notifications.
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
+
 class IndicateurController extends AbstractController
 {
     use \Application\Service\Traits\IndicateurServiceAwareTrait;
     use \Application\Service\Traits\IntervenantAwareTrait;
     use \Application\Service\Traits\ContextAwareTrait;
+    use NotificationIndicateurAwareTrait;
+    use AffectationAwareTrait;
+
 
 
     /**
      * Liste des indicateurs.
-     * 
+     *
      * @return ViewModel
      */
     public function indexAction()
     {
-        $indicateurs     = $this->getServiceIndicateur()->getList();
-        $indicateursImpl = $this->getServiceIndicateur()->getIndicateursImpl($indicateurs, $this->getStructure());
-        $serviceNotif    = $this->getServiceNotificationIndicateur();
-        $personnel       = $this->getServiceContext()->getSelectedIdentityRole()->getPersonnel();
-        
-        $qb = $serviceNotif->finderByPersonnel($personnel);
-        if ($this->getStructure()) {
-            $qb = $serviceNotif->finderByStructure($this->getStructure(), $qb);
-        }
-        $abonnements = $abonnementsInfos = [];
-        foreach ($qb->getQuery()->getResult() as $notificationIndicateur) {
-            $indicateur = $notificationIndicateur->getIndicateur();
-            $abonnements[$indicateur->getId()] = $notificationIndicateur;
-            $abonnementsInfos[$indicateur->getId()] = $notificationIndicateur->getExtraInfos();
+        $indicateurs   = $this->getServiceIndicateur()->getList();
+        $notifications = $this->getServiceNotificationIndicateur()->getList(
+            $this->getServiceNotificationIndicateur()->finderByRole()
+        );
+
+        $abonnements = [];
+        foreach ($notifications as $notification) {
+            $abonnements[$notification->getIndicateur()->getId()] = $notification;
         }
-        
-        $viewModel = new ViewModel();
-        $viewModel->setVariables([
-            'indicateurs'      => $indicateurs,
-            'indicateursImpl'  => $indicateursImpl,
-            'abonnementUrl'    => $this->url()->fromRoute('indicateur/abonner', ['indicateur' => '_indicateur_']),
-            'abonnements'      => $abonnements,
-            'abonnementsInfos' => $abonnementsInfos,
-        ]);
-        
-        return $viewModel;
+
+        return compact('indicateurs', 'abonnements');
     }
-    
-    /**
-     * Affichage du résultat complet renvoyé par un indicateur.
-     * 
-     * @return ViewModel
-     */
+
+
+
     public function resultAction()
     {
         $role       = $this->getServiceContext()->getSelectedIdentityRole();
         $indicateur = $this->getEvent()->getParam('indicateur');
+        /* @var $indicateur Indicateur */
         $indicateur->setServiceIndicateur($this->getServiceIndicateur());
-        $structure  = $role->getStructure() ?: $this->getEvent()->getParam('structure');
 
-        $indicateurImpl = $this->getServiceIndicateur()->getIndicateurImpl($indicateur, $structure);
-        
-        $viewModel = new ViewModel();
-        $viewModel->setVariables([
-            'indicateur'     => $indicateur,
-            'indicateurImpl' => $indicateurImpl,
-        ]);
+        $structure = $role->getStructure() ?: $this->getEvent()->getParam('structure');
 
-        return $viewModel;
+        /* @var $structure Structure */
+
+        return compact('indicateur', 'structure');
     }
 
+
+
     /**
      * Affichage du résultat complet renvoyé par un indicateur.
      *
@@ -94,14 +74,16 @@ class IndicateurController extends AbstractController
         $indicateur->setServiceIndicateur($this->getServiceIndicateur());
         /* @var $indicateur Indicateur */
         $indicateur->setServiceIndicateur($this->getServiceIndicateur());
-        $structure  = $role->getStructure() ?: $this->getEvent()->getParam('structure');
+        $structure = $role->getStructure() ?: $this->getEvent()->getParam('structure');
 
         return compact('indicateur');
     }
 
+
+
     /**
      * Affichage d'un item du résultat renvoyé par l'indicateur "DonneesPersoDiffImport".
-     * 
+     *
      * @return ViewModel
      */
     public function resultItemDonneesPersoDiffImportAction()
@@ -116,6 +98,8 @@ class IndicateurController extends AbstractController
         return $viewModel;
     }
 
+
+
     /**
      * Affichage d'un item du résultat renvoyé par l'indicateur "DonneesPersoModif".
      *
@@ -146,6 +130,8 @@ class IndicateurController extends AbstractController
         return $viewModel;
     }
 
+
+
     /**
      * Suppression de l'historique des modifications sur les données personnelles.
      *
@@ -177,9 +163,11 @@ class IndicateurController extends AbstractController
         return $viewModel;
     }
 
+
+
     /**
      * Réponse aux requêtes AJAX d'abonnement de l'utilisateur connecté aux notifications concernant un indicateur.
-     * 
+     *
      * @return JsonModel
      */
     public function abonnerAction()
@@ -187,80 +175,63 @@ class IndicateurController extends AbstractController
         if (!$this->getRequest()->isXmlHttpRequest()) {
             return $this->redirect()->toRoute('home');
         }
-        
-        $indicateur   = $this->context()->mandatory()->indicateurFromRoute();
-        $frequence    = $this->params()->fromPost('abonnement');
-        $personnel    = $this->getServiceContext()->getSelectedIdentityRole()->getPersonnel();
+
+        $indicateur = $this->getEvent()->getParam('indicateur');
+        $frequence  = $this->params()->fromPost('notification');
+        $inHome     = $this->params()->fromPost('in-home') == '1';
+
         $serviceNotif = $this->getServiceNotificationIndicateur();
-        $status       = 'success';
-        
-        $notificationIndicateur = null;
+
         try {
-            $notificationIndicateur = $serviceNotif->abonner($personnel, $indicateur, $frequence, $this->getStructure());
-            $message = $serviceNotif->getMessage(PHP_EOL);
+            $notificationIndicateur = $serviceNotif->abonner($indicateur, $frequence, $inHome);
+            $status                 = 'success';
+            $message                = 'Demande prise en compte';
+            if (!$notificationIndicateur) {
+                $message .= ' (Abonnement supprimé)';
+            }
+        } catch (Exception $e) {
+            $notificationIndicateur = null;
+            $status                 = 'error';
+            $message                = "Abonnement impossible: {$e->getMessage()}";
         }
-        catch (Exception $e) {
-            $status  = 'error';
-            $message = "Abonnement de $personnel impossible: {$e->getMessage()}";
-        }
-        
+
         return new JsonModel([
             'status'  => $status,
             'message' => $message,
             'infos'   => $notificationIndicateur ? $notificationIndicateur->getExtraInfos() : null,
         ]);
     }
-    
+
+
+
     /**
      * Indicateurs auxquels est abonné l'utilisateur (un Personnel) spécifié dans la requête.
-     * 
+     *
      * @return ViewModel
      */
     public function abonnementsAction()
     {
-        $personnel    = $this->context()->mandatory()->personnelFromRoute();
-        $serviceNotif = $this->getServiceNotificationIndicateur();
-        
-        $qb = $serviceNotif->finderByPersonnel($personnel);
-        $qb
-                ->join("ni.indicateur", "i")
-                ->orderBy("i.type, i.ordre");
-        $abonnements = $abonnementsInfos = $indicateurs = [];
-        foreach ($qb->getQuery()->getResult() as $notificationIndicateur) {
-            $indicateur = $notificationIndicateur->getIndicateur();
-            $indicateur->setServiceIndicateur($this->getServiceIndicateur());
-            $indicateurs[$indicateur->getId()] = $indicateur;
-            $abonnements[$indicateur->getId()] = $notificationIndicateur;
-            $abonnementsInfos[$indicateur->getId()] = $notificationIndicateur->getExtraInfos();
+        $sab = $this->getServiceNotificationIndicateur();
+        $saf = $this->getServiceAffectation();
+        $sid = $this->getServiceIndicateur();
+
+        $qb = $sab->finderByRole(); // filtre selon le rôle courant
+        $sab->join($sid, $qb, 'indicateur', true);
+        $sab->finderByInHome(true, $qb);
+
+        $sab->join($saf, $qb, 'affectation');
+        $saf->finderByHistorique($qb);
+
+        $sid->orderBy($qb);
+
+        $notifications = $sab->getList($qb);
+
+        $indicateurs = [];
+        foreach( $notifications as $notification ){
+            $indicateurs[] = $notification->getIndicateur()->setServiceIndicateur($sid);
         }
-        
-        $indicateursImpl = $this->getServiceIndicateur()->getIndicateursImpl($indicateurs, $this->getStructure());
-        
-        $viewModel = new ViewModel();
-        $viewModel->setVariables([
-            'indicateurs'      => $indicateurs,
-            'indicateursImpl'  => $indicateursImpl,
-            'abonnements'      => $abonnements,
-            'abonnementsInfos' => $abonnementsInfos,
-        ]);
-        
-        return $viewModel;
-    }
-    
-    /**
-     * @return StructureEntity
-     */
-    private function getStructure()
-    {
-        $role = $this->getServiceContext()->getSelectedIdentityRole();
-        return $role->getStructure();
-    }
-    
-    /**
-     * @return NotificationIndicateurService
-     */
-    private function getServiceNotificationIndicateur()
-    {
-        return $this->getServiceLocator()->get('NotificationIndicateurService');
+
+        return compact('indicateurs');
     }
+
 }
\ No newline at end of file
diff --git a/module/Application/src/Application/Controller/PieceJointeController.php b/module/Application/src/Application/Controller/PieceJointeController.php
index d6041aeea2cfd02c070fb91182a99c27eb9c9a5d..4989cd023a9653374e208e08d32f7c2a6e024b41 100644
--- a/module/Application/src/Application/Controller/PieceJointeController.php
+++ b/module/Application/src/Application/Controller/PieceJointeController.php
@@ -6,6 +6,7 @@ use Application\Entity\Db\Intervenant;
 use Application\Entity\Db\PieceJointe;
 use Application\Entity\Db\TypePieceJointe;
 use Application\Entity\Db\TypePieceJointeStatut;
+use Application\Exception\DbException;
 use Application\Provider\Privilege\Privileges;
 use Application\Service\Traits\PieceJointeAwareTrait;
 use Zend\Http\Response;
@@ -16,7 +17,6 @@ use Application\Service\Traits\ContextAwareTrait;
 /**
  * Description of UploadController
  *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
  */
 class PieceJointeController extends AbstractController
 {
@@ -152,7 +152,12 @@ class PieceJointeController extends AbstractController
         $this->initFilters();
 
         $pj = $this->getEvent()->getParam('pieceJointe');
-        $this->getServicePieceJointe()->valider($pj);
+//        try {
+            $this->getServicePieceJointe()->valider($pj);
+ //           $this->flashMessenger()->addSuccessMessage('Validation effectuée');
+ //       }catch(\Exception $e){
+ //           $this->flashMessenger()->addErrorMessage( DbException::translate($e)->getMessage() );
+ //       }
 
         $viewModel = new ViewModel();
         $viewModel->setTemplate('application/piece-jointe/validation');
diff --git a/module/Application/src/Application/Controller/VolumeHoraireController.php b/module/Application/src/Application/Controller/VolumeHoraireController.php
index 5c8aa2bcd8d59051e416e45d41abd32b23c2b33f..0561df67e6fee979c71f02ec08aee78fa8031273 100644
--- a/module/Application/src/Application/Controller/VolumeHoraireController.php
+++ b/module/Application/src/Application/Controller/VolumeHoraireController.php
@@ -34,6 +34,8 @@ class VolumeHoraireController extends AbstractController
         if (! $service) throw new RuntimeException("Service non spécifié ou introuvable.");
 
         $typeVolumeHoraire = $this->context()->typeVolumeHoraireFromQueryPost('type-volume-horaire');
+
+        $service->setTypeVolumeHoraire($typeVolumeHoraire);
         $readOnly           = 1 == (int)$this->params()->fromQuery('read-only', 0);
 
         $volumeHoraireListe = $service->getVolumeHoraireListe()->setTypeVolumehoraire( $typeVolumeHoraire );
diff --git a/module/Application/src/Application/Entity/Db/ElementPedagogique.php b/module/Application/src/Application/Entity/Db/ElementPedagogique.php
index 0af76c770d9823fff1584f9528069b3c324e9f60..d795a6ed232de0f54129030f30e0327c6a200b52 100644
--- a/module/Application/src/Application/Entity/Db/ElementPedagogique.php
+++ b/module/Application/src/Application/Entity/Db/ElementPedagogique.php
@@ -9,8 +9,12 @@ use Application\Entity\Db\Traits\EtapeAwareTrait;
 use Application\Entity\Db\Traits\PeriodeAwareTrait;
 use Application\Entity\Db\Traits\SourceAwareTrait;
 use Application\Entity\Db\Traits\StructureAwareTrait;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Common\Persistence\ObjectManagerAware;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 use UnicaenApp\Entity\HistoriqueAwareTrait;
+use UnicaenApp\Service\EntityManagerAwareTrait;
 use UnicaenImport\Entity\Db\Interfaces\ImportAwareInterface;
 use UnicaenImport\Entity\Db\Traits\ImportAwareTrait;
 use Zend\Permissions\Acl\Resource\ResourceInterface;
@@ -18,7 +22,7 @@ use Zend\Permissions\Acl\Resource\ResourceInterface;
 /**
  * ElementPedagogique
  */
-class ElementPedagogique implements HistoriqueAwareInterface, AnneeAwareInterface, ResourceInterface, ImportAwareInterface
+class ElementPedagogique implements HistoriqueAwareInterface, AnneeAwareInterface, ResourceInterface, ImportAwareInterface, ObjectManagerAware
 {
     use HistoriqueAwareTrait;
     use DisciplineAwareTrait;
@@ -27,6 +31,7 @@ class ElementPedagogique implements HistoriqueAwareInterface, AnneeAwareInterfac
     use PeriodeAwareTrait;
     use EtapeAwareTrait;
     use ImportAwareTrait;
+    use EntityManagerAwareTrait;
 
     /**
      * @var string
@@ -130,7 +135,7 @@ class ElementPedagogique implements HistoriqueAwareInterface, AnneeAwareInterfac
     /**
      * @var \Application\Entity\Db\Effectifs
      */
-    private $effectifs;
+    private $effectifs = false;
 
 
 
@@ -659,41 +664,53 @@ class ElementPedagogique implements HistoriqueAwareInterface, AnneeAwareInterfac
 
 
     /**
-     * Set effectifs
-     *
-     * @param \Application\Entity\Db\Effectifs $effectifs
+     * Get effectifs
      *
-     * @return ElementPedagogique
+     * @return \Application\Entity\Db\Effectifs
      */
-    public function setEffectifs(\Application\Entity\Db\Effectifs $effectifs = null)
+    public function getEffectifs()
     {
-        $this->effectifs = $effectifs;
+        if (false === $this->effectifs){
+            $this->effectifs = $this->getEntityManager()->getRepository(Effectifs::class)->findOneBy([
+                'elementPedagogique' => $this,
+            ]);
+        }
 
-        return $this;
+        return $this->effectifs;
     }
 
 
 
     /**
-     * Get effectifs
+     * Returns the string identifier of the Resource
      *
-     * @return \Application\Entity\Db\Effectifs
+     * @return string
      */
-    public function getEffectifs()
+    public function getResourceId()
     {
-        return $this->effectifs;
+        return 'ElementPedagogique';
     }
 
 
 
     /**
-     * Returns the string identifier of the Resource
+     * Injects responsible ObjectManager and the ClassMetadata into this persistent object.
      *
-     * @return string
+     * @param ObjectManager $objectManager
+     * @param ClassMetadata $classMetadata
+     *
+     * @return void
      */
-    public function getResourceId()
+    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
     {
-        return 'ElementPedagogique';
+        $this->setEntityManager($objectManager);
+    }
+
+
+
+    function __sleep()
+    {
+        return [];
     }
 
 }
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/Indicateur.php b/module/Application/src/Application/Entity/Db/Indicateur.php
index 86cc5eea31a5a86b61ed795c822ff1155f972758..56382d221311cf2fc713beea6965f6a07d82daa1 100644
--- a/module/Application/src/Application/Entity/Db/Indicateur.php
+++ b/module/Application/src/Application/Entity/Db/Indicateur.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Application\Entity\Db;
+
 use Application\Service\Traits\IndicateurServiceAwareTrait;
 
 /**
@@ -42,6 +43,30 @@ class Indicateur
      */
     private $ordre;
 
+    /**
+     * @var string
+     */
+    private $libelleSingulier;
+
+    /**
+     * @var string
+     */
+    private $libellePluriel;
+
+    /**
+     * @var string
+     */
+    private $route;
+
+    /**
+     * @var boolean
+     */
+    private $distinct;
+
+    /**
+     * @var boolean
+     */
+    private $notStructure;
 
 
 
@@ -192,6 +217,142 @@ class Indicateur
 
 
 
+    /**
+     * @return string
+     */
+    public function getLibelleSingulier()
+    {
+        return $this->libelleSingulier;
+    }
+
+
+
+    /**
+     * @param string $libelleSingulier
+     *
+     * @return Indicateur
+     */
+    public function setLibelleSingulier($libelleSingulier)
+    {
+        $this->libelleSingulier = $libelleSingulier;
+
+        return $this;
+    }
+
+
+
+    /**
+     * @return string
+     */
+    public function getLibellePluriel()
+    {
+        return $this->libellePluriel;
+    }
+
+
+
+    /**
+     * @param string $libellePluriel
+     *
+     * @return Indicateur
+     */
+    public function setLibellePluriel($libellePluriel)
+    {
+        $this->libellePluriel = $libellePluriel;
+
+        return $this;
+    }
+
+
+
+    /**
+     * @return string
+     */
+    public function getLibelle()
+    {
+        $count = $this->getCount();
+
+        if ($count > 1) {
+            return sprintf($this->getLibellePluriel(), $count);
+        } else {
+            return sprintf($this->getLibelleSingulier(), $count);
+        }
+    }
+
+
+
+    /**
+     * @return string
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+
+
+
+    /**
+     * @param string $route
+     *
+     * @return Indicateur
+     */
+    public function setRoute($route)
+    {
+        $this->route = $route;
+
+        return $this;
+    }
+
+
+
+    /**
+     * @return boolean
+     */
+    public function getDistinct()
+    {
+        return $this->distinct;
+    }
+
+
+
+    /**
+     * @param boolean $distinct
+     *
+     * @return Indicateur
+     */
+    public function setDistinct($distinct)
+    {
+        $this->distinct = $distinct;
+
+        return $this;
+    }
+
+
+
+    /**
+     * @return boolean
+     */
+    public function getNotStructure()
+    {
+        return $this->notStructure;
+    }
+
+
+
+    /**
+     * @param boolean $notStructure
+     *
+     * @return Indicateur
+     */
+    public function setNotStructure($notStructure)
+    {
+        $this->notStructure = $notStructure;
+
+        return $this;
+    }
+
+
+
     /**
      * @return int
      */
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php b/module/Application/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php
index 9df8709ea322dae7f5fd51bafa3f391f43dc6187..e8389662e42f538c5e3071b949baeac1891a8559 100644
--- a/module/Application/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php
+++ b/module/Application/src/Application/Entity/Db/Indicateur/AbstractIndicateur.php
@@ -2,8 +2,11 @@
 
 namespace Application\Entity\Db\Indicateur;
 
+use Application\Entity\Db\Annee;
+use Application\Entity\Db\Indicateur;
 use Application\Entity\Db\Intervenant;
 use Application\Entity\Db\Structure;
+use Doctrine\ORM\QueryBuilder;
 
 
 /**
@@ -16,6 +19,11 @@ abstract class AbstractIndicateur
      */
     protected $id;
 
+    /**
+     * @var Annee
+     */
+    protected $annee;
+
     /**
      * @var Intervenant
      */
@@ -40,6 +48,16 @@ abstract class AbstractIndicateur
 
 
 
+    /**
+     * @return Annee
+     */
+    public function getAnnee()
+    {
+        return $this->annee;
+    }
+
+    
+
     /**
      * @return Intervenant
      */
@@ -66,7 +84,7 @@ abstract class AbstractIndicateur
     public function getUrlParams()
     {
         return [
-            'intervenant'  => $this->getIntervenant()->getRouteParam(),
+            'intervenant' => $this->getIntervenant()->getRouteParam(),
         ];
     }
 
@@ -81,4 +99,15 @@ abstract class AbstractIndicateur
     {
         return ['force_canonical' => true];
     }
+
+
+
+    /**
+     * @param QueryBuilder $qb
+     *
+     */
+    public static function appendQueryBuilder(QueryBuilder $qb)
+    {
+
+    }
 }
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1010.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1010.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbe489098b40128d1db60dd648dc3b6dc3001f5d
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1010.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur1010 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1020.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1020.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac20282aefe3887c26bc5e741dff3785c16de1b7
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur1020.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur1020 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur110.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur110.php
new file mode 100644
index 0000000000000000000000000000000000000000..d03ed6d503f20fb437cfbb0746882718ca5c4a6d
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur110.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur110 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur120.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur120.php
new file mode 100644
index 0000000000000000000000000000000000000000..3fc680754ed7b76ef91f7c4951fa22e651f9c7db
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur120.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur120 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur130.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur130.php
new file mode 100644
index 0000000000000000000000000000000000000000..43e94a47faa092e88d6c6cd64076cc3fe5dd3a25
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur130.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur130 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur210.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur210.php
index 6d51444f83a049360d0a0b3e8f11348539f84d5c..a2d09ea7599efa29dc67aff769269c3331a483bb 100644
--- a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur210.php
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur210.php
@@ -1,64 +1,21 @@
 <?php
 
 namespace Application\Entity\Db\Indicateur;
-use Application\Entity\Db\Traits\TypeAgrementAwareTrait;
+
+use Doctrine\ORM\QueryBuilder;
 
 
 class Indicateur210 extends AbstractIndicateur
 {
-    use TypeAgrementAwareTrait;
-
-
 
     /**
      * @return array
-     */
+     *
     public function getUrlParams()
     {
         $up = parent::getUrlParams();
         $up['typeAgrement'] = $this->getTypeAgrement()->getId();
         return $up;
-    }
-
-    /**
-     * Set id
-     *
-     * @param integer $id
-     *
-     * @return Indicateur210
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * Set intervenant
-     *
-     * @param \Application\Entity\Db\Intervenant $intervenant
-     *
-     * @return Indicateur210
-     */
-    public function setIntervenant(\Application\Entity\Db\Intervenant $intervenant = null)
-    {
-        $this->intervenant = $intervenant;
-
-        return $this;
-    }
-
-    /**
-     * Set structure
-     *
-     * @param \Application\Entity\Db\Structure $structure
-     *
-     * @return Indicateur210
-     */
-    public function setStructure(\Application\Entity\Db\Structure $structure = null)
-    {
-        $this->structure = $structure;
+    }*/
 
-        return $this;
-    }
 }
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur220.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur220.php
new file mode 100644
index 0000000000000000000000000000000000000000..17345706096f3e5cd26f26b7cca01ab61c7701ae
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur220.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+use Doctrine\ORM\QueryBuilder;
+
+
+class Indicateur220 extends AbstractIndicateur
+{
+
+    /**
+     * @return array
+     *
+    public function getUrlParams()
+    {
+        $up = parent::getUrlParams();
+        $up['typeAgrement'] = $this->getTypeAgrement()->getId();
+        return $up;
+    }*/
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur310.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur310.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4c36522790959891db9366cf7be9f621f8abedd
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur310.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur310 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur320.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur320.php
new file mode 100644
index 0000000000000000000000000000000000000000..e05119c127d793b0a20f5a882d13c72d6ed50c68
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur320.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur320 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur330.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur330.php
new file mode 100644
index 0000000000000000000000000000000000000000..f865e0d6bab7c0084874c943f4b9451a5c0893b6
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur330.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur330 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur340.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur340.php
new file mode 100644
index 0000000000000000000000000000000000000000..6b480f0f2634802c583d87a0d249ff44d1061021
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur340.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur340 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur350.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur350.php
new file mode 100644
index 0000000000000000000000000000000000000000..f11ed32cad330d3d94902a167988707af46d2e88
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur350.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur350 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur360.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur360.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2dacf7abe3e48dc9c6300be1c0a9ba5e3f6cab7
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur360.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur360 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur410.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur410.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b652694dc3f6e1be7cb47efa334170423a11986
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur410.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur410 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur510.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur510.php
new file mode 100644
index 0000000000000000000000000000000000000000..429ac9eb319ab7965ae67953d3eac72fa27b5aed
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur510.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur510 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur520.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur520.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd14ba512633e19e806e99da1a65d41d0163dacd
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur520.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur520 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur530.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur530.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b1a18c570dd3c53b84c9a86784a93b5c0d9657d
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur530.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur530 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur610.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur610.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e8f278cc27a17ac8bae4ef8bd8f232ca787d1ff
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur610.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur610 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur620.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur620.php
new file mode 100644
index 0000000000000000000000000000000000000000..1767c8dd388abb3e9f387c35918b2f028a2b31ae
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur620.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur620 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur630.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur630.php
new file mode 100644
index 0000000000000000000000000000000000000000..7472dcc42f05eae98ecb6904b59ed35a77280824
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur630.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur630 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur640.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur640.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d50f50c1a17b858bb7879380195836ba5ba0090
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur640.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur640 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur650.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur650.php
new file mode 100644
index 0000000000000000000000000000000000000000..e697de98f922f38907e8453efa205ca6cadf6219
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur650.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur650 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur660.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur660.php
new file mode 100644
index 0000000000000000000000000000000000000000..dcc4cadca5290de0ccfbf46a152041232f583489
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur660.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur660 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur670.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur670.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccbe98205e30d070fc9f1b5c96368e837bc286a0
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur670.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur670 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur710.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur710.php
new file mode 100644
index 0000000000000000000000000000000000000000..d76a579653c843964f8c21a7772b33681b39f652
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur710.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur710 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur720.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur720.php
new file mode 100644
index 0000000000000000000000000000000000000000..13a833d7c934e8775254aea815bada5d5fb3be39
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur720.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur720 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur810.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur810.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa178e8cf21d006006b56a81f83697bb515d6d9d
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur810.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur810 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur820.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur820.php
new file mode 100644
index 0000000000000000000000000000000000000000..837d087f6d0da8ca083e88cd12f988cdb39d0304
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur820.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur820 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur910.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur910.php
new file mode 100644
index 0000000000000000000000000000000000000000..0938212784fa7e41e1bd22ebfaa5773b26b39fb2
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur910.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur910 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Indicateur/Indicateur920.php b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur920.php
new file mode 100644
index 0000000000000000000000000000000000000000..abcc9a63f6d5d0b81d64f6005b26c030eeede22b
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Indicateur/Indicateur920.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Application\Entity\Db\Indicateur;
+
+class Indicateur920 extends AbstractIndicateur
+{
+
+}
diff --git a/module/Application/src/Application/Entity/Db/Intervenant.php b/module/Application/src/Application/Entity/Db/Intervenant.php
index 59ed6faaa9a8b5da872ca247ab21a24287b3a2b2..942675cc1e2c6d6d158123f523dab70b01890100 100644
--- a/module/Application/src/Application/Entity/Db/Intervenant.php
+++ b/module/Application/src/Application/Entity/Db/Intervenant.php
@@ -5,8 +5,12 @@ namespace Application\Entity\Db;
 use Application\Entity\Db\Traits\DisciplineAwareTrait;
 use Application\Entity\Db\Traits\DossierAwareTrait;
 use Application\Entity\Db\Traits\GradeAwareTrait;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Common\Persistence\ObjectManagerAware;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 use UnicaenApp\Entity\HistoriqueAwareTrait;
+use UnicaenApp\Service\EntityManagerAwareTrait;
 use UnicaenImport\Entity\Db\Interfaces\ImportAwareInterface;
 use UnicaenImport\Entity\Db\Traits\ImportAwareTrait;
 use Zend\Form\Annotation;
@@ -21,13 +25,14 @@ use Application\Entity\Db\Interfaces\AnneeAwareInterface;
  * @Annotation\Type("Application\Form\Intervenant\AjouterModifier")
  * @Annotation\Hydrator("Application\Entity\Db\Hydrator\Intervenant")
  */
-class Intervenant implements IntervenantInterface, HistoriqueAwareInterface, ResourceInterface, AnneeAwareInterface, ImportAwareInterface
+class Intervenant implements IntervenantInterface, HistoriqueAwareInterface, ResourceInterface, AnneeAwareInterface, ImportAwareInterface, ObjectManagerAware
 {
     use HistoriqueAwareTrait;
     use GradeAwareTrait;
     use DisciplineAwareTrait;
     use DossierAwareTrait;
     use ImportAwareTrait;
+    use EntityManagerAwareTrait;
 
     /**
      * @var string
@@ -1898,12 +1903,37 @@ class Intervenant implements IntervenantInterface, HistoriqueAwareInterface, Res
     public function hasMiseEnPaiement($demande = true)
     {
         if ($this->hasMiseEnPaiement === null) {
-            $this->hasMiseEnPaiement = $this->getMiseEnPaiementIntervenantStructure()->filter(function (MiseEnPaiementIntervenantStructure $mis) {
+            $id = (int)$this->getId();
+            $heures = $demande ? 'heures_demandees' : 'heures_payees';
 
-                    return $mis->getMiseEnPaiement()->estNonHistorise();
-                })->count() > 0;
+            $sql = "SELECT COUNT(*) res FROM tbl_paiement p "
+                  ."WHERE p.intervenant_id = $id AND p.$heures > 0 AND rownum = 1";
+
+            $res = $this->getEntityManager()->getConnection()->executeQuery($sql)->fetchAll();
+
+            $this->hasMiseEnPaiement = $res[0]['RES'] == 1;
         }
 
         return $this->hasMiseEnPaiement;
     }
+
+
+
+    /**
+     * Injects responsible ObjectManager and the ClassMetadata into this persistent object.
+     *
+     * @param ObjectManager $objectManager
+     * @param ClassMetadata $classMetadata
+     *
+     * @return void
+     */
+    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
+    {
+        $this->setEntityManager($objectManager);
+    }
+
+    function __sleep()
+    {
+        return [];
+    }
 }
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml
index 88739c02faee015553b4a960158091d057d8abbb..82cd0d58b0265db048dcfa49ae4af42a49745132 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.ElementPedagogique.dcm.xml
@@ -118,6 +118,5 @@
             </join-table>
         </many-to-many>
         <one-to-many field="centreCoutEp" target-entity="Application\Entity\Db\CentreCoutEp" mapped-by="elementPedagogique"/>
-        <one-to-one field="effectifs" target-entity="Application\Entity\Db\Effectifs" mapped-by="elementPedagogique"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Etape.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Etape.dcm.xml
index 0a4d7c0e3bff6e562b8cd9d6d38004f500fecd30..178e48efceceb8246ca761a2d61177782992e29a 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Etape.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Etape.dcm.xml
@@ -53,7 +53,7 @@
       </join-columns>
     </many-to-one>
     <one-to-many field="elementPedagogique" target-entity="Application\Entity\Db\ElementPedagogique" mapped-by="etape" />
-    <one-to-many field="cheminPedagogique" target-entity="Application\Entity\Db\CheminPedagogique" mapped-by="etape" />
+    <one-to-many field="cheminPedagogique" target-entity="Application\Entity\Db\CheminPedagogique" mapped-by="etape" fetch="EXTRA_LAZY" />
     <many-to-many field="niveauFormation" target-entity="Application\Entity\Db\NiveauFormation">
         <join-table name="V_ETAPE_NIVEAU_FORMATION">
             <join-columns>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1010.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1010.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d968e7b03be31933001301d22addfd1b1ee5bcd
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1010.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur1010" table="V_INDICATEUR_1010" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1020.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1020.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a7ceec4a7bd67626616688f53338d0b93d43191
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur1020.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur1020" table="V_INDICATEUR_1020" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur110.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur110.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d34f08f95670879c6378dc9d4087ab9574cb5c80
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur110.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur110" table="V_INDICATEUR_110" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur120.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur120.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7dd915452386592c6110dbed826892e853859176
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur120.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur120" table="V_INDICATEUR_120" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur130.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur130.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2c182ac0e465e7e54142f66942df22786ab865c0
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur130.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur130" table="V_INDICATEUR_130" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur210.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur210.dcm.xml
index f36c73cbba8cc27b25a8a64608bb0a699bd7cc3b..984a11be54dcfe639efe8037391728c82bc8fbab 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur210.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur210.dcm.xml
@@ -4,7 +4,11 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="Application\Entity\Db\Indicateur\Indicateur210" table="V_INDICATEUR_210" read-only="true">
-        <id name="id" type="integer" column="INTERVENANT_ID"/>
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
 
         <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
             <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
@@ -14,9 +18,5 @@
             <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
         </many-to-one>
 
-        <many-to-one field="typeAgrement" target-entity="Application\Entity\Db\TypeAgrement">
-            <join-column name="TYPE_AGREMENT_ID" referenced-column-name="ID"/>
-        </many-to-one>
-
     </entity>
 </doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur220.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur220.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..792489fb8539fab7d7fbc005262d5d381d170bc3
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur220.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur220" table="V_INDICATEUR_220" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur310.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur310.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2dc9031fa89c6aa2e8c55b5b6206449f664378c3
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur310.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur310" table="V_INDICATEUR_310" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur320.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur320.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9f0ee101ccb2b89b637d20062f9c016cd0ec059
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur320.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur320" table="V_INDICATEUR_320" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur330.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur330.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..19d645f8b3724e4463952616d2976dd66c83f7e9
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur330.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur330" table="V_INDICATEUR_330" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur340.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur340.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..765a53bb988fb254630a763313e5a7b33119e9cf
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur340.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur340" table="V_INDICATEUR_340" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur350.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur350.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a124195d32bf88b74d9d998168766b444d44058f
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur350.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur350" table="V_INDICATEUR_350" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur360.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur360.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3482f0845d0de51259ad2f1ab08872bb3276ae24
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur360.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur360" table="V_INDICATEUR_360" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur410.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur410.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..008868a19b6445ef333b3ba950bb53c3a5baab79
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur410.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur410" table="V_INDICATEUR_410" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur510.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur510.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c870691c3b74eca33fff8323546dcfbfc0dd8a95
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur510.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur510" table="V_INDICATEUR_510" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur520.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur520.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..becb943820eb186f8c7149a18ca57dac481af53f
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur520.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur520" table="V_INDICATEUR_520" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur530.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur530.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d53a74156fe56c517b7983e698adb7fda14e405b
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur530.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur530" table="V_INDICATEUR_530" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur610.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur610.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3922cbbaf9c77c1f736456d69b77d1eb6a9980e7
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur610.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur610" table="V_INDICATEUR_610" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur620.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur620.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d29a9938719becce5c7bc8f7481d8951195c780
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur620.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur620" table="V_INDICATEUR_620" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur630.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur630.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b674d3239b30e2e9fff8b63c3c687cb54aac7192
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur630.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur630" table="V_INDICATEUR_630" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur640.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur640.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6298fed634b57bab0458bc2df449521babd1a7ae
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur640.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur640" table="V_INDICATEUR_640" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur650.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur650.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2682c34c377b9aeb3ea7ffe8fe44095f92ae1c99
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur650.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur650" table="V_INDICATEUR_650" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur660.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur660.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf25aec2b620c46e23c2d1757a60555f983be02a
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur660.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur660" table="V_INDICATEUR_660" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur670.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur670.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f06df1bf5ea16305f7fec45765f6d78075286c5
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur670.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur670" table="V_INDICATEUR_670" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur710.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur710.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..109d3a5d3eca6b6b882e7ef19a11b9bd418d7241
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur710.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur710" table="V_INDICATEUR_710" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur720.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur720.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6d866643479df53aa3ee2cd76cd2069e5e9ee2d
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur720.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur720" table="V_INDICATEUR_720" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur810.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur810.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7caeb07434f4d1352010941a0152084ad1e02b61
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur810.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur810" table="V_INDICATEUR_810" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur820.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur820.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35c4ff3880f1c9bfb854ac3d338ab98aedbf5246
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur820.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur820" table="V_INDICATEUR_820" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur910.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur910.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40ec6c471eb553ef8fa5ce8a32906e9bc1dc29c0
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur910.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur910" table="V_INDICATEUR_910" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur920.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur920.dcm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8dce36123ed46df902bb0c474673ac81bbc8bffc
--- /dev/null
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.Indicateur920.dcm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+    <entity name="Application\Entity\Db\Indicateur\Indicateur920" table="V_INDICATEUR_920" read-only="true">
+        <id name="id" type="integer" column="ID"/>
+
+        <many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
+            <join-column name="ANNEE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
+            <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+        <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
+            <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        </many-to-one>
+
+    </entity>
+</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.dcm.xml
index 6927811fd8d5c17fb503dc92cbbc52c2371ccce8..b1ff96bc921c3ad5077a4647b743227e7e2aeb53 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Indicateur.dcm.xml
@@ -9,5 +9,10 @@
     <field name="type" type="string" column="TYPE" length="64" nullable="false"/>
     <field name="ordre" type="integer" column="ORDRE" nullable="false"/>
     <field name="enabled" type="boolean" column="ENABLED" nullable="false"/>
+    <field name="libelleSingulier" type="string" column="LIBELLE_SINGULIER" length="255" nullable="false"/>
+    <field name="libellePluriel" type="string" column="LIBELLE_PLURIEL" length="255" nullable="false"/>
+    <field name="route" type="string" column="ROUTE" length="250" nullable="false"/>
+    <field name="distinct" type="boolean" column="TEM_DISTINCT" nullable="false"/>
+    <field name="notStructure" type="boolean" column="TEM_NOT_STRUCTURE" nullable="false"/>
   </entity>
 </doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml
index dd08e40c5ba80963224de5b8cad1623a8aae309a..f4cf89f2079e92211bbff69441e7bda78777c46b 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml
@@ -98,7 +98,7 @@
                 <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
             </join-columns>
         </many-to-one>
-        <one-to-one field="dossier" target-entity="Application\Entity\Db\Dossier" mapped-by="intervenant" />
+        <one-to-one field="dossier" target-entity="Application\Entity\Db\Dossier" mapped-by="intervenant" fetch="EXTRA_LAZY"/>
         <one-to-many field="affectation" target-entity="Application\Entity\Db\AffectationRecherche" mapped-by="intervenant"/>
         <one-to-many field="adresse" target-entity="Application\Entity\Db\AdresseIntervenant" mapped-by="intervenant"/>
         <one-to-many field="service" target-entity="Application\Entity\Db\Service" mapped-by="intervenant"/>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.NotificationIndicateur.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.NotificationIndicateur.dcm.xml
index 95d37513474c6d6d6b65689a8f58fb1dd04b0873..b0b0e9d7da27a84c984d67201013ac6c6ad8fb2c 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.NotificationIndicateur.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.NotificationIndicateur.dcm.xml
@@ -5,6 +5,7 @@
       <generator strategy="SEQUENCE"/>
     </id>
     <field name="frequence" type="integer" column="FREQUENCE" nullable="false"/>
+    <field name="inHome" type="boolean" column="IN_HOME" nullable="false"/>
     <field name="dateAbonnement" type="datetime" column="DATE_ABONNEMENT" nullable="false"/>
     <field name="dateDernNotif" type="datetime" column="DATE_DERN_NOTIF" nullable="true"/>
     <many-to-one field="indicateur" target-entity="Application\Entity\Db\Indicateur">
@@ -12,14 +13,9 @@
         <join-column name="INDICATEUR_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
-    <many-to-one field="personnel" target-entity="Application\Entity\Db\Personnel">
+    <many-to-one field="affectation" target-entity="Application\Entity\Db\Affectation">
       <join-columns>
-        <join-column name="PERSONNEL_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
+        <join-column name="AFFECTATION_ID" referenced-column-name="ID"/>
       </join-columns>
     </many-to-one>
   </entity>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Service.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Service.dcm.xml
index 92eb31d06196de94b9d1f62b02ea8ef0e08d743c..1b248b6e46ec9c8adbd699413c185dbc17335381 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Service.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Service.dcm.xml
@@ -55,7 +55,6 @@
             <cascade-all/>
         </cascade>
     </one-to-many>
-    <one-to-one field="formuleService" target-entity="Application\Entity\Db\FormuleService" mapped-by="service" fetch="EXTRA_LAZY" />
     <one-to-many field="formuleResultatService" target-entity="Application\Entity\Db\FormuleResultatService" mapped-by="service"  fetch="EXTRA_LAZY" />
   </entity>
 </doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml
index 9c1e48f68ce32bddef747e410b1b62e0b54e62bd..404688d22e9a3afa53d069479ed89f48cc78c16b 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml
@@ -38,6 +38,7 @@
         <field name="peutCloturerSaisie" type="boolean" column="PEUT_CLOTURER_SAISIE" nullable="false"/>
         <field name="peutSaisirMotifNonPaiement" type="boolean" column="PEUT_SAISIR_MOTIF_NON_PAIEMENT" nullable="false"/>
         <field name="temAtv" type="boolean" column="TEM_ATV" nullable="false"/>
+        <field name="temBiatss" type="boolean" column="TEM_BIATSS" nullable="false"/>
         <many-to-one field="typeIntervenant" target-entity="Application\Entity\Db\TypeIntervenant">
             <join-columns>
                 <join-column name="TYPE_INTERVENANT_ID" referenced-column-name="ID"/>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteDemandeMep.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteDemandeMep.dcm.xml
deleted file mode 100644
index aa4d5b41c059ce6da0afc5c863317229e0e2086b..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteDemandeMep.dcm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteDemandeMep" table="V_INDIC_ATTENTE_DEMANDE_MEP">
-    <id name="id" type="integer" column="ID"/>
-    <field name="totalHeuresMep" type="float" column="TOTAL_HEURES_MEP" nullable="false"/>
-    <field name="totalHeuresCompl" type="float" column="TOTAL_HEURES_COMPL" nullable="false"/>
-    <one-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicAttenteDemandeMep">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </one-to-one>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteMep.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteMep.dcm.xml
deleted file mode 100644
index 0bfc14acf6cc3096cf0b7df4dfc0fa71295e0212..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteMep.dcm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteMep" table="V_INDIC_ATTENTE_MEP">
-    <id name="id" type="integer" column="ID"/>
-    <field name="totalHeuresMep" type="float" column="TOTAL_HEURES_MEP" nullable="false"/>
-    <one-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicAttenteMep">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </one-to-one>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidEnsAutre.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidEnsAutre.dcm.xml
deleted file mode 100644
index 387088cfffc50ff2f8e9202a08f2bb9cff606ceb..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidEnsAutre.dcm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteValidEnsAutre" table="V_INDIC_ATT_VALID_ENS_AUTRE">
-    
-    <id name="id" type="integer" column="ID"/>
-
-    <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicAttenteDemandeMep">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidRefAutre.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidRefAutre.dcm.xml
deleted file mode 100644
index 16d5f941891d9a1481b601d412e1f0ea9c06ba18..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidRefAutre.dcm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteValidRefAutre" table="V_INDIC_ATT_VALID_REF_AUTRE">
-    
-    <id name="id" type="integer" column="ID"/>
-
-    <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicAttenteDemandeMep">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationService.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationService.dcm.xml
deleted file mode 100644
index b947624644e4b1fd2b783bc1d1a61e8e818f5b03..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationService.dcm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteValidationService" table="V_INDIC_ATT_VALID_SERVICE">
-    
-    <id name="id" type="integer" column="ID"/>
-
-    <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicAttenteDemandeMep">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="typeVolumeHoraire" target-entity="Application\Entity\Db\TypeVolumeHoraire">
-      <join-columns>
-        <join-column name="TYPE_VOLUME_HORAIRE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationServiceRef.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationServiceRef.dcm.xml
deleted file mode 100644
index d248259bfb0c0979ce8994686cfd2ff8119b2f5b..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicAttenteValidationServiceRef.dcm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicAttenteValidationServiceRef" table="V_INDIC_ATT_VALID_SERVICE_REF">
-    
-    <id name="id" type="integer" column="ID"/>
-
-    <many-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-    <many-to-one field="typeVolumeHoraire" target-entity="Application\Entity\Db\TypeVolumeHoraire">
-      <join-columns>
-        <join-column name="TYPE_VOLUME_HORAIRE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassHcHorsRemuFc.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassHcHorsRemuFc.dcm.xml
deleted file mode 100644
index 20cc91d385d131912883ea9fe1ee00d5158edd64..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassHcHorsRemuFc.dcm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicDepassHcHorsRemuFc" table="V_INDIC_DEPASS_HC_HORS_REMU_FC">
-    <id name="id" type="integer" column="ID"/>
-    <field name="total" type="float" column="TOTAL" nullable="false"/>
-    <field name="plafond" type="float" column="PLAFOND" nullable="false"/>
-    <one-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicDepassHcHorsRemuFc">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </one-to-one>
-    <many-to-one field="typeVolumeHoraire" target-entity="Application\Entity\Db\TypeVolumeHoraire">
-      <join-columns>
-        <join-column name="TYPE_VOLUME_HORAIRE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassRef.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassRef.dcm.xml
deleted file mode 100644
index 99bef09d9e5f1610369d709ade1a3528e7694399..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDepassRef.dcm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicDepassRef" table="V_INDIC_DEPASS_REF">
-    <id name="id" type="integer" column="ID"/>
-    <field name="total" type="float" column="TOTAL" nullable="false"/>
-    <field name="plafond" type="float" column="PLAFOND" nullable="false"/>
-    <one-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicDepassRef">
-      <join-columns>
-        <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </one-to-one>
-    <many-to-one field="typeVolumeHoraire" target-entity="Application\Entity\Db\TypeVolumeHoraire">
-      <join-columns>
-        <join-column name="TYPE_VOLUME_HORAIRE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-    <many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
-      <join-columns>
-        <join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
-      </join-columns>
-    </many-to-one>
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDiffDossier.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDiffDossier.dcm.xml
deleted file mode 100644
index 218fa407caf9707ffae89d64c999a254985caeb5..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VIndicDiffDossier.dcm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Application\Entity\Db\VIndicDiffDossier" table="V_INDIC_DIFF_DOSSIER">
-    <id name="id" type="integer" column="ID"/>
-    <field name="adresseDossier" type="text" column="ADRESSE_DOSSIER" nullable="true"/>
-    <field name="adresseImport" type="text" column="ADRESSE_IMPORT" nullable="true"/>
-    <field name="ribDossier" type="text" column="RIB_DOSSIER" nullable="true"/>
-    <field name="ribImport" type="text" column="RIB_IMPORT" nullable="true"/>
-    <field name="nomUsuelDossier" type="text" column="NOM_USUEL_DOSSIER" nullable="true"/>
-    <field name="nomUsuelImport" type="text" column="NOM_USUEL_IMPORT" nullable="true"/>
-    <field name="prenomDossier" type="text" column="PRENOM_DOSSIER" nullable="true"/>
-    <field name="prenomImport" type="text" column="PRENOM_IMPORT" nullable="true"/>
-    <one-to-one field="intervenant" target-entity="Application\Entity\Db\Intervenant" inversed-by="vIndicDiffDossier">
-      <join-columns>
-        <join-column name="ID" referenced-column-name="ID"/>
-      </join-columns>
-    </one-to-one>
-  </entity>
-</doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
index 35e66d2af6c0f6f86a4e6eebb076b4295551abd9..9ae0b92fc42f1f36290545de2a8ecbea04f4c65c 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
@@ -86,7 +86,6 @@
             </inverse-join-columns>
         </join-table>
     </many-to-many>
-    <one-to-one field="formuleVolumeHoraire" target-entity="Application\Entity\Db\FormuleVolumeHoraire" mapped-by="volumeHoraire" />
     <one-to-many field="formuleResultatVolumeHoraire" target-entity="Application\Entity\Db\FormuleResultatVolumeHoraire" mapped-by="volumeHoraire" />
   </entity>
 </doctrine-mapping>
diff --git a/module/Application/src/Application/Entity/Db/NotificationIndicateur.php b/module/Application/src/Application/Entity/Db/NotificationIndicateur.php
index ce45808984d39653b9ad5f53370ba233653484ba..97b0a181af09b346cadcaa3084d1f083aaca8e18 100644
--- a/module/Application/src/Application/Entity/Db/NotificationIndicateur.php
+++ b/module/Application/src/Application/Entity/Db/NotificationIndicateur.php
@@ -14,17 +14,17 @@ class NotificationIndicateur
     const PERIODE_HEURE_6 = 21600;  // 60*60*6    = 6h
     const PERIODE_JOUR    = 86400;  // 60*60*24   = 1j
     const PERIODE_SEMAINE = 604800; // 60*60*24*7 = 7j
-    
+
     /**
      * Liste des féquences possibles.
-     * 
+     *
      * Attention, les fréquences "4 par jour" (période = 3h) et "2 par jour" (période = 6h)
      * n'ont de sens qu'en accord avec la configuration du CRON chargé d'exécuter le script de notification.
      * Par exemple, un CRON configuré pour se réveiller chaque jour de 7h à 18h toutes les heures pourra
      * honorer ces fréquences :
-     * - "4 par jour" (période = 3h) : notification possible à 7h, 10h, 13h puis 16h. 
+     * - "4 par jour" (période = 3h) : notification possible à 7h, 10h, 13h puis 16h.
      * - "2 par jour" (période = 6h) : notification possible à 7h puis 13h.
-     * 
+     *
      * @var array
      */
     static public $frequences = [
@@ -33,16 +33,16 @@ class NotificationIndicateur
         self::PERIODE_JOUR    => "1 par jour",
         self::PERIODE_SEMAINE => "1 par semaine",
     ];
-    
+
     /**
      * @var integer
      */
     protected $id;
 
     /**
-     * @var Structure
+     * @var Affectation
      */
-    protected $structure;
+    protected $affectation;
 
     /**
      * @var Indicateur
@@ -50,14 +50,14 @@ class NotificationIndicateur
     protected $indicateur;
 
     /**
-     * @var Personnel
+     * @var string
      */
-    protected $personnel;
+    protected $frequence;
 
     /**
-     * @var string
+     * @var boolean
      */
-    protected $frequence;
+    protected $inHome;
 
     /**
      * @var DateTime
@@ -69,20 +69,25 @@ class NotificationIndicateur
      */
     protected $dateDernNotif;
 
+
+
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
         return $this->id;
     }
 
+
+
     /**
      * Set indicateur
      *
      * @param Indicateur $indicateur
+     *
      * @return NotificationIndicateur
      */
     public function setIndicateur(Indicateur $indicateur = null)
@@ -92,66 +97,49 @@ class NotificationIndicateur
         return $this;
     }
 
+
+
     /**
      * Get indicateur
      *
-     * @return Indicateur 
+     * @return Indicateur
      */
     public function getIndicateur()
     {
         return $this->indicateur;
     }
 
-    /**
-     * Set structure
-     *
-     * @param Structure $structure
-     * @return NotificationIndicateur
-     */
-    public function setStructure(Structure $structure = null)
-    {
-        $this->structure = $structure;
 
-        return $this;
-    }
 
     /**
-     * Get structure
-     *
-     * @return Structure 
+     * @return Affectation
      */
-    public function getStructure()
+    public function getAffectation()
     {
-        return $this->structure;
+        return $this->affectation;
     }
 
+
+
     /**
-     * Set personnel
+     * @param Affectation $affectation
      *
-     * @param Personnel $personnel
      * @return NotificationIndicateur
      */
-    public function setPersonnel(Personnel $personnel = null)
+    public function setAffectation($affectation)
     {
-        $this->personnel = $personnel;
+        $this->affectation = $affectation;
 
         return $this;
     }
 
-    /**
-     * Get personnel
-     *
-     * @return Personnel 
-     */
-    public function getPersonnel()
-    {
-        return $this->personnel;
-    }
-    
+
+
     /**
      * Set frequence
      *
      * @param integer $frequence
+     *
      * @return NotificationIndicateur
      */
     public function setFrequence($frequence)
@@ -161,30 +149,61 @@ class NotificationIndicateur
         return $this;
     }
 
+
+
     /**
      * Get frequence
      *
-     * @return integer 
+     * @return integer
      */
     public function getFrequence()
     {
         return $this->frequence;
     }
 
+
+
+    /**
+     * @return boolean
+     */
+    public function getInHome()
+    {
+        return $this->inHome;
+    }
+
+
+
+    /**
+     * @param boolean $inHome
+     *
+     * @return NotificationIndicateur
+     */
+    public function setInHome($inHome)
+    {
+        $this->inHome = $inHome;
+
+        return $this;
+    }
+
+
+
     /**
      * Get frequence
      *
-     * @return string 
+     * @return string
      */
     public function getFrequenceToString()
     {
         return static::$frequences[$this->getFrequence()];
     }
-    
+
+
+
     /**
      * Set dateDernNotif
      *
      * @param DateTime $date
+     *
      * @return NotificationIndicateur
      */
     public function setDateDernNotif(DateTime $date)
@@ -194,46 +213,55 @@ class NotificationIndicateur
         return $this;
     }
 
+
+
     /**
      * Get dateDernNotif
      *
-     * @return DateTime 
+     * @return DateTime
      */
     public function getDateDernNotif()
     {
         return $this->dateDernNotif;
     }
 
+
+
     /**
      * Get dateDernNotif
      *
-     * @return DateTime 
+     * @return DateTime
      */
     public function getDateDernNotifToString()
     {
         return $this->dateDernNotif ? $this->dateDernNotif->format(Constants::DATETIME_FORMAT) : null;
     }
 
+
+
     /**
      * Get dateDernNotif
      *
-     * @return DateTime 
+     * @return DateTime
      */
     public function getDateProchaineNotifToString()
     {
         if (!$this->dateDernNotif) {
             return null;
         }
-        
+
         $next = (new \DateTime())->setTimestamp($this->dateDernNotif->getTimestamp() + $this->getFrequence());
-        
+
         return $next->format(Constants::DATETIME_FORMAT);
     }
-    
+
+
+
     /**
      * Set dateAbonnement
      *
      * @param DateTime $date
+     *
      * @return NotificationIndicateur
      */
     public function setDateAbonnement(DateTime $date)
@@ -243,40 +271,46 @@ class NotificationIndicateur
         return $this;
     }
 
+
+
     /**
      * Get dateAbonnement
      *
-     * @return DateTime 
+     * @return DateTime
      */
     public function getDateAbonnement()
     {
         return $this->dateAbonnement;
     }
 
+
+
     /**
      * Get dateAbonnement
      *
-     * @return DateTime 
+     * @return DateTime
      */
     public function getDateAbonnementToString()
     {
         return $this->dateAbonnement->format(Constants::DATETIME_FORMAT);
     }
-    
+
+
+
     /**
-     * 
+     *
      * @return string
      */
     public function getExtraInfos()
     {
         $infos = "Abonnement : " . $this->getDateAbonnement()->format(Constants::DATETIME_FORMAT);
-        
-        $infos .= "<br />Structure : " . ($this->getStructure() ?: "aucune");
-        
+
+        $infos .= "<br />Structure : " . ($this->getAffectation()->getStructure() ?: "aucune");
+
         if (($dernNotif = $this->getDateDernNotif())) {
             $infos .= "<br />Dernière notification : " . $dernNotif->format(Constants::DATETIME_FORMAT);
         }
-        
+
         return $infos;
     }
 }
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/Service.php b/module/Application/src/Application/Entity/Db/Service.php
index 2b193570ebe68ad2b1a63dda453d06c48b5dba60..007feddb02e86ab8d3a84b8ea99c248e0dba8e6e 100644
--- a/module/Application/src/Application/Entity/Db/Service.php
+++ b/module/Application/src/Application/Entity/Db/Service.php
@@ -53,11 +53,6 @@ class Service implements HistoriqueAwareInterface, ResourceInterface
      */
     protected $typeVolumeHoraire;
 
-    /**
-     * @var FormuleService
-     */
-    private $formuleService;
-
     /**
      * @var \Doctrine\Common\Collections\Collection
      */
@@ -322,18 +317,6 @@ class Service implements HistoriqueAwareInterface, ResourceInterface
 
 
 
-    /**
-     * Get formuleService
-     *
-     * @return FormuleService
-     */
-    public function getFormuleService()
-    {
-        return $this->formuleService;
-    }
-
-
-
     /**
      * Get formuleResultatService
      *
diff --git a/module/Application/src/Application/Entity/Db/StatutIntervenant.php b/module/Application/src/Application/Entity/Db/StatutIntervenant.php
index 3fe74c7408873e4a3e215473e51bda080b1f7ab7..eb72a1cc63145efd29be21493c9bcd1f3e6182af 100644
--- a/module/Application/src/Application/Entity/Db/StatutIntervenant.php
+++ b/module/Application/src/Application/Entity/Db/StatutIntervenant.php
@@ -172,6 +172,11 @@ class StatutIntervenant implements HistoriqueAwareInterface, RoleInterface, Impo
      */
     private $temAtv;
 
+    /**
+     * @var boolean
+     */
+    private $temBiatss;
+    
 
 
     /**
@@ -198,6 +203,30 @@ class StatutIntervenant implements HistoriqueAwareInterface, RoleInterface, Impo
 
 
 
+    /**
+     * @return boolean
+     */
+    public function getTemBiatss()
+    {
+        return $this->temBiatss;
+    }
+
+
+
+    /**
+     * @param boolean $temBiatss
+     *
+     * @return StatutIntervenant
+     */
+    public function setTemBiatss($temBiatss)
+    {
+        $this->temBiatss = $temBiatss;
+
+        return $this;
+    }
+
+
+
     /**
      *
      * @return boolean
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteDemandeMep.php b/module/Application/src/Application/Entity/Db/VIndicAttenteDemandeMep.php
deleted file mode 100644
index 89b78aff3c9fe99f244fa6e0667cae6172aa18e0..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteDemandeMep.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicAttenteDemandeMep
- */
-class VIndicAttenteDemandeMep
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-    
-    /**
-     * @var float
-     */
-    protected $totalHeuresCompl;
-    
-    /**
-     * @var float
-     */
-    protected $totalHeuresMep;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getTotalHeuresCompl()
-    {
-        return $this->totalHeuresCompl;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getTotalHeuresMep()
-    {
-        return $this->totalHeuresMep;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteMep.php b/module/Application/src/Application/Entity/Db/VIndicAttenteMep.php
deleted file mode 100644
index 13628eaeb54b3c10775d4fd5936234b2a390809e..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteMep.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicAttenteMep
- */
-class VIndicAttenteMep
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-    
-    /**
-     * @var float
-     */
-    protected $totalHeuresMep;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getTotalHeuresMep()
-    {
-        return $this->totalHeuresMep;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteValidEnsAutre.php b/module/Application/src/Application/Entity/Db/VIndicAttenteValidEnsAutre.php
deleted file mode 100644
index 6d596870a907e8b903ba8b264ba037c043417921..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteValidEnsAutre.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-class VIndicAttenteValidEnsAutre
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteValidRefAutre.php b/module/Application/src/Application/Entity/Db/VIndicAttenteValidRefAutre.php
deleted file mode 100644
index 024a81e41f4be365e376304849f259430120ac30..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteValidRefAutre.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-class VIndicAttenteValidRefAutre
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteValidationService.php b/module/Application/src/Application/Entity/Db/VIndicAttenteValidationService.php
deleted file mode 100644
index 6fa95eb099c6ce6d28cea5ba1cb3c00666ad3d43..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteValidationService.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicAttenteValidationService
- */
-class VIndicAttenteValidationService
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-
-    /**
-     * @var \Application\Entity\Db\TypeVolumeHoraire
-     */
-    protected $typeVolumeHoraire;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-
-    /**
-     * Get typeVolumeHoraire
-     *
-     * @return TypeVolumeHoraire
-     */
-    public function getTypeVolumeHoraire()
-    {
-        return $this->typeVolumeHoraire;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicAttenteValidationServiceRef.php b/module/Application/src/Application/Entity/Db/VIndicAttenteValidationServiceRef.php
deleted file mode 100644
index 2f7de4e7c53210476d02e2fbc5bbddc89d0462b1..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicAttenteValidationServiceRef.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicAttenteValidationServiceRef
- */
-class VIndicAttenteValidationServiceRef
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-
-    /**
-     * @var \Application\Entity\Db\TypeVolumeHoraire
-     */
-    protected $typeVolumeHoraire;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-
-    /**
-     * Get typeVolumeHoraire
-     *
-     * @return TypeVolumeHoraire
-     */
-    public function getTypeVolumeHoraire()
-    {
-        return $this->typeVolumeHoraire;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicDepassHcHorsRemuFc.php b/module/Application/src/Application/Entity/Db/VIndicDepassHcHorsRemuFc.php
deleted file mode 100644
index 9911f139cd03870eda5edb37947a8ea0a25822d6..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicDepassHcHorsRemuFc.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicDepassHcHorsRemuFc
- */
-class VIndicDepassHcHorsRemuFc
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var TypeVolumeHoraire
-     */
-    protected $typeVolumeHoraire;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-    
-    /**
-     * @var float
-     */
-    protected $total;
-    
-    /**
-     * @var float
-     */
-    protected $plafond;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getTotal()
-    {
-        return $this->total;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getPlafond()
-    {
-        return $this->plafond;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get TypeVolumeHoraire
-     *
-     * @return TypeVolumeHoraire 
-     */
-    function getTypeVolumeHoraire()
-    {
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicDepassRef.php b/module/Application/src/Application/Entity/Db/VIndicDepassRef.php
deleted file mode 100644
index a7db935df44fffb2da91b2491d3f0f3d5eccdd90..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicDepassRef.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicDepassRef
- */
-class VIndicDepassRef
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var TypeVolumeHoraire
-     */
-    protected $typeVolumeHoraire;
-    
-    /**
-     * @var Structure
-     */
-    protected $structure;
-    
-    /**
-     * @var float
-     */
-    protected $total;
-    
-    /**
-     * @var float
-     */
-    protected $plafond;
-
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getIntervenant();
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getTotal()
-    {
-        return $this->total;
-    }
-
-    /**
-     * 
-     * @return float
-     */
-    function getPlafond()
-    {
-        return $this->plafond;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-    
-    /**
-     * Get TypeVolumeHoraire
-     *
-     * @return TypeVolumeHoraire 
-     */
-    function getTypeVolumeHoraire()
-    {
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Get structure
-     *
-     * @return Structure 
-     */
-    function getStructure()
-    {
-        return $this->structure;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Entity/Db/VIndicDiffDossier.php b/module/Application/src/Application/Entity/Db/VIndicDiffDossier.php
deleted file mode 100644
index f7cb5e9f51ab5fc37a6628ce4bcdb2bc31d15425..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Entity/Db/VIndicDiffDossier.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Application\Entity\Db;
-
-/**
- * VIndicDiffDossier
- */
-class VIndicDiffDossier
-{
-    /**
-     * @var integer
-     */
-    private $id;
-    
-    /**
-     * @var Intervenant
-     */
-    protected $intervenant;
-    
-    /**
-     * @var string
-     */
-    protected $adresseDossier;
-    
-    /**
-     * @var string
-     */
-    protected $adresseImport;
-    
-    /**
-     * @var string
-     */
-    protected $ribDossier;
-    
-    /**
-     * @var string
-     */
-    protected $ribImport;
-    
-    /**
-     * @var string
-     */
-    protected $nomUsuelDossier;
-    
-    /**
-     * @var string
-     */
-    protected $nomUsuelImport;
-    
-    /**
-     * @var string
-     */
-    protected $prenomDossier;
-    
-    /**
-     * @var string
-     */
-    protected $prenomImport;
-
-    function getId()
-    {
-        return $this->id;
-    }
-
-    function getAdresseDossier()
-    {
-        return $this->adresseDossier;
-    }
-
-    function getAdresseImport()
-    {
-        return $this->adresseImport;
-    }
-
-    function getRibDossier()
-    {
-        return $this->ribDossier;
-    }
-
-    function getRibImport()
-    {
-        return $this->ribImport;
-    }
-
-    function getNomUsuelDossier()
-    {
-        return $this->nomUsuelDossier;
-    }
-
-    function getNomUsuelImport()
-    {
-        return $this->nomUsuelImport;
-    }
-
-    function getPrenomDossier()
-    {
-        return $this->prenomDossier;
-    }
-
-    function getPrenomImport()
-    {
-        return $this->prenomImport;
-    }
-
-    /**
-     * Get intervenant
-     *
-     * @return \Application\Entity\Db\Intervenant 
-     */
-    public function getIntervenant()
-    {
-        return $this->intervenant;
-    }
-}
diff --git a/module/Application/src/Application/Entity/Db/VolumeHoraire.php b/module/Application/src/Application/Entity/Db/VolumeHoraire.php
index 2e863bd7708a3a0d4131cc8d5f4236dc8746ce7e..a3d1d1929ff074dd4447525d731e1d6bfa0ee177 100644
--- a/module/Application/src/Application/Entity/Db/VolumeHoraire.php
+++ b/module/Application/src/Application/Entity/Db/VolumeHoraire.php
@@ -70,11 +70,6 @@ class VolumeHoraire implements HistoriqueAwareInterface, ResourceInterface
      */
     protected $remove = false;
 
-    /**
-     * @var FormuleVolumeHoraire
-     */
-    private $formuleVolumeHoraire;
-
     /**
      * @var \Doctrine\Common\Collections\Collection
      */
@@ -419,18 +414,6 @@ class VolumeHoraire implements HistoriqueAwareInterface, ResourceInterface
 
 
 
-    /**
-     * Get formuleVolumeHoraire
-     *
-     * @return FormuleVolumeHoraire
-     */
-    public function getFormuleVolumeHoraire()
-    {
-        return $this->formuleVolumeHoraire;
-    }
-
-
-
     /**
      * Get formuleResultatVolumeHoraire
      *
diff --git a/module/Application/src/Application/Processus/ServiceProcessus.php b/module/Application/src/Application/Processus/ServiceProcessus.php
index 28c11952689c82efdff5dda98e29676aedb669fe..762ad5662878a704f5be3e5393520884877ba3af 100755
--- a/module/Application/src/Application/Processus/ServiceProcessus.php
+++ b/module/Application/src/Application/Processus/ServiceProcessus.php
@@ -39,8 +39,6 @@ class ServiceProcessus extends AbstractProcessus
      */
     public function getServices($intervenant, $recherche)
     {
-        //\Test\Util::sqlLog($this->getServiceService()->getEntityManager());
-
         $role = $this->getServiceContext()->getSelectedIdentityRole();
         if ($role->getIntervenant()) {
             $intervenant = $role->getIntervenant();
@@ -62,9 +60,6 @@ class ServiceProcessus extends AbstractProcessus
             ->leftJoin( $elementPedagogiqueService,     $qb, 'elementPedagogique',  ['id', 'sourceCode', 'libelle', 'histoDestruction', 'fi', 'fc', 'fa', 'tauxFi', 'tauxFc', 'tauxFa', 'tauxFoad'] )
             ->leftjoin( $volumeHoraireService,          $qb, 'volumeHoraire',       ['id', 'heures'] );
 
-//        $intervenantService
-//            ->leftJoin( 'applicationUtilisateur',       $qb, 'utilisateur',         true );
-
         $elementPedagogiqueService
             ->leftJoin( $structureService,              $qb, 'structure',           ['id', 'libelleCourt'] )
             ->leftJoin( $etapeService,                  $qb, 'etape',               ['id', 'libelle', 'niveau', 'histoDestruction', 'sourceCode'] )
@@ -72,10 +67,9 @@ class ServiceProcessus extends AbstractProcessus
             ->leftJoin( 'applicationTypeIntervention',  $qb, 'typeIntervention',    ['id', 'code', 'libelle', 'ordre'] );
 
         $volumeHoraireService
-            ->leftJoin( 'applicationMotifNonPaiement',  $qb, 'motifNonPaiement',    ['id', 'libelleCourt', 'libelleLong'] );
+            ->leftJoin( 'applicationMotifNonPaiement',  $qb, 'motifNonPaiement',    ['id', 'libelleCourt', 'libelleLong'] )
+            ->leftJoin( 'applicationEtatVolumeHoraire', $qb, 'etatVolumeHoraire',   ['id','code','libelle','ordre'] );
 
-        $volumeHoraireService->leftJoin( 'applicationEtatVolumeHoraire',    $qb, 'etatVolumeHoraire',    ['id','code','libelle','ordre'] );
-        $volumeHoraireService->leftJoin( 'ApplicationFormuleVolumeHoraire', $qb, 'formuleVolumeHoraire', ['id'] );
         //@formatter:on
 
         $service->finderByContext($qb);
diff --git a/module/Application/src/Application/Provider/Role/RoleProvider.php b/module/Application/src/Application/Provider/Role/RoleProvider.php
index 9360a4a919981066d70bbbaf9f99332456acdde5..ef9e27e79e00ac2d6616e9befacb55c4215ba146 100644
--- a/module/Application/src/Application/Provider/Role/RoleProvider.php
+++ b/module/Application/src/Application/Provider/Role/RoleProvider.php
@@ -147,6 +147,7 @@ class RoleProvider implements ProviderInterface, EntityManagerAwareInterface
                 $role->setPeutChangerStructure(true);
             }
             /* @var $role Role */
+            $role->setDbRole( $dbRole );
             $role->setPersonnel($personnel);
             $role->setPerimetre($dbRole->getPerimetre());
 
@@ -165,6 +166,7 @@ class RoleProvider implements ProviderInterface, EntityManagerAwareInterface
                     if (!isset($roles[$affRoleId])) {
                         $affRoleLibelle = $dbRole->getLibelle() . ' (' . $structure->getLibelleCourt() . ')';
                         $affRole        = new \Application\Acl\Role($affRoleId, $roleId, $affRoleLibelle);
+                        $affRole->setDbRole( $dbRole );
                         $affRole->setPersonnel($personnel);
                         $affRole->setStructure($structure);
                         $roles[$affRoleId] = $affRole;
diff --git a/module/Application/src/Application/Service/Affectation.php b/module/Application/src/Application/Service/Affectation.php
index eb6ab5ec9488fde9f489188f4051c13a23286ef3..abf809ddc91a15db2cf47b40933129850bca6469 100644
--- a/module/Application/src/Application/Service/Affectation.php
+++ b/module/Application/src/Application/Service/Affectation.php
@@ -2,6 +2,7 @@
 
 namespace Application\Service;
 
+use Application\Acl\Role;
 use Application\Service\Traits\SourceAwareTrait;
 use Doctrine\ORM\QueryBuilder;
 use Application\Entity\Db\Affectation as EntityAffectation;
@@ -55,6 +56,34 @@ class Affectation extends AbstractEntityService
         return parent::save($entity);
     }
 
+
+
+    /**
+     * @param Role|null $role
+     *
+     * @return null|EntityAffectation
+     */
+    public function getByRole( Role $role = null )
+    {
+        if (!$role){
+            $role = $this->getServiceContext()->getSelectedIdentityRole();
+        }
+
+        if (!$role->getPersonnel()) return null;
+
+        $this->getEntityManager()->getFilters()->enable('historique')->init([
+            EntityAffectation::class,
+        ]);
+
+        return $this->getRepo()->findOneBy([
+            'personnel' => $role->getPersonnel(),
+            'role'      => $role->getDbRole(),
+            'structure' => $role->getStructure(),
+        ]);
+    }
+
+
+
     /**
      * 
      * @param \Application\Entity\Db\Role|string $role
diff --git a/module/Application/src/Application/Service/Indicateur/AbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/AbstractIndicateurImpl.php
deleted file mode 100644
index 440d37eb675d47edb7bb869bc082b3d17dcf5e3d..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/AbstractIndicateurImpl.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur;
-
-use Application\Entity\Db\Indicateur as IndicateurEntity;
-use Application\Entity\Db\Structure as StructureEntity;
-use Application\Service\AbstractService;
-use Application\Entity\Db\Traits\StructureAwareTrait;
-use LogicException;
-use Traversable;
-use Zend\Filter\Callback;
-use Zend\Filter\FilterInterface;
-use Zend\Mvc\Controller\Plugin\Url;
-
-/**
- * Description of SaisieServiceApresContratAvenantIndicateur
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AbstractIndicateurImpl extends AbstractService implements IndicateurImplInterface
-{
-    use StructureAwareTrait;
-    
-    protected $singularTitlePattern;
-    protected $pluralTitlePattern;
-            
-    /**
-     * 
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getTitle();
-    }
-    
-    /**
-     * @var IndicateurEntity 
-     */
-    protected $indicateurEntity;
-    
-    /**
-     * 
-     * @param IndicateurEntity $indicateurEntity
-     * @return self
-     */
-    public function setIndicateurEntity(IndicateurEntity $indicateurEntity)
-    {
-        $this->indicateurEntity = $indicateurEntity;
-        
-        return $this;
-    }
-    
-    /**
-     * 
-     * @return IndicateurEntity
-     */
-    function getIndicateurEntity()
-    {
-        return $this->indicateurEntity;
-    }
-
-    /**
-     * @var Traversable
-     */
-    protected $result;
-    
-    /**
-     * @var int
-     */
-    protected $resultCount;
-
-
-
-
-
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $resultCount = $this->getResultCount();
-        $pattern     = $resultCount === 1 ? $this->singularTitlePattern : $this->pluralTitlePattern;
-        $title       = sprintf($pattern, $resultCount);
-        
-        if ($appendStructure && ($structure = $this->getStructure())) {
-            $title .= " ($structure)";
-        }
-        
-        return $title;
-    }
-    
-    /**
-     * @var FilterInterface 
-     */
-    protected $resultItemFormatter;
-
-    /**
-     * @var FilterInterface
-     */
-    protected $resultItemIdExtractor;
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $toString = function($value) { 
-                if (!is_object($value) && settype($value, 'string') !== false 
-                        || is_object($value) && method_exists($value, '__toString')) {
-                    return (string) $value; 
-                }
-                return sprintf("Impossible de formatter l'item de type '%s' en chaîne de caractères.", 
-                        is_object($value) ? get_class($value) : gettype($value));
-            };
-            $this->resultItemFormatter = new Callback($toString);
-        }
-        
-        return $this->resultItemFormatter;
-    }
-
-    /**
-     * Retourne le filtre permettant d'obtenir l'id éventuel de chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIdExtractor()
-    {
-        throw new LogicException("Méthode non implémentée");
-    }
-    
-    /**
-     * Retourne le plugin Url permettant de générer l'URL associé à un résultat d'indicateur.
-     * 
-     * @return Url
-     */
-    protected function getHelperUrl()
-    {
-        return $this->getServiceLocator()->get('ControllerPluginManager')->get('Url');
-    }
-
-    /**
-     * @var bool
-     */
-    protected $dirtyResult = true;
-
-    /**
-     * @var bool
-     */
-    protected $dirtyResultCount = true;
-    
-    /**
-     * Met cet objet à l'état "dirty" 
-     * (i.e. recalcul nécessaire du résultat et de la taille du résultat).
-     * 
-     * @return self
-     */
-    protected function setDirty()
-    {
-        $this->dirtyResult      = true;
-        $this->dirtyResultCount = true;
-        
-        return $this;
-    }
-    
-    /**
-     * Surcharge pour mettre l'indicateur à l'état "dirty" lorsque la structure change.
-     * 
-     * @param StructureEntity $structure
-     * @return self
-     */
-    public function setStructure(StructureEntity $structure = null)
-    {
-        if ($structure !== $this->getStructure()) {
-            $this->setDirty();
-        }
-        
-        $this->structure = $structure;
-        
-        return $this;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/AbstractIntervenantResultIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/AbstractIntervenantResultIndicateurImpl.php
deleted file mode 100644
index 8ec5bec1a47f376d39b6d2ed251f5675f09f97bf..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/AbstractIntervenantResultIndicateurImpl.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur;
-
-use Application\Entity\Db\Annee;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use LogicException;
-use RuntimeException;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\ORMException;
-use Traversable;
-use Zend\Filter\Callback;
-use Zend\Filter\FilterInterface;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AbstractIntervenantResultIndicateurImpl extends AbstractIndicateurImpl
-{
-    protected $intervenantMessage;
-    protected $resultItemIntervenantExtractor;
-
-    /**
-     * Retourne la liste de résultats renvoyée par l'indicateur.
-     * 
-     * @return Traversable
-     */
-    public function getResult()
-    {
-        if (null === $this->result || $this->dirtyResult) {
-            $qb = $this->getQueryBuilder();
-            try {
-                $this->result = $qb->getQuery()->getResult();
-            }
-            catch (ORMException $e) {
-                throw new RuntimeException(
-                        "Erreur rencontrée lors de la requete de l'indicateur {$this->getIndicateurEntity()->getCode()}.",
-                        null, 
-                        $e);
-            }
-            $this->dirtyResult = false;
-        }
-            
-        return $this->result;
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $method = __METHOD__;
-            $this->resultItemIntervenantExtractor = new Callback(function($resultItem) use ($method) {
-                $this->assertCallbackResultItemArgumentIsIntervenant($resultItem, $method);
-                $intervenant = $resultItem;
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-
-    private function assertCallbackResultItemArgumentIsIntervenant($resultItem, $method)
-    {
-        if (! $resultItem instanceof IntervenantEntity) {
-            throw new LogicException(sprintf(
-                "L'argument transmis au filtre n'est pas du type %s attendu, redéfinissez la méthode %s dans la classe %s pour fournir un autre filtre.",
-                'Application\Entity\Db\Intervenant',
-                $method,
-                get_called_class()
-            ));
-        }
-
-        return $this;
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $method = __METHOD__;
-            $this->resultItemFormatter = new Callback(function($resultItem) use ($method) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("%s <small>(n°%s%s)</small>",
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut()->estPermanent() ? ", " . $intervenant->getStructure() : null);
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-
-    /**
-     * Retourne le filtre permettant d'obtenir l'id éventuel de chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIdExtractor()
-    {
-        if (null === $this->resultItemIdExtractor) {
-            $method = __METHOD__;
-            $this->resultItemIdExtractor = new Callback(function($resultItem) use ($method) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                return (string) $intervenant->getSourceCode(); // NB: les intervenants sont généralement identifiés par leur sourceCode.
-            });
-        }
-
-        return $this->resultItemIdExtractor;
-    }
-    
-    /**
-     * 
-     * @return integer
-     */
-    public function getResultCount()
-    {
-        if (null !== $this->resultCount && !$this->dirtyResultCount) {
-            return $this->resultCount;
-        }
-        
-        if (null !== $this->result && !$this->dirtyResult) {
-            $this->resultCount = count($this->result);
-        }
-        else {
-            $qb = $this->getQueryBuilder()->select("COUNT(DISTINCT int)");
-            
-            try {
-                $this->resultCount = (int) $qb->getQuery()->getSingleScalarResult();
-            }
-            catch (ORMException $e) {
-                throw new RuntimeException(
-                        "Erreur rencontrée lors de la requete COUNT de l'indicateur {$this->getIndicateurEntity()->getCode()}.",
-                        null, 
-                        $e);
-            }
-        }
-        
-        $this->dirtyResultCount = false;
-        
-        return $this->resultCount;
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->select("int, si, ti, str")
-            ->join("int.statut", "si")
-            ->join("si.typeIntervenant", "ti")
-            ->join("int.structure", "str")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee())
-            ->andWhere("1 = pasHistorise(int)");
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne l'éventuel message s'adressant à l'intervenant à propos de cet indicateur.
-     * 
-     * @return string|null
-     */
-    public function getIntervenantMessage()
-    {
-        return $this->intervenantMessage;
-    }
-
-    /**
-     * 
-     * @return Annee
-     */
-    protected function getAnnee()
-    {
-        return $this->getServiceContext()->getAnnee();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementAbstractIndicateurImpl.php
deleted file mode 100644
index 010dfd0668778b6a3250ea0ee675b049210148fa..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Agrement;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeAgrement;
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteAgrementAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire est en attente d'agrément du %s";
-    protected $pluralTitlePattern   = "%s vacataires sont en attente d'agrément du %s";
-    protected $codeTypeAgrement     = TypeAgrement::CODE_CONSEIL_RESTREINT;
-    protected $codeEtape            = WfEtape::CODE_CONSEIL_RESTREINT;
-
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getTypeAgrement());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getTypeAgrement());
-        
-        return parent::getTitle($appendStructure);
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/agrement/liste', 
-                ['intervenant'  => $result->getRouteParam(), 'typeAgrement' => $this->getTypeAgrement()->getId()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-            ->andWhere("ti.code = :type")
-            ->setParameter('type', TypeIntervenant::CODE_EXTERIEUR);
-        
-        /**
-         * Dans la progression de l'intervenant dans le WF, toutes les étapes précédant l'étape 
-         * "Agrément Conseil Restreint" doivent avoir été franchies
-         */
-        $qb
-                ->join("int.wfIntervenantEtape", "p", Join::WITH, "p.courante = 1")
-                ->join("p.etape", "e", Join::WITH, "e.code = :codeEtape")
-                ->setParameter('codeEtape', $this->codeEtape);
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée éventuelle.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->andWhere( "ep.structure = :structure")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-         
-        return $qb;
-    }
-    
-    protected $typeAgrement;
-    
-    /**
-     * Retourne le type d'agrément concerné.
-     * 
-     * @return TypeAgrement
-     */
-    public function getTypeAgrement()
-    {
-        if (null === $this->typeAgrement) {
-            $service            = $this->getServiceLocator()->get('ApplicationTypeAgrement');
-            $qb                 = $service->finderByCode($this->codeTypeAgrement);
-            $this->typeAgrement = $qb->getQuery()->getOneOrNullResult();
-        }
-        
-        return $this->typeAgrement;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCAIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCAIndicateurImpl.php
deleted file mode 100644
index d959ee95108023e8765b5532dd1bfcc7468569ea..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCAIndicateurImpl.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Agrement;
-
-use Application\Entity\Db\TypeAgrement;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\Agrement\AttenteAgrementAbstractIndicateurImpl;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteAgrementCAIndicateurImpl extends AttenteAgrementAbstractIndicateurImpl
-{
-    protected $codeTypeAgrement = TypeAgrement::CODE_CONSEIL_ACADEMIQUE;
-    protected $codeEtape        = WfEtape::CODE_CONSEIL_ACADEMIQUE;
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCRIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCRIndicateurImpl.php
deleted file mode 100644
index 79abc79795a9070805dbd18dac945639665ce1fc..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Agrement/AttenteAgrementCRIndicateurImpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Agrement;
-
-use Application\Entity\Db\TypeAgrement;
-use Application\Entity\Db\WfEtape;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteAgrementCRIndicateurImpl extends AttenteAgrementAbstractIndicateurImpl
-{
-    protected $codeTypeAgrement = TypeAgrement::CODE_CONSEIL_RESTREINT;
-    protected $codeEtape        = WfEtape::CODE_CONSEIL_RESTREINT;
-    
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder();
-        
-        /**
-         * L'étape "Agrément du CR" du WF est déclinée par structure d'intervention dans la progression.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("p.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        return $qb;
-    }
-}
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/AgrementCAMaisPasContratIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/AgrementCAMaisPasContratIndicateurImpl.php
deleted file mode 100644
index 49bf99bc24e6f0d329558b052f413f97a68110c7..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/AgrementCAMaisPasContratIndicateurImpl.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeAgrement;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AgrementCAMaisPasContratIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-
-    protected $singularTitlePattern = "%s vacataire a reçu l'agrément du Conseil Académique et n'a pas encore de contrat/avenant";
-    protected $pluralTitlePattern   = "%s vacataires ont reçu l'agrément du Conseil Académique et n'ont pas encore de contrat/avenant";
-
-
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/contrat', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-                ->join("int.statut", "st", Join::WITH, "st.peutAvoirContrat = 1")
-                ->join("int.agrement", "a")
-                ->join("a.type", "ta", Join::WITH, "ta.code = :cta")
-                ->setParameter('cta', TypeAgrement::CODE_CONSEIL_ACADEMIQUE)
-                // l'étape Contrat doit être courante
-                ->join("int.wfIntervenantEtape", "p", Join::WITH, "p.courante = 1")
-                ->join("p.etape", "e", Join::WITH, "e.code = :ce")
-                ->setParameter('ce', WfEtape::CODE_CONTRAT)
-                ->andWhere("int.annee = :annee")
-                ->setParameter("annee", $this->getServiceContext()->getAnnee())
-                ->andWhere("1 = pasHistorise(a)");
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->leftJoin("int.contrat", "c", Join::WITH, "c.validation IS NOT NULL AND c.structure = :structure AND 1 = pasHistorise(c)")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        else {
-            $qb->leftJoin("int.contrat", "c", Join::WITH, "c.validation IS NOT NULL AND 1 = pasHistorise(c)");
-        }
-        
-        $qb->andWhere("c.id IS NULL");
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep")
-                ->setParameter('structure', $this->getStructure())
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->andWhere("ep.structure = :structure")
-                ->setParameter('tvh', $this->getServiceTypeVolumeHoraire()->getPrevu())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-         
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteAvenantIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/AttenteAvenantIndicateurImpl.php
deleted file mode 100644
index f1a1f405bb3d2827b278e5a9c04c38b0fca708d8..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteAvenantIndicateurImpl.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeContrat;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteAvenantIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire est en attente de son avenant";
-    protected $pluralTitlePattern   = "%s vacataires sont en attente de leur avenant";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/contrat', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.statut", "st", Join::WITH, "st.peutAvoirContrat = 1")
-            ->join("int.service", "s")
-            ->join("s.elementPedagogique", "ep")
-            ->join("s.volumeHoraire", "vh")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")->setParameter('tvh', $this->getTypeVolumeHoraire())
-            ->join("vh.validation", "v")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(ep)")
-            ->andWhere("1 = pasHistorise(vh)")
-            ->andWhere("1 = pasHistorise(v)");
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("ep.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        /**
-         * L'intervenant doit posséder un contrat initial validé.
-         */
-        $qb
-            ->join("int.contrat", "ci")
-            ->join("ci.validation", "vci")
-            ->join("ci.typeContrat", "tc", Join::WITH, "tc.code = :codeTypeContratInitial")
-            ->setParameter('codeTypeContratInitial', TypeContrat::CODE_CONTRAT)
-            ->andWhere("1 = pasHistorise(ci)")
-            ->andWhere("1 = pasHistorise(vci)");
-        
-        /**
-         * L'étape Contrat/avenant doit être l'étape courante pour la composante d'enseignement concernée.
-         */
-        $qb
-                ->join("int.wfIntervenantEtape", "p", Join::WITH, "p.courante = 1")
-                ->join("p.etape", "e", Join::WITH, "e.code = :code")
-                ->setParameter('code', WfEtape::CODE_CONTRAT);
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("p.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    public function getTypeVolumeHoraire()
-    {
-        return $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteContratIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/AttenteContratIndicateurImpl.php
deleted file mode 100644
index b58f2b0f08704c7c62922bae12904c148658b7c6..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteContratIndicateurImpl.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeContrat;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteContratIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire est en attente de son contrat initial";
-    protected $pluralTitlePattern   = "%s vacataires sont en attente de leur contrat initial";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/contrat', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.statut", "st", Join::WITH, "st.peutAvoirContrat = 1")
-            ->join("int.service", "s")
-            ->join("s.elementPedagogique", "ep")
-            ->join("s.volumeHoraire", "vh")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")->setParameter('tvh', $this->getTypeVolumeHoraire())
-            ->join("vh.validation", "v")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(ep)")
-            ->andWhere("1 = pasHistorise(vh)")
-            ->andWhere("1 = pasHistorise(v)");
-
-        /**
-         * Dans la progression de l'intervenant dans le WF, toutes les étapes précédant l'étape Contrat doivent avoir été franchies
-         */
-        $qb
-                ->join("int.wfIntervenantEtape", "p", Join::WITH, "p.courante = 1")
-                ->join("p.etape", "e", Join::WITH, "e.code = :codeEtape")
-                ->setParameter('codeEtape', WfEtape::CODE_CONTRAT);
-        
-        /**
-         * Aucun contrat validé ne doit exister
-         */
-        $notExists = 
-                "SELECT c FROM Application\Entity\Db\Contrat c " .
-                "JOIN c.typeContrat tc WITH tc.code = :codeTypeContrat " .
-                "WHERE c.intervenant = int AND c.validation IS NOT NULL " .
-                "AND 1 = pasHistorise(c)";
-        $qb
-                ->andWhere("NOT EXISTS ( $notExists )")
-                ->setParameter('codeTypeContrat', TypeContrat::CODE_CONTRAT);
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("ep.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-
-        $qb->orderBy("int.nomUsuel, int.prenom");
-         
-        return $qb;
-    }
-    
-    public function getTypeVolumeHoraire()
-    {
-        return $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteRetourContratIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/AttenteRetourContratIndicateurImpl.php
deleted file mode 100644
index 80077323d5b6f3f1aab5845a13dab69ca47e2014..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/AttenteRetourContratIndicateurImpl.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeContrat;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteRetourContratIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $intervenantMessage   = "Votre contrat ou l'un de vos avenants est en attente de retour signé.";
-    protected $singularTitlePattern = "%s contrat de vacataires est en attente de retour";
-    protected $pluralTitlePattern   = "%s contrats de vacataires sont en attente de retour";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/contrat', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    public function getResultCount()
-    {
-        $qb = $this->getTitleQueryBuilder()->select("COUNT(DISTINCT c)");
-
-        return (int) $qb->getQuery()->getSingleScalarResult();
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getTitleQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Contrat !
-        $this->getEntityManager()->clear('Application\Entity\Db\Contrat');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Contrat')->createQueryBuilder("c");
-        $qb
-            ->join("c.intervenant", "intc", Join::WITH, "intc.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        $this->initQueryBuilder($qb);
-        
-        return $qb;
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.contrat", "c")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        $this->initQueryBuilder($qb);
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    protected function initQueryBuilder(QueryBuilder $qb)
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb
-            ->join("c.typeContrat", "tc", Join::WITH, "tc.code = :codeTypeContrat")
-            ->setParameter('codeTypeContrat', TypeContrat::CODE_CONTRAT)
-            ->join("c.validation", "v", Join::WITH, "1 = pasHistorise(v)")
-            ->andWhere("c.dateRetourSigne IS NULL AND 1 = pasHistorise(c)");
-     
-        /**
-         * NB: pas besoin de consulter la progression dans le workflow car si l'intervenant a déjà un contrat/avenant,
-         * c'est qu'il a bien atteint l'étape "contrat".
-         */
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("c.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/ContratAvenantDeposesIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/ContratAvenantDeposesIndicateurImpl.php
deleted file mode 100644
index 56ea2f11116c96f011f754f95a358f7a90b33bca..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/ContratAvenantDeposesIndicateurImpl.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\Indicateur\DateAwareIndicateurImplInterface;
-use Application\Constants;
-use DateTime;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class ContratAvenantDeposesIndicateurImpl extends AbstractIntervenantResultIndicateurImpl implements DateAwareIndicateurImplInterface
-{
-    protected $singularTitlePattern = "%s contrat/avenant de vacataire a été déposé";
-    protected $pluralTitlePattern   = "%s contrats/avenants de vacataire ont été déposés";
-    protected $dateDepuis;
-    
-    /**
-     * Spécifie la date inférieure utilisée comme critère de recherche.
-     * 
-     * @param DateTime $dateDepuis
-     * @return self
-     */
-    function setDate(DateTime $dateDepuis = null)
-    {
-        $this->dateDepuis = $dateDepuis;
-        
-        $this->setDirty();
-        
-        return $this;
-    }
-
-    /**
-     * Retourne la date inférieure utilisée comme critère de recherche.
-     * 
-     * @return DateTime
-     */
-    public function getDate()
-    {
-        return $this->dateDepuis;
-    }
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        if ($this->getDate()) {
-            $suffix = " depuis le " . $this->getDate()->format(Constants::DATETIME_FORMAT);
-            $this->singularTitlePattern .= $suffix;
-            $this->pluralTitlePattern   .= $suffix;
-        }
-        
-        $count   = $this->getResultCount();
-        $pattern = $count === 1 ? $this->singularTitlePattern : $this->pluralTitlePattern;
-        $title   = sprintf($pattern, $count);
-        
-        if ($this->getStructure()) {
-            $title .= " ({$this->getStructure()})";
-        }
-        
-        return $title;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/contrat', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return int
-     */
-    public function getResultCount()
-    {
-        $qb = $this->getTitleQueryBuilder()->select("COUNT(DISTINCT c)");
-
-        return (int) $qb->getQuery()->getSingleScalarResult();
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getTitleQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Contrat !
-        $this->getEntityManager()->clear('Application\Entity\Db\Contrat');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Contrat')->createQueryBuilder("c");
-        $qb
-            ->join("c.intervenant", "intc", Join::WITH, "1 = pasHistorise(intc)")
-            ->join("c.fichier", "f", Join::WITH, "1 = pasHistorise(f)")
-            ->andWhere("intc.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee())
-            ->andWhere("1 = pasHistorise(c)");
-        
-        if ($this->getDate()) {
-            $qb
-                ->andWhere("f.histoCreation >= :dateDepuis")
-                ->setParameter("dateDepuis", $this->getDate());
-        }
-        
-        /**
-         * NB: pas besoin de consulter la progression dans le workflow car si l'intervenant a déjà un contrat/avenant,
-         * c'est qu'il a bien atteint l'étape "contrat".
-         */
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("c.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        return $qb;
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.contrat", "c", Join::WITH, "1 = pasHistorise(c)")
-            ->join("c.fichier", "f", Join::WITH, "1 = pasHistorise(f)")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-     
-        /**
-         * NB: pas besoin de consulter la progression dans le workflow car si l'intervenant a déjà un contrat/avenant,
-         * c'est qu'il a bien atteint l'étape "contrat".
-         */
-        
-        if ($this->getDate()) {
-            $qb
-                ->andWhere("f.histoCreation >= :dateDepuis")
-                ->setParameter("dateDepuis", $this->getDate());
-        }
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("c.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Contrat/SaisieServiceApresContratAvenantIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Contrat/SaisieServiceApresContratAvenantIndicateurImpl.php
deleted file mode 100644
index f850df1da0f203b97957ad4eef66c621b799cb1b..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Contrat/SaisieServiceApresContratAvenantIndicateurImpl.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Contrat;
-
-use Application\Entity\Db\TypeVolumeHoraire;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class SaisieServiceApresContratAvenantIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire a saisi des heures d'enseignements <em>Prévisionnels</em> supplémentaires depuis l'édition de son contrat ou avenant";
-    protected $pluralTitlePattern   = "%s vacataires ont saisi des heures d'enseignements <em>Prévisionnels</em> supplémentaires depuis l'édition de leur contrat ou avenant";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-service', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.contrat", "c")
-            ->join("int.service", "s")
-            ->join("s.elementPedagogique", "ep")
-            ->join("s.volumeHoraire", "vh", Join::WITH, "vh.contrat IS NULL")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh.code = :codeTvh")
-            ->setParameter('codeTvh', TypeVolumeHoraire::CODE_PREVU)
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(ep)")
-            ->andWhere("1 = pasHistorise(vh)")
-            ->andWhere("1 = pasHistorise(c)");
-     
-        /**
-         * NB: pas besoin de consulter la progression dans le workflow car si l'intervenant a déjà un contrat/avenant,
-         * c'est qu'il a bien atteint l'étape "contrat".
-         */
-        
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("ep.structure = :structure")
-                    ->andWhere("c.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/DateAwareIndicateurImplInterface.php b/module/Application/src/Application/Service/Indicateur/DateAwareIndicateurImplInterface.php
deleted file mode 100644
index 7d9872a317c09e2006f0e7dccf61355d3be0e099..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/DateAwareIndicateurImplInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur;
-
-use DateTime;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-interface DateAwareIndicateurImplInterface
-{
-    /**
-     * @param DateTime $date
-     */
-    public function setDate(DateTime $date = null);
-    
-    /**
-     * @return DateTime
-     */
-    public function getDate();
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Dossier/AttenteValidationDonneesPersoIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Dossier/AttenteValidationDonneesPersoIndicateurImpl.php
deleted file mode 100644
index db5b392f90e868c0eb2557c09e55032f3a220e26..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Dossier/AttenteValidationDonneesPersoIndicateurImpl.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Dossier;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationDonneesPersoIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire est en attente de validation de ses données personnelles";
-    protected $pluralTitlePattern   = "%s vacataires sont en attente de validation de leurs données personnelles";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-dossier', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.statut", "st", Join::WITH, "st.peutSaisirDossier = 1")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        /**
-         * Dans la progression de l'intervenant dans le WF, toutes les étapes précédant l'étape 
-         * "Validation des données perso" doivent avoir été franchies
-         */
-        $qb
-                ->join("int.wfIntervenantEtape", "p", Join::WITH, "p.courante = 1")
-                ->join("p.etape", "e", Join::WITH, "e.code = :codeEtape")
-                ->setParameter('codeEtape', WfEtape::CODE_DONNEES_PERSO_VALIDATION);
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée éventuelle.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep", Join::WITH, "ep.structure = :structure")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-         
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoDiffImportIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoDiffImportIndicateurImpl.php
deleted file mode 100644
index 56402066bcaabc87ee819880ea05525626032aab..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoDiffImportIndicateurImpl.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Dossier;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class DonneesPersoDiffImportIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire a saisi des données personnelles qui diffèrent de celles importées";
-    protected $pluralTitlePattern   = "%s vacataires ont saisi des données personnelles qui diffèrent de celles importées";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'indicateur/result-item', 
-                ['action' => 'result-item-donnees-perso-diff-import', 'intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\Intervenant')->createQueryBuilder("int");
-        $qb
-            ->join("int.statut", "st", Join::WITH, "st.peutSaisirDossier = 1")
-            ->join("int.vIndicDiffDossier", "vidd")
-            ->andWhere(
-                    "vidd.adresseDossier IS NOT NULL OR " .
-                    "vidd.ribDossier IS NOT NULL OR " .
-                    "vidd.nomUsuelDossier IS NOT NULL OR " .
-                    "vidd.prenomDossier IS NOT NULL")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée éventuelle.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep", Join::WITH, "ep.structure = :structure")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoModifIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoModifIndicateurImpl.php
deleted file mode 100644
index 2f7830e4f2bd7344de9904b2ff823810b2e02869..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Dossier/DonneesPersoModifIndicateurImpl.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Dossier;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class DonneesPersoModifIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s vacataire a modifié des informations importantes dans ses données personnelles";
-    protected $pluralTitlePattern   = "%s vacataires ont modifié des informations importantes dans leurs données personnelles";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'indicateur/result-item', 
-                ['action' => 'result-item-donnees-perso-modif', 'intervenant' => $result->getRouteParam()],
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-            ->join("int.indicModifDossier", "t", Join::WITH, "1 = pasHistorise(t)");
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée éventuelle.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep", Join::WITH, "ep.structure = :structure")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-//        print_r($qb->getQuery()->getSQL());
-
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/IndicateurImplInterface.php b/module/Application/src/Application/Service/Indicateur/IndicateurImplInterface.php
deleted file mode 100644
index 25aa7a3e43dbde89af2037780d03a1646b74b13b..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/IndicateurImplInterface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur;
-
-use Traversable;
-use Zend\Filter\FilterInterface;
-
-/**
- * Interface définissant l'implémentation d'un indcateur.
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-interface IndicateurImplInterface
-{
-    /**
-     * Retourne la liste de résultats renvoyée par l'indicateur.
-     * 
-     * @return Traversable
-     */
-    public function getResult();
-    
-    /**
-     * Retourne le nombre de ligne dans la liste de résultats renvoyée par l'indicateur.
-     * 
-     * @return int
-     */
-    public function getResultCount();
-
-    /**
-     * Retourne l'intitulé de l'indicateur.
-     * 
-     * @param bool $appendStructure Faut-il inclure la structure concernée
-     * @return string
-     */
-    public function getTitle($appendStructure = true);
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter();
-    
-    /**
-     * Retourne l'URL associée à un item de la liste de résultat renvoyée par l'indicateur.
-     * 
-     * @param mixed $resultItem Un item de la liste de résultat
-     * @return string
-     */
-    public function getResultItemUrl($resultItem);
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepAbstractIndicateurImpl.php
deleted file mode 100644
index ab1264c08e6eeda08938c1c05e1c328221c1313d..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\VIndicAttenteDemandeMep as VIndicAttenteDemandeMepEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Filter\Callback;
-use Zend\Filter\FilterInterface;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteDemandeMepAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use TypeIntervenantAwareTrait;
-    
-    protected $singularTitlePattern = "%s %s peut    faire l'objet d'une demande de mise en paiement";
-    protected $pluralTitlePattern   = "%s %s peuvent faire l'objet d'une demande de mise en paiement";
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-                $this->singularTitlePattern, 
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataire" : "permanent");
-        $this->pluralTitlePattern   = sprintf(
-                $this->pluralTitlePattern,   
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataires" : "permanents");
-        
-        return parent::getTitle($appendStructure);
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/demande-mise-en-paiement', 
-                ['intervenant' => $result->getIntervenant()->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicAttenteDemandeMep');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicAttenteDemandeMep')->createQueryBuilder("v");
-        $qb
-                ->addSelect("int, aff, si, str")
-                ->join("v.structure", "str")
-                ->join("v.intervenant", "int")
-                ->join("int.structure", "aff")
-                ->join("int.statut", "si")
-                ->andWhere("int.annee = :annee")
-                ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        /**
-         * Type intervenant.
-         */
-        $qb
-                ->andWhere("si.typeIntervenant = :type")
-                ->setParameter('type', $this->getTypeIntervenant());
-        
-        /**
-         * Composante d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("v.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Activation du filtrage Doctrine sur l'historique.
-     */
-    protected function initFilters()
-    {
-        $this->getEntityManager()->getFilters()->enable('historique')->init([
-            'Application\Entity\Db\Structure',
-            'Application\Entity\Db\Intervenant',
-        ]);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicAttenteDemandeMepEntity $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicAttenteDemandeMepEntity $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("<strong>%s</strong> : %s <small>(n°%s%s)</small>", 
-                    $resultItem->getStructure(),
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut()->estPermanent() ? ", Affectation: " . $intervenant->getStructure() : null);
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepPermIndicateurImpl.php
deleted file mode 100644
index 5470c72517b5cdb9dc4a9a47495ec9de74cbd501..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepPermIndicateurImpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteDemandeMepPermIndicateurImpl extends AttenteDemandeMepAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepVacIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepVacIndicateurImpl.php
deleted file mode 100644
index fea6e93a288644c7ce4f0b0bd2ae4e8b17de479e..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteDemandeMepVacIndicateurImpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteDemandeMepVacIndicateurImpl extends AttenteDemandeMepAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getExterieur() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepAbstractIndicateurImpl.php
deleted file mode 100644
index 2f3e388bbd942b06d9028fa499a27707d0c90006..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\VIndicAttenteMep as VIndicAttenteMepEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
-use Zend\Filter\Callback;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteMepAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use \Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-    
-    protected $singularTitlePattern = "%s %s  peut   faire l'objet d'une mise en paiement";
-    protected $pluralTitlePattern   = "%s %s peuvent faire l'objet d'une mise en paiement";
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-                $this->singularTitlePattern, 
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataire" : "permanent");
-        $this->pluralTitlePattern   = sprintf(
-                $this->pluralTitlePattern,   
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataires" : "permanents");
-        
-        return parent::getTitle($appendStructure);
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'paiement/etat-demande-paiement', 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $this->initFilters();
-        
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicAttenteMep');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicAttenteMep')->createQueryBuilder("v");
-        $qb
-            ->join("v.intervenant", "int")
-            ->join("int.structure", "aff")
-            ->join("int.statut", "si")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        /**
-         * L'intervenant doit posséder des heures complémentaire pouvant faire l'objet d'une (demande de) mise en paiement.
-         */
-        $qb
-                ->addSelect("int, aff, si, str")
-                ->join("v.structure", "str");
-        
-        /**
-         * Type intervenant.
-         */
-        $qb
-                ->andWhere("si.typeIntervenant = :type")
-                ->setParameter('type', $this->getTypeIntervenant());
-        
-        /**
-         * Composante d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("v.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Activation du filtrage Doctrine sur l'historique.
-     */
-    protected function initFilters()
-    {
-        $this->getEntityManager()->getFilters()->enable('historique')->init([
-            //'Application\Entity\Db\Structure',
-            'Application\Entity\Db\Intervenant',
-        ]);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicAttenteMepEntity $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicAttenteMepEntity $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("<strong>%s</strong> : %s <small>(n°%s%s)</small>", 
-                    $resultItem->getStructure(),
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut()->estPermanent() ? ", Affectation: " . $intervenant->getStructure() : null);
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepPermIndicateurImpl.php
deleted file mode 100644
index 7fac3e16cdfdc3ed1e8db5e2ec7ce55dab88badc..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepPermIndicateurImpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteMepPermIndicateurImpl extends AttenteMepAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepVacIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepVacIndicateurImpl.php
deleted file mode 100644
index 0bc47b47c24ea3ee7262247b39a1778c3f910f43..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Paiement/AttenteMepVacIndicateurImpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Paiement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteMepVacIndicateurImpl extends AttenteMepAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getExterieur() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/PieceJointe/AttentePieceJustifIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/PieceJointe/AttentePieceJustifIndicateurImpl.php
deleted file mode 100644
index 1f28c9c4dd6d4106e9821450b160252a4095f22a..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/PieceJointe/AttentePieceJustifIndicateurImpl.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\PieceJointe;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Traits\IntervenantAwareTrait;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttentePieceJustifIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use IntervenantAwareTrait;
-
-    protected $intervenantMessage   = "Vous n'avez pas fourni toutes les pièces justificatives obligatoires.";
-    protected $singularTitlePattern = "%s vacataire n'a pas fourni toutes les pièces justificatives obligatoires";
-    protected $pluralTitlePattern   = "%s vacataires n'ont pas fourni toutes les pièces justificatives obligatoires";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'piece-jointe/intervenant', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        /**
-         * Dans la progression de l'intervenant dans le WF, toutes les étapes précédant l'étape 
-         * "Pièces justificatives" doivent avoir été franchies.
-         */
-        $qb = $this->getServiceIntervenant()->finderByWfEtapeCourante(WfEtape::CODE_PJ_SAISIE);
-        $qb
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep", Join::WITH, "ep.structure = :structure")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/PieceJointe/AttenteValidationPieceJustifIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/PieceJointe/AttenteValidationPieceJustifIndicateurImpl.php
deleted file mode 100644
index 3d2cdb0654a9809933cd9e2cffb71228979e0e4e..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/PieceJointe/AttenteValidationPieceJustifIndicateurImpl.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\PieceJointe;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Traits\IntervenantAwareTrait;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPieceJustifIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use IntervenantAwareTrait;
-
-    protected $singularTitlePattern = "%s vacataire est en attente de validation de ses pièces justificatives obligatoires";
-    protected $pluralTitlePattern   = "%s vacataires sont en attente de validation de leurs pièces justificatives obligatoires";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'piece-jointe/intervenant', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives sur Intervenant !
-        $this->getEntityManager()->clear('Application\Entity\Db\Intervenant');
-        
-        /**
-         * Dans la progression de l'intervenant dans le WF, toutes les étapes précédant l'étape 
-         * "Validation des pièces justificatives" doivent avoir été franchies.
-         */
-        $qb = $this->getServiceIntervenant()->finderByWfEtapeCourante(WfEtape::CODE_PJ_VALIDATION);
-        $qb
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-        
-        /**
-         * L'intervenant doit intervenir dans la structure spécifiée.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->join("int.service", "s")
-                ->join("s.elementPedagogique", "ep", Join::WITH, "ep.structure = :structure")
-                ->join("s.volumeHoraire", "vh")
-                ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-                ->setParameter('tvh', $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu())
-                ->setParameter('structure', $this->getStructure())
-                ->andWhere("1 = pasHistorise(s)")
-                ->andWhere("1 = pasHistorise(ep)")
-                ->andWhere("1 = pasHistorise(vh)");
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Affectation/BiatssAffectMemeIntervAutreIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Affectation/BiatssAffectMemeIntervAutreIndicateurImpl.php
deleted file mode 100644
index 2092b0e279476dbd0941db00daff10bda6dfed13..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Affectation/BiatssAffectMemeIntervAutreIndicateurImpl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Affectation;
-
-use Application\Entity\Db\StatutIntervenant;
-
-
-/**
- *
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class BiatssAffectMemeIntervAutreIndicateurImpl extends IntervAffectMemeIntervAutreAbstractIndicateurImpl
-{
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getPrevu());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-
-
-
-    /**
-     * @return StatutIntervenantEntity
-     */
-    protected function getStatutIntervenant()
-    {
-        if (null === $this->statutIntervenant) {
-            $qb                      = $this->getServiceStatutIntervenant()->finderBySourceCode('BIATSS');
-            $this->statutIntervenant = $qb->getQuery()->getOneOrNullResult();
-        }
-
-        return $this->statutIntervenant;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectAutreIntervMemeAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectAutreIntervMemeAbstractIndicateurImpl.php
deleted file mode 100644
index e6b93755f8dff9a71bfb6a6ee7208cff6b03d60e..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectAutreIntervMemeAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Affectation;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\StatutIntervenant as StatutIntervenantEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\StatutIntervenant as StatutIntervenantService;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- *
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class IntervAffectAutreIntervMemeAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use \Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-    
-    protected $singularTitlePattern = "%s intervenant  '%s' affecté  dans une autre structure a   des enseignements <em>%ss Validés</em> dans ma structure (%s)";
-    protected $pluralTitlePattern   = "%s intervenants '%s' affectés dans une autre structure ont des enseignements <em>%ss Validés</em> dans ma structure (%s)";
-    protected $statutIntervenant;
-    
-    /**
-     * @return StatutIntervenantEntity
-     */
-    abstract protected function getStatutIntervenant();
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getStatutIntervenant(), $this->getTypeVolumeHoraire(), $this->getStructure());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getStatutIntervenant(), $this->getTypeVolumeHoraire(), $this->getStructure());
-        
-        return parent::getTitle(false);
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $exists = "SELECT s FROM Application\Entity\Db\Service s "
-                . "JOIN s.intervenant i WITH 1 = pasHistorise(i) "
-                . "JOIN i.structure sa "
-                . "JOIN s.elementPedagogique ep WITH 1 = pasHistorise(ep) " // NB: on ne s'intéresse pas aux enseignements fait dans un autre établissement (structureAff)
-                . "JOIN ep.structure se "
-                . "JOIN s.volumeHoraire vh WITH 1 = pasHistorise(vh) "
-                . "JOIN vh.typeVolumeHoraire tvh WITH tvh = :tvh "
-                . "JOIN vh.validation v WITH 1 = pasHistorise(v) " // les volumes horaires doivent être validés
-                . "WHERE s.intervenant = int "
-                . "AND ep.structure = :structure "
-                . "AND 1 = pasHistorise(s) ";  // intervention dans la structure spécifiée.
-        
-        $qb = parent::getQueryBuilder()
-                ->andWhere("EXISTS ($exists)")
-                ->setParameter('tvh', $this->getTypeVolumeHoraire());
-        
-        if ($this->getStatutIntervenant()) {
-            $qb
-                    ->andWhere("si = :statut")
-                    ->setParameter('statut', $this->getStatutIntervenant()); 
-        }
-        
-        /**
-         * Intervenants affectés dans une autre structure que celle spécifiée.
-         */
-        $qb
-                ->andWhere("int.structure <> :structure")
-                ->setParameter('structure', $this->getStructure());
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * @return StatutIntervenantService
-     */
-    protected function getServiceStatutIntervenant()
-    {
-        return $this->getServiceLocator()->get('ApplicationStatutIntervenant');
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectMemeIntervAutreAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectMemeIntervAutreAbstractIndicateurImpl.php
deleted file mode 100644
index a958920265c3301b8351a133e7debbeb3775af4e..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Affectation/IntervAffectMemeIntervAutreAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Affectation;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\StatutIntervenant as StatutIntervenantEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\StatutIntervenant as StatutIntervenantService;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class IntervAffectMemeIntervAutreAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use \Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-    
-    protected $singularTitlePattern = "%s intervenant  '%s' affecté  dans ma structure (%s) a   des enseignements <em>%ss Validés</em> dans une autre structure";
-    protected $pluralTitlePattern   = "%s intervenants '%s' affectés dans ma structure (%s) ont des enseignements <em>%ss Validés</em> dans une autre structure";
-    protected $statutIntervenant;
-    
-    /**
-     * @return StatutIntervenantEntity
-     */
-    abstract protected function getStatutIntervenant();
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getStatutIntervenant(), $this->getStructure(), $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getStatutIntervenant(), $this->getStructure(), $this->getTypeVolumeHoraire());
-        
-        return parent::getTitle(false);
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $exists = "SELECT s FROM Application\Entity\Db\Service s "
-                . "JOIN s.intervenant i WITH 1 = pasHistorise(s) "
-                . "JOIN i.structure sa "
-                . "JOIN s.elementPedagogique ep WITH 1 = pasHistorise(s) " // NB: on ne s'intéresse pas aux enseignements fait dans un autre établissement (structureAff)
-                . "JOIN ep.structure se "
-                . "JOIN s.volumeHoraire vh WITH 1 = pasHistorise(vh) "
-                . "JOIN vh.typeVolumeHoraire tvh WITH tvh = :tvh "
-                . "JOIN vh.validation v WITH 1 = pasHistorise(v) " // les volumes horaires doivent être validés
-                . "WHERE s.intervenant = int "
-                . "AND ep.structure <> :structure "
-                . "AND 1 = pasHistorise(s) ";  // intervention dans une autre structure que celle spécifiée.
-        
-        $qb = parent::getQueryBuilder()
-                ->andWhere("EXISTS ($exists)")
-                ->setParameter('tvh', $this->getTypeVolumeHoraire());
-        
-        if ($this->getStatutIntervenant()) {
-            $qb
-                    ->andWhere("si = :statut")
-                    ->setParameter('statut', $this->getStatutIntervenant()); 
-        }
-        
-        /**
-         * Intervenants affectés à la structure spécifiée.
-         */
-        $qb
-                ->andWhere("int.structure = :structure")
-                ->setParameter('structure', $this->getStructure());
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * @return StatutIntervenantService
-     */
-    protected function getServiceStatutIntervenant()
-    {
-        return $this->getServiceLocator()->get('ApplicationStatutIntervenant');
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectAutreIntervMemeIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectAutreIntervMemeIndicateurImpl.php
deleted file mode 100644
index 3b544445ab70d2fd58e6deb5e1d694d2484a0b81..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectAutreIntervMemeIndicateurImpl.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Affectation;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\TypeVolumeHoraire;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PermAffectAutreIntervMemeIndicateurImpl extends IntervAffectAutreIntervMemeAbstractIndicateurImpl
-{
-    protected $singularTitlePattern = "%s permanent  affecté  dans une autre structure a   des enseignements <em>%ss Validés</em> dans ma structure (%s)";
-    protected $pluralTitlePattern   = "%s permanents affectés dans une autre structure ont des enseignements <em>%ss Validés</em> dans ma structure (%s)";
-
-
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getPrevu());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-
-    /**
-     * @return StatutIntervenantEntity
-     */
-    protected function getStatutIntervenant()
-    {
-        return null;
-    }
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getTypeVolumeHoraire(), $this->getStructure());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getTypeVolumeHoraire(), $this->getStructure());
-        
-        return AbstractIntervenantResultIndicateurImpl::getTitle(false);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-                ->andWhere("ti.code = :type")
-                ->setParameter('type', TypeIntervenant::CODE_PERMANENT);
-         
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectMemeIntervAutreIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectMemeIntervAutreIndicateurImpl.php
deleted file mode 100644
index a66c1e393bb73317de50b6d424466ac34045e027..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Affectation/PermAffectMemeIntervAutreIndicateurImpl.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Affectation;
-
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\TypeVolumeHoraire;
-use Application\Entity\Db\StatutIntervenant as StatutIntervenantEntity;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PermAffectMemeIntervAutreIndicateurImpl extends IntervAffectMemeIntervAutreAbstractIndicateurImpl//AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s permanent  affecté  dans ma structure (%s) a   des enseignements <em>%ss Validés</em> dans une autre structure";
-    protected $pluralTitlePattern   = "%s permanents affectés dans ma structure (%s) ont des enseignements <em>%ss Validés</em> dans une autre structure";
-
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getPrevu());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-    
-    /**
-     * @return StatutIntervenantEntity
-     */
-    protected function getStatutIntervenant()
-    {
-        return null;
-    }
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getStructure(), $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getStructure(), $this->getTypeVolumeHoraire());
-        
-        return AbstractIntervenantResultIndicateurImpl::getTitle(false);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-                ->andWhere("ti.code = :type")
-                ->setParameter('type', TypeIntervenant::CODE_PERMANENT);
-         
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/EnsHistoIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/EnsHistoIndicateurImpl.php
deleted file mode 100644
index c661831f739d22edc080f9ad9ee4bfe24c996baf..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/EnsHistoIndicateurImpl.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service;
-
-use Application\Entity\Db\Service;
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
-use Zend\Filter\Callback;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class EnsHistoIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use \Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-    use \Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-
-    
-    protected $singularTitlePattern = "%s intervenant  a   saisi des enseignements dont l'étape, l'élément pédagogique ou la période a disparu";
-    protected $pluralTitlePattern   = "%s intervenants ont saisi des enseignements dont l'étape, l'élément pédagogique ou la période a disparu";
-    
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getPrevu();
-        }
-        
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(IntervenantEntity $resultItem) {
-                $details = [];
-                foreach ($resultItem->getService() as $service) { /* @var $service Service */
-                    $ep      = $service->getElementPedagogique();
-                    $etape   = $ep->getEtape();
-                    $periode = $ep->getPeriode();
-                    
-                    $details[] = implode(' + ', array_filter([
-                        $etape->getHistoDestruction()               ? "Étape &laquo; $etape &raquo;" : null,
-                        $ep->getHistoDestruction()                  ? "Élément &laquo; $ep &raquo;"  : null,
-                        $periode && $periode->getHistoDestruction() ? "Période &laquo; $periode &raquo;"  : null,
-                    ]));
-                }
-                $out = sprintf("%s <small>(n°%s, %s%s)</small> %s", 
-                        $i = $resultItem, 
-                        $i->getSourceCode(),
-                        $i->getStatut(),
-                        $i->getStatut()->estPermanent() ? ", " . $i->getStructure() : null,
-                        "<ul><li>" . implode("</li><li>", $details) . "</li></ul>");
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-            ->addSelect("s, se, e, ep")
-            ->join("int.service", "s")
-            ->join("s.elementPedagogique", "ep")
-            ->join("ep.structure", "se")
-            ->join("ep.etape", "e")
-            ->leftJoin("ep.periode", "p")
-            ->join("s.volumeHoraire", "vh")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-            ->setParameter('tvh', $this->getTypeVolumeHoraire())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(vh)");
-
-        /**
-         * l'étape AINSI QUE tous ces éléments sont historisés
-         * OU
-         * l'élément pédagogique est historisé
-         * OU
-         * la période éventuelle est historisée
-         */
-        $whereHistos = <<<EOS
-(
-    1 <> compriseEntre(e.histoCreation, e.histoDestruction)
-    AND NOT EXISTS(
-      SELECT
-        cp.id
-      FROM
-        Application\Entity\Db\CheminPedagogique cp
-        JOIN Application\Entity\Db\ElementPedagogique ep2 WITH ep2 = cp.elementPedagogique
-      WHERE
-        1 = compriseEntre(cp.histoCreation, cp.histoDestruction)
-        AND 1 = compriseEntre(ep2.histoCreation, ep2.histoDestruction)
-        AND cp.etape = e
-        AND ep2.annee = :fbh_annee
-    )
-)
-OR
-(
-    1 <> compriseEntre(ep.histoCreation, ep.histoDestruction)
-)
-OR 
-(
-    p.id IS NOT NULL AND 1 <> compriseEntre(p.histoCreation, p.histoDestruction)
-) 
-EOS;
-        $qb
-                ->andWhere($whereHistos)
-                ->setParameter('fbh_annee', $this->getServiceContext()->getAnnee());
-        
-        if ($this->getStructure()) {
-            /**
-             * Permanents : ceux intervenant ou affectés dans la structure spécifiée.
-             * Vacataires : ceux intervenant dans la structure spécifiée.
-             */
-            $where = "  ti.code = :codeTiPerm AND (se = :structure OR str = :structure) OR "
-                    . " ti.code = :codeTiVac  AND  se = :structure";
-            $qb
-                    ->andWhere($where)
-                    ->setParameter('codeTiPerm', TypeIntervenant::CODE_PERMANENT)
-                    ->setParameter('codeTiVac',  TypeIntervenant::CODE_EXTERIEUR)
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-
-        return $qb;
-
-        /**
-         * @todo Créer et exploiter la vue suivante équivalente :
-         *
-            SELECT to_char(i.id)||to_char(s.id)||to_char(ep.id)||to_char(e.id)||to_char(p.id)||to_char(tvh.id) id,
-              i.id intervenant_id, s.id service_id, ep.id element_pedagogique_id, e.id etape_id, p.id periode_id, tvh.id type_volume_horaire_id
-            FROM  INTERVENANT i
-            INNER JOIN SERVICE s ON i.ID = s.INTERVENANT_ID AND 1 = OSE_DIVERS.COMPRISE_ENTRE(s.HISTO_CREATION,s.HISTO_DESTRUCTION)
-            INNER JOIN ELEMENT_PEDAGOGIQUE ep ON   s.ELEMENT_PEDAGOGIQUE_ID = ep.ID AND 1 = OSE_DIVERS.COMPRISE_ENTRE(ep.HISTO_CREATION,ep.HISTO_DESTRUCTION)
-            INNER JOIN ETAPE e ON  ep.ETAPE_ID = e.ID
-            INNER JOIN VOLUME_HORAIRE vh ON s.ID = vh.SERVICE_ID AND 1 = OSE_DIVERS.COMPRISE_ENTRE(vh.HISTO_CREATION, vh.HISTO_DESTRUCTION)
-            INNER JOIN TYPE_VOLUME_HORAIRE tvh ON vh.TYPE_VOLUME_HORAIRE_ID = tvh.ID
-            LEFT JOIN PERIODE p ON ep.PERIODE_ID = p.ID
-            WHERE
-              1 = OSE_DIVERS.COMPRISE_ENTRE(i.HISTO_CREATION, i.HISTO_DESTRUCTION, NULL)
-              AND
-              (
-                -- l'étape AINSI QUE tous ces éléments sont historisés
-                (
-                  1 <> OSE_DIVERS.COMPRISE_ENTRE(e.HISTO_CREATION, e.HISTO_DESTRUCTION)
-                  AND NOT EXISTS (
-                    SELECT * FROM CHEMIN_PEDAGOGIQUE cp
-                    INNER JOIN ELEMENT_PEDAGOGIQUE ep2 ON ep2.ID = cp.ELEMENT_PEDAGOGIQUE_ID  AND 1 = OSE_DIVERS.COMPRISE_ENTRE(ep2.HISTO_CREATION, ep2.HISTO_DESTRUCTION)
-                    WHERE 1 = OSE_DIVERS.COMPRISE_ENTRE(cp.HISTO_CREATION, cp.HISTO_DESTRUCTION)
-                    AND cp.ETAPE_ID = e.ID
-                    AND ep2.ANNEE_ID = i.annee_id
-                  )
-                )
-                OR
-                -- l'élément pédagogique est historisé
-                (
-                  1 <> OSE_DIVERS.COMPRISE_ENTRE(ep.HISTO_CREATION, ep.HISTO_DESTRUCTION)
-                )
-                OR
-                -- la période éventuelle est historisée
-                (
-                  p.ID IS NOT NULL AND 1 <> OSE_DIVERS.COMPRISE_ENTRE(p.HISTO_CREATION, p.HISTO_DESTRUCTION)
-                )
-              )
-            ORDER BY i.NOM_USUEL ASC, i.PRENOM ASC
-            ;
-         *
-         */
-    }
-}
diff --git a/module/Application/src/Application/Service/Indicateur/Service/EnsRealisePermSaisieNonClotureeIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/EnsRealisePermSaisieNonClotureeIndicateurImpl.php
deleted file mode 100644
index ad78119988ea6714d41c3d5aebb1d2eafb57cc98..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/EnsRealisePermSaisieNonClotureeIndicateurImpl.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeValidation as TypeValidationEntity;
-use Application\Entity\Db\Structure as StructureEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * Description of AttenteClotureRealisePerm
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class EnsRealisePermSaisieNonClotureeIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use \Application\Service\Traits\StructureAwareTrait;
-    
-    protected $singularTitlePattern = "%s permanent  n'a   pas clôturé la saisie de ses   services <em>Réalisés</em>";
-    protected $pluralTitlePattern   = "%s permanents n'ont pas clôturé la saisie de leurs services <em>Réalisés</em>";
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services-realises', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        /**
-         * Aucune validation de type "clôture du réalisé" ne doit exister.
-         */
-        $selectCloture = 
-                "SELECT v FROM Application\Entity\Db\Validation v " .
-                "JOIN v.typeValidation tv WITH tv.code = :tvCode " .
-                "WHERE v.intervenant = int " .
-                "AND 1 = pasHistorise(v)";
-        $qb = parent::getQueryBuilder()
-                ->andWhere("NOT EXISTS ( $selectCloture )")
-                ->setParameter('tvCode', TypeValidationEntity::CODE_CLOTURE_REALISE);
-        
-        /**
-         * Intervenants permanents.
-         */
-        $qb
-                ->andWhere("ti.code = :tiCode")
-                ->setParameter('tiCode', TypeIntervenantEntity::CODE_PERMANENT);
-        
-        /**
-         * Qui possèdent des enseignements OU du référentiel réalisés.
-         */
-        $selectEns = 
-                "SELECT s FROM Application\Entity\Db\Service s " .
-                "JOIN s.elementPedagogique ep WITH 1 = pasHistorise(ep) " .
-                "JOIN s.volumeHoraire vh WITH 1 = pasHistorise(vh) " .
-                "JOIN vh.typeVolumeHoraire tvh WITH tvh.code = :tvhCode " .
-                "WHERE s.intervenant = int " .
-                "AND 1 = pasHistorise(s)";
-        $selectRef = 
-                "SELECT sr FROM Application\Entity\Db\ServiceReferentiel sr " .
-                "JOIN sr.fonction f WITH 1 = pasHistorise(f) " .
-                "JOIN sr.volumeHoraireReferentiel vhr WITH 1 = pasHistorise(vhr) " .
-                "JOIN vhr.typeVolumeHoraire tvhr WITH tvhr.code = :tvhCode " .
-                "WHERE sr.intervenant = int " .
-                "AND 1 = pasHistorise(sr)";
-
-        /**
-         * Composante d'intervention éventuelle.
-         */
-        if ($this->getStructure()) {
-            $selectEns .= "AND ep.structure = :structure ";
-            $selectRef .= "AND (sr.structure = :structure OR (sr.structure = :etab AND int.structure = :structure)) ";
-            $qb
-                    ->setParameter('structure', $this->getStructure())
-                    ->setParameter('etab', $this->getStructureEtablissement());
-        }
-        
-        $qb
-                ->andWhere("(EXISTS ( $selectEns ) OR EXISTS ( $selectRef ))")
-                ->setParameter("tvhCode", TypeVolumeHoraireEntity::CODE_REALISE);
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne la structure correspondant à l'établissement (structure racine).
-     * 
-     * @return StructureEntity
-     */
-    private function getStructureEtablissement()
-    {
-        return $this->getServiceStructure()->getRacine();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl.php
deleted file mode 100644
index 06792f8e3b93b1e1811b35e18c47f7eb3139b18d..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\VIndicDepassHcHorsRemuFc;
-use Application\Entity\Db\Interfaces\TypeVolumeHoraireAwareInterface;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use UnicaenApp\Util;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
-use Zend\Filter\Callback;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl implements TypeVolumeHoraireAwareInterface
-{
-    use TypeVolumeHoraireAwareTrait;
-    use \Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-    
-    protected $singularTitlePattern = "%s intervenant a    un total HC hors rémunération FC D713-60 <em>%s Saisi</em> qui dépasse le plafond correspondant à son statut";
-    protected $pluralTitlePattern   = "%s intervenants ont un total HC hors rémunération FC D713-60 <em>%s Saisi</em> qui dépasse le plafond correspondant à leur statut";
-
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getTypeVolumeHoraire());
-        
-        return parent::getTitle($appendStructure);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicDepassHcHorsRemuFc $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicDepassHcHorsRemuFc $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("<strong>%s</strong> : %s <small>(n°%s, %s%s)</small>, total HC = %s (plafond = %s)", 
-                    $resultItem->getStructure(),
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut(),
-                    $intervenant->getStatut()->estPermanent() ? ", " . $intervenant->getStructure() : null,
-                    Util::formattedNumber($resultItem->getTotal()),
-                    $resultItem->getPlafond());
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $annee = $this->getServiceContext()->getAnnee();
-        
-        // INDISPENSABLE si plusieurs requêtes successives sur VIndicDepassHcHorsRemuFc !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicDepassHcHorsRemuFc');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicDepassHcHorsRemuFc')->createQueryBuilder("v");
-        $qb
-                ->addSelect("int, aff, si, str")
-                ->join("v.structure", "str")
-                ->join("v.intervenant", "int")
-                ->join("int.structure", "aff")
-                ->join("int.statut", "si")
-                ->join("si.typeIntervenant", "ti")
-                ->join("v.typeVolumeHoraire", "tvh", Join::WITH, "tvh.code = :codeTvh")
-                ->andWhere("int.annee = :annee")
-                ->setParameter("annee", $annee)
-                ->setParameter('codeTvh', $this->getTypeVolumeHoraire()->getCode())
-                ->andWhere("1 = pasHistorise(int)")
-                ->andWhere("1 = pasHistorise(str)");
-        
-        if ($this->getStructure()) {
-            /**
-             * Permanents : ceux intervenant ou affectés dans la structure spécifiée.
-             * Vacataires : ceux intervenant dans la structure spécifiée.
-             */
-            $where = "  ti.code = :codeTiPerm AND (str = :structure OR aff = :structure) OR "
-                    . " ti.code = :codeTiVac  AND  str = :structure";
-            $qb
-                    ->andWhere($where)
-                    ->setParameter('codeTiPerm', TypeIntervenant::CODE_PERMANENT)
-                    ->setParameter('codeTiVac',  TypeIntervenant::CODE_EXTERIEUR)
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl.php
deleted file mode 100644
index c0c91f0f814a800fea3836d7efbecf894f16cabb..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PlafondHcPrevuHorsRemuFcDepasseIndicateurImpl extends PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl
-{
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getPrevu());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services', 
-                ['intervenant' => $result->getIntervenant()->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl.php
deleted file mode 100644
index 220e4f67eb7c9c08329a9851cf3cd0ae70b1da1a..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PlafondHcRealiseHorsRemuFcDepasseIndicateurImpl extends PlafondHcHorsRemuFcDepasseAbstractIndicateurImpl
-{
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getRealise());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services-realises', 
-                ['intervenant' => $result->getIntervenant()->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefDepasseAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefDepasseAbstractIndicateurImpl.php
deleted file mode 100644
index b973ee033e33e905498070e6fb2e4a6b4d76cb0f..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefDepasseAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-use Application\Entity\Db\TypeIntervenant;
-use Application\Entity\Db\VIndicDepassRef;
-use Application\Entity\Db\Interfaces\TypeVolumeHoraireAwareInterface;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use UnicaenApp\Util;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
-use Zend\Filter\Callback;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class PlafondRefDepasseAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl implements TypeVolumeHoraireAwareInterface
-{
-    use TypeVolumeHoraireAwareTrait;
-    use \Application\Service\Traits\TypeVolumeHoraireAwareTrait;
-    
-    protected $singularTitlePattern = "%s intervenant a    un total Référentiel <em>%s</em> qui dépasse le plafond correspondant à son statut";
-    protected $pluralTitlePattern   = "%s intervenants ont un total Référentiel <em>%s</em> qui dépasse le plafond correspondant à leur statut";
-
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf($this->singularTitlePattern, '%s', $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf($this->pluralTitlePattern,   '%s', $this->getTypeVolumeHoraire());
-        
-        return parent::getTitle($appendStructure);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicDepassRef $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-    
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     * 
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicDepassRef $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("<strong>%s</strong> : %s <small>(n°%s, %s%s)</small>, total Référentiel = %s (plafond = %s)", 
-                    $resultItem->getStructure(),
-                    $intervenant,
-                    $intervenant->getRouteParam(),
-                    $intervenant->getStatut(),
-                    $intervenant->getStatut()->estPermanent() ? ", " . $intervenant->getStructure() : null,
-                    Util::formattedNumber($resultItem->getTotal()),
-                    $resultItem->getPlafond());
-                return $out;
-            });
-        }
-        
-        return $this->resultItemFormatter;
-    }
-    
-    /**
-     * 
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $annee = $this->getServiceContext()->getAnnee();
-        
-        // INDISPENSABLE si plusieurs requêtes successives sur VIndicDepassRef !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicDepassRef');
-        
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicDepassRef')->createQueryBuilder("v");
-        $qb
-                ->addSelect("int, aff, si, str")
-                ->join("v.structure", "str")
-                ->join("v.intervenant", "int")
-                ->join("int.structure", "aff")
-                ->join("int.statut", "si")
-                ->join("si.typeIntervenant", "ti")
-                ->join("v.typeVolumeHoraire", "tvh", Join::WITH, "tvh.code = :codeTvh")
-                ->andWhere("int.annee = :annee")
-                ->setParameter("annee", $annee)
-                ->setParameter('codeTvh', $this->getTypeVolumeHoraire()->getCode())
-                ->andWhere("1 = pasHistorise(int)");
-        
-        if ($this->getStructure()) {
-            /**
-             * Permanents : ceux intervenant ou affectés dans la structure spécifiée.
-             * Vacataires : ceux intervenant dans la structure spécifiée.
-             */
-            $where = "  ti.code = :codeTiPerm AND (str = :structure OR aff = :structure) OR "
-                    . " ti.code = :codeTiVac  AND  str = :structure";
-            $qb
-                    ->andWhere($where)
-                    ->setParameter('codeTiPerm', TypeIntervenant::CODE_PERMANENT)
-                    ->setParameter('codeTiVac',  TypeIntervenant::CODE_EXTERIEUR)
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefPrevuDepasseIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefPrevuDepasseIndicateurImpl.php
deleted file mode 100644
index 6d75265cacc7960899b2298bc9f3edab7fd9e8c8..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefPrevuDepasseIndicateurImpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PlafondRefPrevuDepasseIndicateurImpl extends PlafondRefDepasseAbstractIndicateurImpl
-{
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getPrevu());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services', 
-                ['intervenant' => $result->getIntervenant()->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefRealiseDepasseIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefRealiseDepasseIndicateurImpl.php
deleted file mode 100644
index f79ace86a0807fbfc945aa9acf7e2e9f90142285..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Plafond/PlafondRefRealiseDepasseIndicateurImpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Plafond;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class PlafondRefRealiseDepasseIndicateurImpl extends PlafondRefDepasseAbstractIndicateurImpl
-{
-    public function getTypeVolumeHoraire()
-    {
-        if (!parent::getTypeVolumeHoraire()) {
-            $sTvh = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire');
-            /* @var $sTvh \Application\Service\TypeVolumeHoraire */
-            $this->setTypeVolumeHoraire($sTvh->getRealise());
-        }
-
-        return parent::getTypeVolumeHoraire();
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/services-realises', 
-                ['intervenant' => $result->getIntervenant()->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index 310be90c94963a2069795e65bfa8e0fab72f9b59..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s %s est en attente de validation de ses enseignements <em>%s</em>";
-    protected $pluralTitlePattern   = "%s %s sont en attente de validation de leurs enseignements <em>%s</em>";
-    
-    /**
-     * Témoin indiquant s'il faut que l'intervenant soit à l'étape concernée dans le WF pour être acceptable.
-     * 
-     * @var boolean
-     */
-    protected $findByWfEtapeCourante = true;
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-                $this->singularTitlePattern, 
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataire" : "permanent", 
-                $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf(
-                $this->pluralTitlePattern,   
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataires" : "permanents", 
-                $this->getTypeVolumeHoraire());
-        
-        return parent::getTitle($appendStructure);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-            ->join("int.service", "s")
-            ->join("s.elementPedagogique", "ep")
-            ->join("s.volumeHoraire", "vh")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-            ->setParameter('tvh', $this->getTypeVolumeHoraire())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(ep)")
-            ->andWhere("1 = pasHistorise(vh)");
-        
-        /**
-         * L'intervenant doit être à l'étape concernée dans le WF.
-         */
-        if ($this->findByWfEtapeCourante) {
-            $service = $this->getServiceLocator()->get('ApplicationIntervenant'); /* @var $service Intervenant */
-            $service->finderByWfEtapeCourante($this->getWorkflowStepKey(), $qb);
-        }
-        
-        
-        /**
-         * Filtrage par type d'intervenant.
-         */
-        $qb
-                ->andWhere("ti = :type")
-                ->setParameter('type', $this->getTypeIntervenant());
-        
-        /**
-         * Filtrage par structure d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("ep.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        /**
-         * Les volumes horaires ne doivent pas être validés.
-         */
-        $qb
-            ->leftJoin("vh.validation", "val", Join::WITH, "1 = pasHistorise(val)")
-            ->andWhere("val.id IS NULL");
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    abstract protected function getTypeIntervenant();
-    
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     * 
-     * @return TypeVolumeHoraireEntity
-     */
-    abstract protected function getTypeVolumeHoraire();
-    
-    /**
-     * Retourne la clé de l'étape utile à cet indicateur.
-     * 
-     * @return string
-     */
-    abstract protected function getWorkflowStepKey();
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index 6973dd0f4f4325bd45edc572d6e8ca714d836340..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Prevu;
-
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\Service\Validation\Enseignement\AttenteValidationAbstractIndicateurImpl as BaseAttenteValidationAbstractIndicateurImpl;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends BaseAttenteValidationAbstractIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     *
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu();
-        }
-
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-service', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return string
-     */
-    protected function getWorkflowStepKey()
-    {
-        return WfEtape::CODE_SERVICE_VALIDATION;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationPermIndicateurImpl.php
deleted file mode 100644
index 03d7cb35b85f37cdfde194e2c2c38f09cb9d8320..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationPermIndicateurImpl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Prevu;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationVacIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationVacIndicateurImpl.php
deleted file mode 100644
index dc54548207ef1a55d254fe65c4ce5927e6a18f51..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Prevu/AttenteValidationVacIndicateurImpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Prevu;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationVacIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getExterieur() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index d9059213749e8de01039d275975409ec1040d3da..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Realise;
-
-use Application\Service\Indicateur\Service\Validation\Enseignement\AttenteValidationAbstractIndicateurImpl as BaseAttenteValidationAbstractIndicateurImpl;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Entity\Db\WfEtape;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends BaseAttenteValidationAbstractIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-    
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     * 
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getRealise();
-        }
-        
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-service-realise', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return string
-     */
-    protected function getWorkflowStepKey()
-    {
-        return WfEtape::CODE_SERVICE_VALIDATION_REALISE;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermAutreCompIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermAutreCompIndicateurImpl.php
deleted file mode 100644
index 1afc1701cf4f164b90086c6d8738d0208a2e5161..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermAutreCompIndicateurImpl.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Realise;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Entity\Db\VIndicAttenteValidEnsAutre;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\Traits\IntervenantAwareTrait;
-use Application\Service\Traits\ServiceAwareTrait;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Filter\Callback;
-
-/**
- *
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermAutreCompIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use IntervenantAwareTrait;
-    use ServiceAwareTrait;
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-
-    protected $singularTitlePattern = "%s permanent  a   clôturé la saisie de ses   services réalisés et est  en attente de validation de ses   enseignements <em>%s</em> par d'autres composantes";
-    protected $pluralTitlePattern   = "%s permanents ont clôturé la saisie de leurs services réalisés et sont en attente de validation de leurs enseignements <em>%s</em> par d'autres composantes";
-
-    /**
-     *
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-            $this->singularTitlePattern,
-            '%s',
-            $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf(
-            $this->pluralTitlePattern,
-            '%s',
-            $this->getTypeVolumeHoraire());
-
-        return parent::getTitle($appendStructure);
-    }
-
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     *
-     * @param VIndicAttenteValidEnsAutre $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-            'intervenant/validation-service-realise',
-            ['intervenant' => $result->getIntervenant()->getRouteParam()],
-            ['force_canonical' => true]);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicAttenteValidEnsAutre $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicAttenteValidEnsAutre $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("%s <small>(n°%s%s)</small>",
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut()->estPermanent() ? ", Affectation: " . $intervenant->getStructure() : null);
-                return $out;
-            });
-        }
-
-        return $this->resultItemFormatter;
-    }
-
-    /**
-     *
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives avec des critères différents sur la même entité !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicAttenteValidEnsAutre');
-
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicAttenteValidEnsAutre')->createQueryBuilder("v");
-        $qb
-            ->addSelect("int, aff, si, str")
-            ->join("v.structure", "str")
-            ->join("v.intervenant", "int")
-            ->join("int.structure", "aff")
-            ->join("int.statut", "si")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-
-        /**
-         * Type intervenant.
-         */
-        $qb
-            ->andWhere("si.typeIntervenant = :type")
-            ->setParameter('type', $this->getTypeIntervenant());
-
-        /**
-         * Composante d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->andWhere("v.structure = :structure")
-                ->setParameter('structure', $this->getStructure());
-        }
-
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-
-        return $qb;
-    }
-
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     *
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! $this->typeIntervenant) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return $this->typeIntervenant;
-    }
-
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     *
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getRealise();
-        }
-
-        return $this->typeVolumeHoraire;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermIndicateurImpl.php
deleted file mode 100644
index 1c3bc2c3bc7d3561cc965ea36c17575bb2eb9d2b..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationPermIndicateurImpl.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Realise;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeValidation as TypeValidationEntity;
-use Application\Service\Indicateur\Service\Validation\Enseignement\Realise\AttenteValidationAbstractIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    protected $singularTitlePattern = "%s %s a   clôturé la saisie de ses   services réalisés et est  en attente de validation de ses   enseignements <em>%s</em>";
-    protected $pluralTitlePattern   = "%s %s ont clôturé la saisie de leurs services réalisés et sont en attente de validation de leurs enseignements <em>%s</em>";
-    
-    /**
-     * Témoin indiquant s'il faut que l'intervenant soit à l'étape concernée dans le WF pour être acceptable.
-     * 
-     * @var boolean
-     */
-    protected $findByWfEtapeCourante = false;
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        /**
-         * Le réalisé doit être cloturé.
-         */
-        $qb = parent::getQueryBuilder()
-                ->join("int.validation", "v", Join::WITH, "1 = pasHistorise(v)")
-                ->join("v.typeValidation", "tv", Join::WITH, "tv.code = :tvCode")
-                ->setParameter('tvCode', TypeValidationEntity::CODE_CLOTURE_REALISE);
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationVacIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationVacIndicateurImpl.php
deleted file mode 100644
index a1341ab96ad47cb32704d309462dc2577343d6b6..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Enseignement/Realise/AttenteValidationVacIndicateurImpl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Enseignement\Realise;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationVacIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getExterieur() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index 32fb1015bfa7ca870ad63feb8b143a428a05e854..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    protected $singularTitlePattern = "%s %s est  en attente de validation de son  référentiel <em>%s</em>";
-    protected $pluralTitlePattern   = "%s %s sont en attente de validation de leur référentiel <em>%s</em>";
-    
-    /**
-     * Témoin indiquant s'il faut que l'intervenant soit à l'étape concernée dans le WF pour être acceptable.
-     * 
-     * @var boolean
-     */
-    protected $findByWfEtapeCourante = true;
-    
-    /**
-     * 
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-                $this->singularTitlePattern, 
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataire" : "permanent", 
-                $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf(
-                $this->pluralTitlePattern,   
-                '%s', 
-                TypeIntervenantEntity::CODE_EXTERIEUR === $this->getTypeIntervenant()->getCode() ? "vacataires" : "permanents", 
-                $this->getTypeVolumeHoraire());
-        
-        return parent::getTitle($appendStructure);
-    }
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder()
-            ->join("int.serviceReferentiel", "s")
-            ->join("s.fonction", "f")
-            ->join("s.volumeHoraireReferentiel", "vh")
-            ->join("vh.typeVolumeHoraire", "tvh", Join::WITH, "tvh = :tvh")
-            ->setParameter('tvh', $this->getTypeVolumeHoraire())
-            ->andWhere("1 = pasHistorise(s)")
-            ->andWhere("1 = pasHistorise(f)")
-            ->andWhere("1 = pasHistorise(vh)");
-        
-        /**
-         * L'intervenant doit être à l'étape concernée dans le WF.
-         */
-        if ($this->findByWfEtapeCourante) {
-            $service = $this->getServiceLocator()->get('ApplicationIntervenant'); /* @var $service Intervenant */
-            $service->finderByWfEtapeCourante($this->getWorkflowStepKey(), $qb);
-        }
-        
-        /**
-         * Filtrage par Type d'intervenant.
-         */
-        $qb
-                ->andWhere("ti = :type")
-                ->setParameter('type', $this->getTypeIntervenant());
-        
-        /**
-         * Filtrage par structure d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                    ->andWhere("f.structure = :structure")
-                    ->setParameter('structure', $this->getStructure());
-        }
-        
-        /**
-         * Les volumes horaires ne doivent pas être validés.
-         */
-        $qb
-                ->leftJoin("vh.validation", "val", Join::WITH, "1 = pasHistorise(val)")
-                ->andWhere("val.id IS NULL");
-        
-        $qb->orderBy("int.nomUsuel, int.prenom");
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    abstract protected function getTypeIntervenant();
-    
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     * 
-     * @return TypeVolumeHoraireEntity
-     */
-    abstract protected function getTypeVolumeHoraire();
-    
-    /**
-     * Retourne la clé de l'étape utile à cet indicateur.
-     * 
-     * @return string
-     */
-    abstract protected function getWorkflowStepKey();
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index 82ef0ceaf959e296177d33a9d786f69df88bbc29..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel\Prevu;
-
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\Service\Validation\Referentiel\AttenteValidationAbstractIndicateurImpl as BaseAttenteValidationAbstractIndicateurImpl;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends BaseAttenteValidationAbstractIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-    
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     * 
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getPrevu();
-        }
-        
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-referentiel', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return string
-     */
-    protected function getWorkflowStepKey()
-    {
-        return WfEtape::CODE_REFERENTIEL_VALIDATION;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationPermIndicateurImpl.php
deleted file mode 100644
index 329a8f7ac10ff1ce6d6ffecb523a604272373d7f..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Prevu/AttenteValidationPermIndicateurImpl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel\Prevu;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    use TypeIntervenantAwareTrait;
-
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $this->setTypeIntervenant( $this->getServiceTypeIntervenant()->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationAbstractIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationAbstractIndicateurImpl.php
deleted file mode 100644
index e292c4eb31c588868df45a8b447e92f5be3a19d5..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationAbstractIndicateurImpl.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel\Realise;
-
-use Application\Entity\Db\Intervenant as IntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Entity\Db\WfEtape;
-use Application\Service\Indicateur\Service\Validation\Referentiel\AttenteValidationAbstractIndicateurImpl as BaseAttenteValidationAbstractIndicateurImpl;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-abstract class AttenteValidationAbstractIndicateurImpl extends BaseAttenteValidationAbstractIndicateurImpl
-{
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-    
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     * 
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getRealise();
-        }
-        
-        return $this->typeVolumeHoraire;
-    }
-    
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     * 
-     * @param IntervenantEntity $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-                'intervenant/validation-referentiel-realise', 
-                ['intervenant' => $result->getRouteParam()], 
-                ['force_canonical' => true]);
-    }
-    
-    /**
-     * 
-     * @return string
-     */
-    protected function getWorkflowStepKey()
-    {
-        return WfEtape::CODE_REFERENTIEL_VALIDATION_REALISE;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermAutreCompIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermAutreCompIndicateurImpl.php
deleted file mode 100644
index 9a3e79c1533d6d5dc367b24d0800fc96ee734233..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermAutreCompIndicateurImpl.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel\Realise;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Entity\Db\VIndicAttenteValidRefAutre;
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-use Application\Service\Traits\IntervenantAwareTrait;
-use Application\Service\Traits\ServiceReferentielAwareTrait;
-use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
-use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
-use Doctrine\ORM\QueryBuilder;
-use Zend\Filter\Callback;
-
-/**
- *
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermAutreCompIndicateurImpl extends AbstractIntervenantResultIndicateurImpl
-{
-    use IntervenantAwareTrait;
-    use ServiceReferentielAwareTrait;
-    use TypeVolumeHoraireAwareTrait;
-    use TypeIntervenantAwareTrait;
-
-    protected $singularTitlePattern = "%s permanent  a   clôturé la saisie de ses   services réalisés et est  en attente de validation de son  référentiel <em>%s</em> par d'autres composantes";
-    protected $pluralTitlePattern   = "%s permanents ont clôturé la saisie de leurs services réalisés et sont en attente de validation de leur référentiel <em>%s</em> par d'autres composantes";
-
-    /**
-     *
-     * @param bool $appendStructure
-     * @return string
-     */
-    public function getTitle($appendStructure = true)
-    {
-        $this->singularTitlePattern = sprintf(
-            $this->singularTitlePattern,
-            '%s',
-            $this->getTypeVolumeHoraire());
-        $this->pluralTitlePattern   = sprintf(
-            $this->pluralTitlePattern,
-            '%s',
-            $this->getTypeVolumeHoraire());
-
-        return parent::getTitle($appendStructure);
-    }
-
-    /**
-     * Retourne l'URL de la page concernant une ligne de résultat de l'indicateur.
-     *
-     * @param VIndicAttenteValidRefAutre $result
-     * @return string
-     */
-    public function getResultItemUrl($result)
-    {
-        return $this->getHelperUrl()->fromRoute(
-            'intervenant/validation-referentiel-realise',
-            ['intervenant' => $result->getIntervenant()->getRouteParam()],
-            ['force_canonical' => true]);
-    }
-
-    /**
-     * Retourne le filtre retournant l'intervenant correspondant à chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemIntervenantExtractor()
-    {
-        if (null === $this->resultItemIntervenantExtractor) {
-            $this->resultItemIntervenantExtractor = new Callback(function(VIndicAttenteValidRefAutre $resultItem) {
-                $intervenant = $resultItem->getIntervenant();
-                return $intervenant;
-            });
-        }
-
-        return $this->resultItemIntervenantExtractor;
-    }
-
-    /**
-     * Retourne le filtre permettant de formater comme il se doit chaque item de résultat.
-     *
-     * @return FilterInterface
-     */
-    public function getResultItemFormatter()
-    {
-        if (null === $this->resultItemFormatter) {
-            $this->resultItemFormatter = new Callback(function(VIndicAttenteValidRefAutre $resultItem) {
-                $intervenant = $this->getResultItemIntervenantExtractor()->filter($resultItem);
-                $out = sprintf("%s <small>(n°%s%s)</small>",
-                    $intervenant,
-                    $intervenant->getSourceCode(),
-                    $intervenant->getStatut()->estPermanent() ? ", Affectation: " . $intervenant->getStructure() : null);
-                return $out;
-            });
-        }
-
-        return $this->resultItemFormatter;
-    }
-
-    /**
-     *
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        // INDISPENSABLE si plusieurs requêtes successives avec des critères différents sur la même entité !
-        $this->getEntityManager()->clear('Application\Entity\Db\VIndicAttenteValidRefAutre');
-
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\VIndicAttenteValidRefAutre')->createQueryBuilder("v");
-        $qb
-            ->addSelect("int, aff, si, str")
-            ->join("v.structure", "str")
-            ->join("v.intervenant", "int")
-            ->join("int.structure", "aff")
-            ->join("int.statut", "si")
-            ->andWhere("int.annee = :annee")
-            ->setParameter("annee", $this->getServiceContext()->getAnnee());
-
-        /**
-         * Type intervenant.
-         */
-        $qb
-            ->andWhere("si.typeIntervenant = :type")
-            ->setParameter('type', $this->getTypeIntervenant());
-
-        /**
-         * Composante d'intervention.
-         */
-        if ($this->getStructure()) {
-            $qb
-                ->andWhere("v.structure = :structure")
-                ->setParameter('structure', $this->getStructure());
-        }
-
-        $qb->orderBy("str.libelleCourt, int.nomUsuel, int.prenom");
-
-        return $qb;
-    }
-
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     *
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! $this->typeIntervenant) {
-            $sTi = $this->getServiceLocator()->get('ApplicationTypeIntervenant');
-            /* @var $sTi \Application\Service\TypeIntervenant */
-            $this->setTypeIntervenant( $sTi->getPermanent() );
-        }
-
-        return $this->typeIntervenant;
-    }
-
-    /**
-     * Retourne le type de volume horaire utile à cet indicateur.
-     *
-     * @return TypeVolumeHoraireEntity
-     */
-    public function getTypeVolumeHoraire()
-    {
-        if (null === $this->typeVolumeHoraire) {
-            $this->typeVolumeHoraire = $this->getServiceLocator()->get('ApplicationTypeVolumeHoraire')->getRealise();
-        }
-
-        return $this->typeVolumeHoraire;
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermIndicateurImpl.php b/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermIndicateurImpl.php
deleted file mode 100644
index 7cd45c58977efa4d00464e8a8871bc31302f0e1f..0000000000000000000000000000000000000000
--- a/module/Application/src/Application/Service/Indicateur/Service/Validation/Referentiel/Realise/AttenteValidationPermIndicateurImpl.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Application\Service\Indicateur\Service\Validation\Referentiel\Realise;
-
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
-use Application\Entity\Db\TypeValidation as TypeValidationEntity;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
-use Doctrine\ORM\Query\Expr\Join;
-
-/**
- * 
- *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
- */
-class AttenteValidationPermIndicateurImpl extends AttenteValidationAbstractIndicateurImpl
-{
-    use TypeIntervenantAwareTrait;
-
-    protected $singularTitlePattern = "%s %s a   clôturé la saisie de ses   services réalisés et est  en attente de validation de son  référentiel <em>%s</em>";
-    protected $pluralTitlePattern   = "%s %s ont clôturé la saisie de leurs services réalisés et sont en attente de validation de leur référentiel <em>%s</em>";
-    
-    /**
-     * Témoin indiquant s'il faut que l'intervenant soit à l'étape concernée dans le WF pour être acceptable.
-     * 
-     * @var boolean
-     */
-    protected $findByWfEtapeCourante = false;
-    
-    /**
-     * @return QueryBuilder
-     */
-    protected function getQueryBuilder()
-    {
-        $qb = parent::getQueryBuilder();
-        
-        /**
-         * En plus, le réalisé doit être cloturé.
-         */
-        $qb
-                ->join("int.validation", "v", Join::WITH, "1 = pasHistorise(v)")
-                ->join("v.typeValidation", "tv", Join::WITH, "tv.code = :tvCode")
-                ->setParameter('tvCode', TypeValidationEntity::CODE_CLOTURE_REALISE);
-        
-        return $qb;
-    }
-    
-    /**
-     * Retourne le type d'intervenant utile à cet indicateur.
-     * 
-     * @return TypeIntervenantEntity
-     */
-    public function getTypeIntervenant()
-    {
-        if (! parent::getTypeIntervenant()) {
-            $this->setTypeIntervenant( $this->getServiceTypeIntervenant()->getPermanent() );
-        }
-
-        return parent::getTypeIntervenant();
-    }
-}
\ No newline at end of file
diff --git a/module/Application/src/Application/Service/IndicateurService.php b/module/Application/src/Application/Service/IndicateurService.php
index c00d52a02a409d02faf5f649f57b1026d39e8931..2bdc927962b40c72953075524a5443e7b022f6dc 100644
--- a/module/Application/src/Application/Service/IndicateurService.php
+++ b/module/Application/src/Application/Service/IndicateurService.php
@@ -6,17 +6,23 @@ use Application\Service\Traits\IntervenantAwareTrait;
 use Doctrine\ORM\QueryBuilder;
 use Application\Entity\Db\Intervenant as IntervenantEntity;
 use Application\Entity\Db\Utilisateur as UtilisateurEntity;
-use Application\Entity\Db\Indicateur as IndicateurEntity;
+use Application\Entity\Db\Indicateur;
 use Application\Entity\Db\Structure as StructureEntity;
-use Application\Service\Indicateur\AbstractIndicateurImpl;
 
 
 /**
  * Description of IndicateurService
  *
+ * @author LECLUSE Laurent <laurent.lecluse at unicaen.fr>
+ *
+ * @method Indicateur get($id)
+ * @method Indicateur newEntity()
+ *
  */
 class IndicateurService extends AbstractEntityService
 {
+    protected $countCache = [];
+
     use IntervenantAwareTrait;
 
 
@@ -28,7 +34,7 @@ class IndicateurService extends AbstractEntityService
      */
     public function getEntityClass()
     {
-        return IndicateurEntity::class;
+        return Indicateur::class;
     }
 
 
@@ -46,58 +52,31 @@ class IndicateurService extends AbstractEntityService
 
 
     /**
-     * @param integer|IndicateurEntity $indicateur Indicateur concerné
-     *
-     * @return int
-     */
-    private function getIndicateurNumero($indicateur)
-    {
-        if ($indicateur instanceof IndicateurEntity) {
-            return (integer)$indicateur->getNumero();
-        } else {
-            return (integer)$indicateur;
-        }
-    }
-
-
-
-    /**
-     * @param integer|IndicateurEntity $indicateur Indicateur concerné
-     * @param null                     $structure
+     * @param Indicateur $indicateur Indicateur concerné
+     * @param null       $structure
      *
      * @return QueryBuilder
      */
-    private function getBaseQueryBuilder($indicateur, $structure = null)
+    private function getBaseQueryBuilder(Indicateur $indicateur, $structure = null)
     {
         $qb = $this->getEntityManager()->createQueryBuilder();
-        $qb->from(\Application\Entity\Db\Indicateur\Indicateur::class . $this->getIndicateurNumero($indicateur), 'indicateur');
+        $qb->from(\Application\Entity\Db\Indicateur\Indicateur::class . $indicateur->getNumero(), 'indicateur');
 
         /* Filtrage par intervenant */
-        $qb->join('indicateur.intervenant', 'intervenant');
-        $this->getServiceIntervenant()->finderByHistorique($qb, 'intervenant');
-        $this->getServiceIntervenant()->finderByAnnee($this->getServiceContext()->getAnnee(), $qb, 'intervenant');
+        //$qb->join('indicateur.intervenant', 'intervenant');
 
-        /* Filtreage par structure, si nécessaire */
-        if ($structure) {
-            $qb->andWhere('indicateur.structure = ' . $structure->getId());
-        }
+        //$this->getServiceIntervenant()->finderByHistorique($qb, 'intervenant');
+        //$this->getServiceIntervenant()->finderByAnnee($this->getServiceContext()->getAnnee(), $qb, 'intervenant');
 
-        return $qb;
-    }
+        $qb->andWhere('indicateur.annee = :annee')->setParameter('annee', $this->getServiceContext()->getAnnee());
 
-
-
-    private function getQueryBuilder($indicateur, StructureEntity $structure = null)
-    {
-        $qb = $this->getBaseQueryBuilder($indicateur, $structure);
-
-        $qb->addSelect('indicateur');
-        $qb->addSelect('intervenant');
-
-        /* Pour l'optimisation!! */
-        $methodName = 'appendQueryBuilder' . $this->getIndicateurNumero($indicateur);
-        if (method_exists($this, $methodName)) {
-            $this->$methodName($qb);
+        /* Filtrage par structure, si nécessaire */
+        if (!$structure) {
+            $structure = $this->getServiceContext()->getSelectedIdentityRole()->getStructure();
+        }
+        if ($structure) {
+            $sign = $indicateur->getNotStructure() ? '<>' : '=';
+            $qb->andWhere('indicateur.structure IS NULL OR indicateur.structure ' . $sign . ' ' . $structure->getId());
         }
 
         return $qb;
@@ -105,63 +84,54 @@ class IndicateurService extends AbstractEntityService
 
 
 
-    private function appendQueryBuilder210(QueryBuilder $qb)
+    /**
+     * @param integer|Indicateur   $indicateur Indicateur concerné
+     * @param StructureEntity|null $structure
+     */
+    public function getCount(Indicateur $indicateur, StructureEntity $structure = null)
     {
-        $qb->addSelect('structure');
-        $qb->join('indicateur.structure', 'structure');
+        if (!isset($this->countCache[$indicateur->getNumero()])) {
+            $qb = $this->getBaseQueryBuilder($indicateur, $structure);
+            $qb->addSelect('COUNT(' . ($indicateur->getDistinct() ? 'DISTINCT ' : '') . 'indicateur.intervenant) result');
 
-        $qb->addSelect('typeAgrement');
-        $qb->join('indicateur.typeAgrement', 'typeAgrement');
+            $this->countCache[$indicateur->getNumero()] = (integer)$qb->getQuery()->getResult()[0]['result'];
+        }
 
-        $this->getServiceIntervenant()->orderBy($qb, 'intervenant');
+        return $this->countCache[$indicateur->getNumero()];
     }
 
 
 
     /**
-     * @param integer|IndicateurEntity $indicateur Indicateur concerné
-     * @param StructureEntity|null     $structure
+     * @param Indicateur $indicateur Indicateur concerné
+     *
+     * @return Indicateur\AbstractIndicateur[]
      */
-    public function getCount($indicateur, StructureEntity $structure = null)
+    public function getResult(Indicateur $indicateur, StructureEntity $structure = null)
     {
-        /* COMPATIBILITE ANCIEN SYSTEME */
-        if (! $indicateur instanceof IndicateurEntity){
-            $indic = $this->getByNumero($indicateur);
-            $numero = $indicateur;
-        }else{
-            $indic = $indicateur;
-            $numero = $indicateur->getNumero();
-        }
-        if (! class_exists(\Application\Entity\Db\Indicateur\Indicateur::class.$numero)){
-            return $this->getIndicateurImpl($indic,$structure)->getResultCount();
-        }
-        /* FIN COMPATIBILITE ANCIEN SYSTEME */
-
         $qb = $this->getBaseQueryBuilder($indicateur, $structure);
-        $qb->addSelect('COUNT(intervenant) result');
 
-        return (integer)$qb->getQuery()->getResult()[0]['result'];
-    }
+        $qb->join('indicateur.intervenant', 'intervenant');
+        $qb->leftJoin('intervenant.dossier', 'dossier');
 
+        $qb->addSelect('indicateur');
+        $qb->addSelect('partial intervenant.{id, nomUsuel, prenom, email, sourceCode}');
+        $qb->addSelect('partial dossier.{id}');
 
+        $qb->addSelect('partial structure.{id, libelleCourt, libelleLong}');
+        $qb->leftJoin('indicateur.structure', 'structure');
 
-    /**
-     * @param integer|IndicateurEntity $indicateur Indicateur concerné
-     *
-     * @return IndicateurEntity\AbstractIndicateur[]
-     */
-    public function getResult($indicateur, StructureEntity $structure = null)
-    {
-        $qb = $this->getQueryBuilder($indicateur, $structure);
+        $indicateurClass = \Application\Entity\Db\Indicateur\Indicateur::class . $indicateur->getNumero();
+        $indicateurClass::appendQueryBuilder($qb);
 
+        $qb->addOrderBy('structure.libelleCourt');
+        $this->getServiceIntervenant()->orderBy($qb, 'intervenant');
 
         $entities = $qb->getQuery()->execute();
+        /* @var $entities Indicateur\AbstractIndicateur[] */
         $result = [];
-//        $entityClass = $this->getEntityClass();
         foreach ($entities as $entity) {
-//            if ($entity instanceof $entityClass) {
-                $result[$entity->getId()] = $entity;
-//            }
+            $result[$entity->getId()] = $entity;
         }
 
         return $result;
@@ -181,6 +151,7 @@ class IndicateurService extends AbstractEntityService
 
         $indicateur = $this->getRepo()->findOneBy(['numero' => $numero]);
         $indicateur->setServiceIndicateur($this);
+
         return $indicateur;
     }
 
@@ -198,6 +169,7 @@ class IndicateurService extends AbstractEntityService
 
         $indicateur = $this->getRepo()->findOneBy(['code' => $code]);
         $indicateur->setServiceIndicateur($this);
+
         return $indicateur;
     }
 
@@ -224,7 +196,7 @@ class IndicateurService extends AbstractEntityService
      * @param QueryBuilder $qb
      * @param string|null  $alias
      *
-     * @return \Application\Entity\Db\Indicateur[]
+     * @return Indicateur[]
      */
     public function getList(QueryBuilder $qb = null, $alias = null)
     {
@@ -233,9 +205,9 @@ class IndicateurService extends AbstractEntityService
         $qb->andWhere("$alias.enabled = 1");
 
         $list = parent::getList($qb, $alias);
-        /* @var $list IndicateurEntity[] */
+        /* @var $list Indicateur[] */
 
-        foreach( $list as $indicateur ){
+        foreach ($list as $indicateur) {
             $indicateur->setServiceIndicateur($this);
         }
 
@@ -244,45 +216,6 @@ class IndicateurService extends AbstractEntityService
 
 
 
-    /**
-     *
-     * @param IndicateurEntity $indicateur
-     * @param StructureEntity  $structure
-     *
-     * @return AbstractIndicateurImpl
-     */
-    public function getIndicateurImpl(IndicateurEntity $indicateur, StructureEntity $structure = null)
-    {
-        /** @var AbstractIndicateurImpl $impl */
-        $impl = clone $this->getServiceLocator()->get($indicateur->getCode());
-        $impl
-            ->setIndicateurEntity($indicateur)
-            ->setStructure($structure);
-
-        return $impl;
-    }
-
-
-
-    /**
-     *
-     * @param IndicateurEntity[] $indicateurs
-     * @param StructureEntity    $structure
-     *
-     * @return AbstractIndicateurImpl[]
-     */
-    public function getIndicateursImpl($indicateurs, StructureEntity $structure = null)
-    {
-        $impls = [];
-        foreach ($indicateurs as $indicateur) {
-            $impls[$indicateur->getId()] = $this->getIndicateurImpl($indicateur, $structure);
-        }
-
-        return $impls;
-    }
-
-
-
     /**
      * Suppression (historisation) de l'historique des modifications sur les données perso d'un intervenant.
      *
diff --git a/module/Application/src/Application/Service/Intervenant.php b/module/Application/src/Application/Service/Intervenant.php
index 0a04665d3aa0cd89d0baf0326867c652ad096197..b3639a92e23ade0c7c03ed5351b75e7dc8645d5d 100644
--- a/module/Application/src/Application/Service/Intervenant.php
+++ b/module/Application/src/Application/Service/Intervenant.php
@@ -134,24 +134,6 @@ class Intervenant extends AbstractEntityService
 
 
 
-    /**
-     * Retourne la liste des intervenants
-     *
-     * @param QueryBuilder|null $queryBuilder
-     * @param string|null       $alias
-     *
-     * @return \Application\Entity\Db\Intervenant[]
-     */
-    public function getList(QueryBuilder $qb = null, $alias = null)
-    {
-        list($qb, $alias) = $this->initQuery($qb, $alias);
-        $qb->addOrderBy("$alias.nomUsuel, $alias.prenom");
-
-        return parent::getList($qb, $alias);
-    }
-
-
-
     /**
      * Sauvegarde une entité
      *
@@ -174,6 +156,22 @@ class Intervenant extends AbstractEntityService
 
 
 
+    /**
+     *
+     * @param QueryBuilder|null $qb
+     * @param string|null       $alias
+     */
+    public function orderBy(QueryBuilder $qb = null, $alias = null)
+    {
+        list($qb, $alias) = $this->initQuery($qb, $alias);
+
+        $qb->addOrderBy("$alias.nomUsuel, $alias.prenom");
+
+        return $qb;
+    }
+
+
+
     /**
      * Filtre par le type d'intervenant
      *
diff --git a/module/Application/src/Application/Service/NotificationIndicateur.php b/module/Application/src/Application/Service/NotificationIndicateur.php
index 2adbe4234ebcb46adb43a70bede097bbb16099d3..049ac20eb38b1e86feb0d1b4b60d313e6127f5a1 100644
--- a/module/Application/src/Application/Service/NotificationIndicateur.php
+++ b/module/Application/src/Application/Service/NotificationIndicateur.php
@@ -2,28 +2,33 @@
 
 namespace Application\Service;
 
+use Application\Entity\Db\Affectation;
 use Application\Entity\Db\Indicateur as IndicateurEntity;
 use Application\Entity\Db\NotificationIndicateur as NotificationIndicateurEntity;
 use Application\Entity\Db\Personnel as PersonnelEntity;
 use Application\Entity\Db\Structure as StructureEntity;
+use Application\Service\Traits\AffectationAwareTrait;
 use LogicException;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use UnicaenApp\Traits\MessageAwareInterface;
-use UnicaenApp\Traits\MessageAwareTrait;
 
 /**
- * 
+ * Description of WfEtapeDepService
+ *
+ * @author LECLUSE Laurent <laurent.lecluse at unicaen.fr>
+ *
+ * @method NotificationIndicateurEntity get($id)
+ * @method NotificationIndicateurEntity[] getList(\Doctrine\ORM\QueryBuilder $qb = null, $alias = null)
+ * @method NotificationIndicateurEntity newEntity()
  *
- * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
  */
 class NotificationIndicateur extends AbstractEntityService
 {
-    use MessageAwareTrait;
-    
+    use AffectationAwareTrait;
+
     /**
      * retourne la classe des entités
      *
@@ -43,67 +48,63 @@ class NotificationIndicateur extends AbstractEntityService
     {
         return 'ni';
     }
-    
+
+
+
+    public function finderByRole( $role=null, QueryBuilder $qb = null, $alias = null)
+    {
+        list($qb, $alias) = $this->initQuery($qb, $alias);
+
+        $affectation = $this->getServiceAffectation()->getByRole($role);
+        $this->finderByAffectation( $affectation, $qb, $alias );
+
+        return $qb;
+    }
+
+
+
     /**
      * Abonne un personnel à un indicateur.
      * 
-     * @param PersonnelEntity $personnel
      * @param IndicateurEntity $indicateur
      * @param string $frequence
-     * @param StructureEntity $structure
      * @return NotificationIndicateurEntity
      */
-    public function abonner(PersonnelEntity $personnel, IndicateurEntity $indicateur, $frequence, StructureEntity $structure = null)
+    public function abonner(IndicateurEntity $indicateur, $frequence=null, $inHome=false, Affectation $affectation = null)
     {
         if ($frequence && !array_key_exists($frequence, NotificationIndicateurEntity::$frequences)) {
             throw new LogicException("Fréquence spécifiée inconnue: $frequence.");
         }
-        
-        // recherche d'abonnement existant
-        $qb = $this->finderByPersonnel($personnel);
-        $this->finderByIndicateur($indicateur, $qb);
-        if ($structure) {
-            $this->finderByStructure($structure, $qb);
-        }
-        $abonnement = $qb->getQuery()->getOneOrNullResult();
-        
-        $structureStr = $structure ? "pour la structure $structure" : null;
-        
-        // nouvel abonnement
-        if (null === $abonnement) {
-            $abonnement = new NotificationIndicateurEntity();
-            $abonnement
-                    ->setPersonnel($personnel)
-                    ->setIndicateur($indicateur)
-                    ->setFrequence($frequence)
-                    ->setStructure($structure)
-                    ->setDateAbonnement(new DateTime());
-            $this->getEntityManager()->persist($abonnement);
-            $this->getEntityManager()->flush($abonnement);
-            $message = "Abonnement de $personnel ({$personnel->getEmail()}) $structureStr enregistré avec succès.";
+
+        if (!$affectation){
+            $affectation = $this->getServiceAffectation()->getByRole();
         }
-        // une frequence spécifiée = modification d'un abonnement
-        elseif ($frequence) {
-            if (!array_key_exists($frequence, NotificationIndicateurEntity::$frequences)) {
-                throw new LogicException("Fréquence spécifiée inconnue: '$frequence'.");
+
+        $notification = $this->getRepo()->findOneBy([
+            'indicateur' => $indicateur,
+            'affectation' => $affectation,
+        ]);
+
+        if ($frequence || $inHome){
+            if (!$notification){
+                $notification = $this->newEntity();
+                $notification->setAffectation($affectation);
+                $notification->setIndicateur($indicateur);
+            }
+
+            $notification->setFrequence($frequence);
+            $notification->setInHome($inHome);
+            $notification->setDateAbonnement(new DateTime());
+
+            $this->save( $notification );
+        }else{
+            if ($notification){
+                $this->delete($notification);
+                $notification = null;
             }
-            $abonnement
-                    ->setFrequence($frequence)
-                    ->setDateAbonnement(new DateTime());
-            $this->getEntityManager()->flush($abonnement);
-            $message = "Abonnement de $personnel ({$personnel->getEmail()}) $structureStr modifié avec succès.";
-        }
-        // aucune frequence spécifiée = désabonnement
-        else {
-            $this->getEntityManager()->remove($abonnement);
-            $message = "Abonnement de $personnel $structureStr supprimé avec succès.";
-            $this->getEntityManager()->flush($abonnement);
-            $abonnement = null;
         }
-            
-        $this->addMessage($message, MessageAwareInterface::SUCCESS);
-        
-        return $abonnement;
+
+        return $notification;
     }
     
     /**
@@ -145,184 +146,4 @@ class NotificationIndicateur extends AbstractEntityService
     {
         return new NotificationIndicateurQueryBuilder($this->getEntityManager());
     }
-}
-
-
-
-
-
-//--------------------------------------------------------------------------------------
-//
-// Expérimentation : expressivité du query builder.
-//
-//--------------------------------------------------------------------------------------
-
-class NotificationIndicateurQueryBuilder extends QueryBuilder
-{
-    protected $rootAlias = "ni";
-
-    public function __construct(EntityManagerInterface $em, $rootAlias = null)
-    {
-        parent::__construct($em);
-
-        $this->rootAlias = $rootAlias ?: $this->rootAlias;
-        $this->initWithDefault();
-    }
-
-    public function initWithDefault()
-    {
-        $this
-            ->from(NotificationIndicateurEntity::class, $this->rootAlias)
-            ->select("$this->rootAlias, p, i, s")
-            ->join("$this->rootAlias.personnel", "p")
-            ->join("$this->rootAlias.indicateur", "i", Join::WITH, "i.enabled = 1")
-            ->leftJoin("$this->rootAlias.structure", "s")
-            ->orderBy("p.nomUsuel, i.type, i.ordre");
-
-        return $this;
-    }
-
-    public function andWhereIndicateurIs(IndicateurEntity $indicateur)
-    {
-        return $this->applyExpr(new AndWhereIndicateurIs($indicateur, "i")); // alias si pas de jointure: "$this->rootAlias.indicateur"
-    }
-
-    public function andWhereIndicateurIsEnabled($enabled = true)
-    {
-        return $this->applyExpr(new AndWhereIndicateurEnabled($enabled, "i")); // NB: l'alias "$this->rootAlias.indicateur" est impossible ici
-    }
-
-    public function andWherePersonnelIs(PersonnelEntity $personnel)
-    {
-        return $this->applyExpr(new AndWherePersonnelIs($personnel, "p")); // alias si pas de jointure: "$this->rootAlias.personnel"
-    }
-
-    public function andWhereStructureIs(StructureEntity $structure)
-    {
-        return $this->applyExpr(new AndWhereStructurelIs($structure, "s"));
-    }
-
-    public function andWhereNotificationNecessaire($notificationNecessaire = true)
-    {
-        return $this->applyExpr(new AndWhereNotificationNecessaire($notificationNecessaire, "ni"));
-    }
-
-    private function applyExpr(AndWhereExpr $expr)
-    {
-        $expr->applyToQueryBuilder($this);
-        return $this;
-    }
-}
-
-class AndWherePersonnelIs extends AndWhereExpr
-{
-    public function __construct(PersonnelEntity $entity, $alias)
-    {
-        parent::__construct($alias);
-
-        $this->where      = "$alias = :personnel";
-        $this->parameters = ['personnel' => $entity];
-    }
-
-    protected function getJoinSuggestion($rootAlias)
-    {
-        return sprintf(
-            "Peut-être avez-vous oublié de faire la jointure suivante: '->join(\"%s.personnel\", \"%s\")'.",
-            $rootAlias,
-            $this->alias
-        );
-    }
-}
-
-class AndWhereStructurelIs extends AndWhereExpr
-{
-    public function __construct(StructureEntity $entity, $alias)
-    {
-        parent::__construct($alias);
-
-        $this->where      = "$alias = :structure";
-        $this->parameters = ['structure' => $entity];
-    }
-}
-
-class AndWhereNotificationNecessaire extends AndWhereExpr
-{
-    public function __construct($notificationNecessaire = true, $alias)
-    {
-        parent::__construct($alias);
-
-        $this->where = $notificationNecessaire ?
-            "$alias.dateDernNotif IS NULL OR $alias.dateDernNotif + $alias.frequence/(24*60*60) <= :now" :
-            "$alias.dateDernNotif IS NOT NULL AND $alias.dateDernNotif + $alias.frequence/(24*60*60) > :now" ;
-        $this->parameters = ['now' => new DateTime()];
-    }
-}
-
-
-
-
-
-
-class AndWhereIndicateurIs extends AndWhereExpr
-{
-    public function __construct(IndicateurEntity $entity, $alias)
-    {
-        parent::__construct($alias);
-
-        $this->where      = "$alias = :indicateur";
-        $this->parameters = ['indicateur' => $entity];
-    }
-}
-
-class AndWhereIndicateurEnabled extends AndWhereExpr
-{
-    public function __construct($enabled = true, $alias)
-    {
-        parent::__construct($alias);
-
-        $this->where      = "$alias.enabled = :enabled";
-        $this->parameters = ['enabled' => (bool) $enabled];
-    }
-}
-
-
-
-
-
-
-abstract class AndWhereExpr
-{
-    protected $alias;
-    protected $where;
-    protected $parameters;
-
-    public function __construct($alias)
-    {
-        $this->alias = $alias;
-    }
-
-    public static function instance(array $args = [])
-    {
-        $expr = new static($args['alias']);
-    }
-
-    public function applyToQueryBuilder(QueryBuilder $qb)
-    {
-        if (! in_array($this->alias, $qb->getAllAliases())) {
-            throw new \RuntimeException("L'alias $this->alias est inconnu du QueryBuilder. " . $this->getJoinSuggestion($qb->getRootAlias()));
-        }
-
-        $qb->andWhere($this->where);
-
-        foreach ((array) $this->parameters as $name => $value) {
-            $qb->setParameter($name, $value);
-        }
-
-        return $this;
-    }
-
-    protected function getJoinSuggestion($rootAlias)
-    {
-        return "";
-    }
 }
\ No newline at end of file
diff --git a/module/Application/src/Application/View/Helper/Service/Liste.php b/module/Application/src/Application/View/Helper/Service/Liste.php
index 879e760399eadb37ae1f93c4daf3af0acd514bac..3b41ef7ba3aeef8ef8ab19b9d02fb12d19bee46c 100644
--- a/module/Application/src/Application/View/Helper/Service/Liste.php
+++ b/module/Application/src/Application/View/Helper/Service/Liste.php
@@ -255,7 +255,7 @@ class Liste extends AbstractHtmlElement implements ServiceLocatorAwareInterface,
             $iPrec = $this->getServiceIntervenant()->getPrecedent($this->prevuToPrevu);
             $tvh = $this->getServiceTypeVolumeHoraire()->getPrevu();
             $evh = $this->getServiceEtatVolumeHoraire()->getValide();
-            $hasHeures = $this->getProcessusIntervenant()->hasHeuresEnseignement($iPrec, $tvh, $evh );
+            $hasHeures = $iPrec ? $this->getProcessusIntervenant()->hasHeuresEnseignement($iPrec, $tvh, $evh ) : false;
             if ($hasHeures) {
                 $attribs = [
                     'class'       => 'btn btn-warning prevu-to-prevu-show',
diff --git a/module/Application/view/application/indicateur/abonnements.phtml b/module/Application/view/application/indicateur/abonnements.phtml
index 717d6cbd3cd4bacbe7a8b68ba1e7488089924856..251855f6e7599212ffd2f4c924bc224660f77c81 100644
--- a/module/Application/view/application/indicateur/abonnements.phtml
+++ b/module/Application/view/application/indicateur/abonnements.phtml
@@ -1,17 +1,45 @@
-<style>
-    .categorie { width: 180px; }
-</style>
-
 <?php
-if (count($this->indicateursImpl)) {
-    echo $this->partial('application/indicateur/partial/list', [
-        'indicateursImpl'  => $this->indicateursImpl,
-        'abonnements'      => $this->abonnements,
-        'abonnementsInfos' => $this->abonnementsInfos,
-    //    'abonnementUrl'    => $this->abonnementUrl,
-        'showAbonnement'   => false,
-    ]);
-}
-else {
-    echo "Aucun.";
-}
+
+namespace Application;
+
+use Application\Entity\Db\Indicateur;
+
+/**
+ * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $indicateurs Indicateur[]
+ */
+
+
+if (empty($indicateurs)): ?>
+    Aucun
+<?php else: ?>
+<table class="table table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th class="categorie">Catégorie</th>
+        <th class="numero">N°</th>
+        <th class="intitule">Intitulé de l'indicateur</th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($indicateurs as $indicateur):
+        $urlResult = $this->url('indicateur/result', ['indicateur' => $indicateur->getId()]);
+        ?>
+        <tr class="indicateur" id="<?php echo $indicateur->getId() ?>">
+
+            <td class="categorie"><?php echo $indicateur->getType() ?></td>
+            <td class="numero"><?php echo $indicateur->getNumero() ?></td>
+            <td class="intitule">
+                <?php if ($indicateur->getCount()): ?>
+                    <a href="<?php echo $urlResult ?>"
+                       title="Cliquez pour vous rendre à la page concernée"><?php echo $indicateur->getLibelle() ?></a>
+                <?php else: ?>
+                    <?php echo $indicateur->getLibelle() ?>
+                <?php endif ?>
+            </td>
+
+        </tr>
+    <?php endforeach; ?>
+    </tbody>
+</table>
+<?php endif;
\ No newline at end of file
diff --git a/module/Application/view/application/indicateur/index.phtml b/module/Application/view/application/indicateur/index.phtml
index b50a2e5a9cc7316340efe114f2202ac0aefbfd6b..d41bea24d07fc9996f67022c99c2f9f3c6cd02ed 100644
--- a/module/Application/view/application/indicateur/index.phtml
+++ b/module/Application/view/application/indicateur/index.phtml
@@ -1,24 +1,102 @@
-<?php 
+<?php
+
+namespace Application;
+
+use Application\Entity\Db\Indicateur;
+use Application\Entity\Db\NotificationIndicateur;
+use Zend\Form\Element\Checkbox;
+use Zend\Form\Element\Select;
+
+/**
+ * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $indicateurs Indicateur[]
+ * @var $abonnements NotificationIndicateur[]
+ */
 
-/* @var $indicateurs array  */
+$showAbonnements = true;
 
 $this->headTitle()->append($title = "Indicateurs");
 
-?>
+$indics = [];
+foreach ($indicateurs as $indicateur) {
+    $type   = $indicateur->getType();
+    $numero = $indicateur->getNumero();
+
+    if (!isset($indics[$type])) {
+        $indics[$type] = [];
+    }
+    $indics[$type][$numero] = $indicateur;
+}
+
+ksort($indics);
 
+$notif = new Select('abonnement');
+$notif->setEmptyOption('Aucune');
+$notif->setAttribute('class', 'notif');
+$notif->setValueOptions(NotificationIndicateur::$frequences);
+
+$inHome = new Checkbox('in-home');
+$inHome->setCheckedValue('1');
+$inHome->setAttribute('class', 'in-home');
+$inHome->setUncheckedValue('0');
+
+$noAbo = new NotificationIndicateur();
+
+?>
 <h1 class="page-header"><?php echo $title ?></h1>
+<?php foreach ($indics as $categorie => $cIndics): ?>
+    <div class="panel panel-default indicateurs">
+        <div class="panel-heading"><?php echo $categorie ?></div>
+        <table class="table table-bordered table-condensed">
+            <thead>
+            <tr>
+                <th class="numero">N°</th>
+                <th class="intitule">Intitulé de l'indicateur</th>
+                <?php if ($showAbonnements): ?>
+                    <th class="page-accueil">Page d'accueil</th>
+                    <th class="notification">Notification par mail</th>
+                <?php endif ?>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($cIndics as $indicateur):
+                /* @var $indicateur Indicateur */
+                $abonnement = isset($abonnements[$indicateur->getId()]) ? $abonnements[$indicateur->getId()] : $noAbo;
+                $urlAbonner = $this->url('indicateur/abonner', ['indicateur' => $indicateur->getId()]);
+                $urlResult = $this->url('indicateur/result', ['indicateur' => $indicateur->getId()]);
 
-<style>
-    .categorie { width: 180px; }
-    .notification { width: 180px; }
-</style>
+                ?>
+                <tr class="indicateur" id="<?php echo $indicateur->getId() ?>"
+                    data-url="<?php echo $urlAbonner ?>">
 
-<?php
-echo $this->partial('application/indicateur/partial/list', [
-    'indicateurs'      => $indicateurs,
-    'indicateursImpl'  => $this->indicateursImpl,
-    'abonnements'      => $this->abonnements,
-    'abonnementsInfos' => $this->abonnementsInfos,
-    'abonnementUrl'    => $this->abonnementUrl,
-    'showAbonnement'   => true,
-]);
+                    <td class="numero">
+                        <?php echo $indicateur->getNumero() ?>
+                    </td>
+
+                    <td class="intitule">
+                        <?php if ($indicateur->getCount()): ?>
+                            <a href="<?php echo $urlResult ?>"
+                               title="Cliquez pour vous rendre à la page concernée"><?php echo $indicateur->getLibelle() ?></a>
+                        <?php else: ?>
+                            <?php echo $indicateur->getLibelle() ?>
+                        <?php endif ?>
+                    </td>
+
+                    <?php if ($showAbonnements): ?>
+                        <td class="page-accueil">
+                            <?php echo $this->formcheckbox($inHome->setValue($abonnement->getInHome())); ?>
+                        </td>
+                        <td class="notification">
+                            <?php echo $this->formSelect($notif->setValue($abonnement->getFrequence())); ?>
+                            <span class="indicateur-info glyphicon glyphicon-info-sign" aria-hidden="true"
+                                  data-toggle="tooltip" data-placement="auto" data-html="true"
+                                  title="<?php echo $abonnement->getFrequence() ? $abonnement->getExtraInfos() : '' ?>"
+                                  style="<?php echo $abonnement->getFrequence() ? '' : 'display: none' ?>"></span>
+                        </td>
+                    <?php endif ?>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/module/Application/view/application/indicateur/partial/result.phtml b/module/Application/view/application/indicateur/partial/result.phtml
index e4b5a1f806e4a1c7b3c4d7e770795b0ff2551e19..3e1bab45db3cbdc8559c48ed252a560869b5dce6 100644
--- a/module/Application/view/application/indicateur/partial/result.phtml
+++ b/module/Application/view/application/indicateur/partial/result.phtml
@@ -23,7 +23,6 @@
 </p>
 <?php endif; ?>
 
-
 <script>
     $(function() {
         var sendMailLink = $("#send-mail-link");
diff --git a/module/Application/view/application/indicateur/result.phtml b/module/Application/view/application/indicateur/result.phtml
index 4a300e3f14eff167ff6bdd8d4d2e2fd90fa110dd..a2748884e1108b7c025576397b2817e180324b34 100644
--- a/module/Application/view/application/indicateur/result.phtml
+++ b/module/Application/view/application/indicateur/result.phtml
@@ -1,13 +1,47 @@
-<?php 
-use Application\Service\Indicateur\AbstractIntervenantResultIndicateurImpl;
-/* @var $indicateurImpl AbstractIntervenantResultIndicateurImpl */
-?>
+<?php
+
+/**
+ * @var $this       \Application\View\Renderer\PhpRenderer
+ * @var $indicateur \Application\Entity\Db\Indicateur
+ */
+
+$this->headTitle()->append((string)$this->indicateur);
 
-<?php $this->headTitle()->append((string)$this->indicateur) ?>
-<h1 class="page-header"><?php echo $title = $indicateurImpl->getTitle() ?> <small><?php echo $this->indicateur ?></small></h1>
+$result = $indicateur->getResult();
 
-<?php echo $this->partial('application/indicateur/partial/result', ['indicateurImpl' => $indicateurImpl, 'displaySendMailLink' => true]); ?>
+$url = $indicateur->getRoute();
+
+?>
+<h1 class="page-header"><?php echo $indicateur->getLibelle() ?>
+    <small><?php echo $indicateur ?></small>
+</h1>
 
+<div style="margin:1em">
 
-<!-- Inclusion du script de l'éditeur WYSIWYG (vers HTML) : http://www.tinymce.com -->
-<script type="text/javascript" src="<?php echo $this->basePath() . '/js/tinymce/tinymce.min.js' ?>"></script>
+    <table class="table table-bordered table-condensed table-hover">
+        <thead>
+        <tr>
+            <th>&nbsp;</th>
+            <th>Composante</th>
+            <th>Intervenant</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($result as $r): ?>
+            <tr>
+                <th>&nbsp;</th>
+                <td><?php echo $r->getStructure() ?></td>
+                <td>
+                    <a href="<?php echo $this->url($indicateur->getRoute(), $r->getUrlParams()) ?>">
+                        <?php echo $r->getIntervenant() ?>
+                    </a>
+                </td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <a class="btn btn-primary" href="<?php echo $this->url('indicateur'); ?>">
+        <span class="glyphicon glyphicon-backward"></span>
+        Retour à la liste des indicateurs
+    </a>
+</div>
diff --git a/public/css/app.css b/public/css/app.css
index 8335e314a9d629cd341513d7aa33d1f5918efafb..b6ef2a224574661bf88b7b33e4177f0e01734e54 100755
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -410,3 +410,24 @@ td .alert {
 .panel .panel-heading-h3 {
     padding: 0px;
 }
+
+
+
+.indicateurs table td.numero {
+    width: 5em;
+    text-align: center;
+}
+
+.indicateurs table th.numero {
+    width: 5em;
+    text-align: center;
+}
+
+.indicateurs .notification {
+    width: 12em;
+}
+
+.indicateurs .page-accueil {
+    width: 2em;
+    text-align:center;
+}
\ No newline at end of file
diff --git a/public/js/indicateur.js b/public/js/indicateur.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8a06456b5a316809571a7e77ddf2834ca41ef64
--- /dev/null
+++ b/public/js/indicateur.js
@@ -0,0 +1,45 @@
+$.widget("ose.indicateur", {
+
+    _create: function ()
+    {
+        var that = this;
+
+        this.getElementNotif().change( function(){ that.abonner(); });
+        this.getElementInHome().change( function(){ that.abonner(); });
+
+        this.element.find(".glyphicon.glyphicon-info-sign").tooltip();
+    },
+
+
+    abonner: function()
+    {
+        var that = this;
+        var notif = this.getElementNotif();
+        var inHome = this.getElementInHome();
+
+        notif.data('previousValue', notif.val());
+        notif.addClass("loading");
+        $.post(this.element.data('url'), {
+            notification: notif.val(),
+            'in-home': inHome.is(':checked') ? '1' : '0'
+        }, function (data, textStatus, jqXHR)
+        {
+            if (data.status !== "success") {
+                notif.val(notif.data('previousValue'));
+            }
+            notif.removeClass("loading");
+            var infos = $(".indicateur-info", notif.parent()).attr('title', data.infos).tooltip('destroy').tooltip();
+            notif.val() ? infos.show() : infos.hide();
+            alertFlash(data.message, data.status, 5000);
+        });
+    },
+
+    getElementNotif: function(){ return this.element.find('select.notif'); },
+    getElementInHome: function(){ return this.element.find('input.in-home'); }
+
+});
+
+$(function ()
+{
+    WidgetInitializer.add('indicateur', 'indicateur');
+});
diff --git a/public/js/piece-jointe.js b/public/js/piece-jointe.js
index 246798b8bf43536b5ae25e89caecd4e65fd2695f..bb436a2f5eaf20fc7e2bfb9a3f5a0c9201819f07 100644
--- a/public/js/piece-jointe.js
+++ b/public/js/piece-jointe.js
@@ -44,6 +44,9 @@ $.widget("ose.pieceJointe", {
             }
 
             that.onValidationChange( tpj, isValider );
+        }).fail(function( jqXHR ) {
+            alert('Une erreur est survenue. L\'opération n\'a pas pu être effectuée.');
+            console.log(jqXHR);
         });
     },