From 0c8831bebed2232ec32b801b1903363a20ef47ac Mon Sep 17 00:00:00 2001
From: lecluse <lecluse@d57fa8bc-6af1-4de9-8b7d-78e900e231e7>
Date: Tue, 19 Dec 2017 16:08:41 +0000
Subject: [PATCH] Poursuite Refactoring nommage des services
---
...rvenant test existance Harp\303\250ge.sql" | 23 +-
module/Application/autoload_classmap.php | 225 ++++++------------
.../Application/config/intervenant.config.php | 6 +-
module/Application/config/paiement.config.php | 2 +-
.../Controller/AgrementController.php | 4 +-
.../Controller/DroitsController.php | 4 +-
.../Controller/IndexController.php | 4 +-
.../Controller/IndicateurController.php | 4 +-
.../Controller/IntervenantController.php | 4 +-
.../ModificationServiceDuController.php | 4 +-
.../Controller/PaiementController.php | 8 +-
.../Controller/ParametreController.php | 4 +-
.../Controller/PieceJointeController.php | 4 +-
.../Application/Controller/Plugin/Context.php | 4 +-
.../Controller/ServiceController.php | 4 +-
.../StatutIntervenantController.php | 4 +-
.../Db/Traits/IntervenantAwareTrait.php | 2 +-
.../Db/Traits/TypeIntervenantAwareTrait.php | 2 +-
.../Application/Form/Intervenant/Dossier.php | 4 +-
.../Form/Intervenant/DossierFieldset.php | 4 +-
.../ElementCentreCoutFieldset.php | 12 +-
.../EtapeCentreCout/EtapeCentreCoutForm.php | 4 +-
.../Paiement/MiseEnPaiementRechercheForm.php | 10 +-
.../Form/Service/RechercheForm.php | 10 +-
.../Form/Service/SaisieFieldset.php | 4 +-
.../StatutIntervenantSaisieForm.php | 8 +-
.../Form/Workflow/DependanceForm.php | 6 +-
.../Intervenant/SuppressionDataProcessus.php | 2 +-
.../Provider/Identity/IdentityProvider.php | 4 +-
.../Provider/Role/RoleProvider.php | 8 +-
.../Service/CampagneSaisieService.php | 6 +-
...ntreCoutEp.php => CentreCoutEpService.php} | 4 +-
.../Application/Service/ContextService.php | 6 +-
.../src/Application/Service/Contrat.php | 4 +-
.../Application/Service/DbEventService.php | 4 +-
.../src/Application/Service/Dossier.php | 20 +-
.../Application/Service/IndicateurService.php | 4 +-
...Intervenant.php => IntervenantService.php} | 24 +-
.../src/Application/Service/LocalContext.php | 4 +-
.../Application/Service/MiseEnPaiement.php | 10 +-
.../Service/ModificationServiceDu.php | 2 +-
.../src/Application/Service/Periode.php | 4 +-
.../src/Application/Service/PieceJointe.php | 20 +-
.../Application/Service/PlafondService.php | 7 +
.../RegleStructureValidationService.php | 7 +-
.../src/Application/Service/ServiceAPayer.php | 6 +-
.../Service/ServiceReferentiel.php | 16 +-
.../Application/Service/ServiceService.php | 38 +--
...enant.php => StatutIntervenantService.php} | 11 +-
.../Application/Service/StructureService.php | 9 +-
.../Service/Traits/CentreCoutEpAwareTrait.php | 14 +-
...it.php => CentreCoutServiceAwareTrait.php} | 4 +-
...t.php => IntervenantServiceAwareTrait.php} | 14 +-
...=> StatutIntervenantServiceAwareTrait.php} | 14 +-
...p => TypeIntervenantServiceAwareTrait.php} | 14 +-
...rvenant.php => TypeIntervenantService.php} | 18 +-
.../src/Application/Service/Validation.php | 10 +-
.../src/Application/Service/VolumeHoraire.php | 6 +-
.../Application/Service/WorkflowService.php | 34 +--
.../Application/View/Helper/Service/Liste.php | 4 +-
.../View/Helper/Service/Resume.php | 4 +-
tests/OSETest/Entity/Db/EntityProvider.php | 20 --
62 files changed, 333 insertions(+), 417 deletions(-)
rename module/Application/src/Application/Service/{CentreCoutEp.php => CentreCoutEpService.php} (95%)
rename module/Application/src/Application/Service/{Intervenant.php => IntervenantService.php} (92%)
rename module/Application/src/Application/Service/{StatutIntervenant.php => StatutIntervenantService.php} (80%)
rename module/Application/src/Application/Service/Traits/{CentreCoutAwareTrait.php => CentreCoutServiceAwareTrait.php} (90%)
rename module/Application/src/Application/Service/Traits/{IntervenantAwareTrait.php => IntervenantServiceAwareTrait.php} (62%)
rename module/Application/src/Application/Service/Traits/{StatutIntervenantAwareTrait.php => StatutIntervenantServiceAwareTrait.php} (67%)
rename module/Application/src/Application/Service/Traits/{TypeIntervenantAwareTrait.php => TypeIntervenantServiceAwareTrait.php} (61%)
rename module/Application/src/Application/Service/{TypeIntervenant.php => TypeIntervenantService.php} (73%)
diff --git "a/data/Sql/Intervenant test existance Harp\303\250ge.sql" "b/data/Sql/Intervenant test existance Harp\303\250ge.sql"
index 31cd01389d..38f092fd60 100644
--- "a/data/Sql/Intervenant test existance Harp\303\250ge.sql"
+++ "b/data/Sql/Intervenant test existance Harp\303\250ge.sql"
@@ -3,8 +3,10 @@ SELECT * FROM
SELECT
'contrat' categorie,
ca.no_dossier_pers code,
- ct.c_type_contrat_trav contrat,
- null type_population,
+ ct.c_type_contrat_trav contrat_code,
+ tct.ll_type_contrat_trav contrat_libelle,
+ null type_population_code,
+ null type_population_libelle,
ca.d_deb_contrat_trav date_deb,
COALESCE(ca.d_fin_execution,ca.d_fin_contrat_trav) date_fin,
CASE WHEN
@@ -13,6 +15,7 @@ SELECT * FROM
FROM
contrat_avenant@harpprod ca
JOIN contrat_travail@harpprod ct ON ct.no_dossier_pers = ca.no_dossier_pers AND ct.no_contrat_travail = ca.no_contrat_travail
+ JOIN type_contrat_travail@harpprod tct ON tct.c_type_contrat_trav = ct.c_type_contrat_trav
WHERE
SYSDATE BETWEEN ca.d_deb_contrat_trav-184 AND COALESCE(ca.d_fin_execution,ca.d_fin_contrat_trav,SYSDATE)+184
@@ -21,8 +24,10 @@ SELECT * FROM
SELECT
'affectation' categorie,
a.no_dossier_pers code,
- null contrat,
- c.c_type_population type_population,
+ null contrat_code,
+ null contrat_libelle,
+ c.c_type_population type_population_code,
+ tp.ll_type_population type_population_libelle,
a.d_deb_affectation date_deb,
a.d_fin_affectation date_fin,
CASE WHEN
@@ -31,6 +36,7 @@ SELECT * FROM
FROM
affectation@harpprod a
LEFT JOIN carriere@harpprod c ON c.no_dossier_pers = a.no_dossier_pers AND c.no_seq_carriere = a.no_seq_carriere
+ LEFT JOIN type_population@harpprod tp ON tp.c_type_population = c.c_type_population
WHERE
SYSDATE BETWEEN a.d_deb_affectation-184 AND COALESCE(a.d_fin_affectation,SYSDATE)+184
@@ -39,8 +45,10 @@ SELECT * FROM
SELECT
'chercheur' categorie,
ch.no_individu code,
- null contrat,
- null type_population,
+ null contrat_code,
+ null contrat_libelle,
+ null type_population_code,
+ null type_population_libelle,
ch.d_deb_str_trav date_deb,
ch.d_fin_str_trav date_fin,
CASE WHEN
@@ -53,5 +61,6 @@ SELECT * FROM
) i
WHERE
1=1
- AND i.code = 103451
+ AND i.code = 128693;
+
\ No newline at end of file
diff --git a/module/Application/autoload_classmap.php b/module/Application/autoload_classmap.php
index c3f5f89c99..5c49403d31 100644
--- a/module/Application/autoload_classmap.php
+++ b/module/Application/autoload_classmap.php
@@ -1,6 +1,6 @@
<?php
// Generated by ZF2's ./bin/classmap_generator.php
-return array(
+return [
'Application\Module' => __DIR__ . '/Module.php',
'Application\Validator\DepartementNaissanceValidator' => __DIR__ . '/src/Application/Validator/DepartementNaissanceValidator.php',
'Application\Validator\PaysNaissanceValidator' => __DIR__ . '/src/Application/Validator/PaysNaissanceValidator.php',
@@ -359,87 +359,6 @@ return array(
'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',
@@ -453,19 +372,19 @@ return array(
'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\ContextService' => __DIR__ . '/src/Application/Service/ContextService.php',
- 'Application\Service\MotifModificationServiceDu' => __DIR__ . '/src/Application/Service/MotifModificationServiceDu.php',
- 'Application\Service\DisciplineService' => __DIR__ . '/src/Application/Service/DisciplineService.php',
- 'Application\Service\AnneeService' => __DIR__ . '/src/Application/Service/AnneeService.php',
- 'Application\Service\TypeVolumeHoraire' => __DIR__ . '/src/Application/Service/TypeVolumeHoraire.php',
- 'Application\Service\StructureService' => __DIR__ . '/src/Application/Service/StructureService.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\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\ContextService' => __DIR__ . '/src/Application/Service/ContextService.php',
+ 'Application\Service\MotifModificationServiceDu' => __DIR__ . '/src/Application/Service/MotifModificationServiceDu.php',
+ 'Application\Service\DisciplineService' => __DIR__ . '/src/Application/Service/DisciplineService.php',
+ 'Application\Service\AnneeService' => __DIR__ . '/src/Application/Service/AnneeService.php',
+ 'Application\Service\TypeVolumeHoraire' => __DIR__ . '/src/Application/Service/TypeVolumeHoraire.php',
+ 'Application\Service\StructureService' => __DIR__ . '/src/Application/Service/StructureService.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\IntervenantService' => __DIR__ . '/src/Application/Service/IntervenantService.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',
@@ -491,81 +410,81 @@ return array(
'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\StructureServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/StructureServiceAwareTrait.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\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\StructureServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/StructureServiceAwareTrait.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\SourceServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/SourceServiceAwareTrait.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\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\SourceServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/SourceServiceAwareTrait.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\AgrementServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AgrementServiceAwareTrait.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\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\AgrementServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AgrementServiceAwareTrait.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\ContextServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/ContextServiceAwareTrait.php',
+ 'Application\Service\Traits\CentreCoutServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/CentreCoutServiceAwareTrait.php',
+ 'Application\Service\Traits\ContextServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/ContextServiceAwareTrait.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\IntervenantServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/IntervenantServiceAwareTrait.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\AffectationServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AffectationServiceAwareTrait.php',
- 'Application\Service\Traits\WfEtapeDepServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/WfEtapeDepServiceAwareTrait.php',
- 'Application\Service\Traits\AnneeServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AnneeServiceAwareTrait.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\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\AffectationServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AffectationServiceAwareTrait.php',
+ 'Application\Service\Traits\WfEtapeDepServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/WfEtapeDepServiceAwareTrait.php',
+ 'Application\Service\Traits\AnneeServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/AnneeServiceAwareTrait.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\TypeIntervenantServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/TypeIntervenantServiceAwareTrait.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\StatutIntervenantServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/StatutIntervenantServiceAwareTrait.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\CentreCoutEpServiceAwareTrait' => __DIR__ . '/src/Application/Service/Traits/CentreCoutEpServiceAwareTrait.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\AffectationService' => __DIR__ . '/src/Application/Service/AffectationService.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\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\AffectationService' => __DIR__ . '/src/Application/Service/AffectationService.php',
+ 'Application\Service\StatutIntervenantService' => __DIR__ . '/src/Application/Service/StatutIntervenantService.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',
@@ -578,7 +497,7 @@ return array(
'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\CentreCoutEpService' => __DIR__ . '/src/Application/Service/CentreCoutEpService.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',
@@ -595,21 +514,21 @@ return array(
'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\TypeIntervenantService' => __DIR__ . '/src/Application/Service/TypeIntervenantService.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\AgrementService' => __DIR__ . '/src/Application/Service/AgrementService.php',
- 'Application\Service\Personnel' => __DIR__ . '/src/Application/Service/Personnel.php',
- 'Application\Service\ElementModulateur' => __DIR__ . '/src/Application/Service/ElementModulateur.php',
- 'Application\Service\SourceService' => __DIR__ . '/src/Application/Service/SourceService.php',
- 'Application\Service\FormuleIntervenant' => __DIR__ . '/src/Application/Service/FormuleIntervenant.php',
- 'Application\Service\WfEtape' => __DIR__ . '/src/Application/Service/WfEtape.php',
- 'Application\Service\TypePieceJointeStatutService' => __DIR__ . '/src/Application/Service/TypePieceJointeStatutService.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\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\AgrementService' => __DIR__ . '/src/Application/Service/AgrementService.php',
+ 'Application\Service\Personnel' => __DIR__ . '/src/Application/Service/Personnel.php',
+ 'Application\Service\ElementModulateur' => __DIR__ . '/src/Application/Service/ElementModulateur.php',
+ 'Application\Service\SourceService' => __DIR__ . '/src/Application/Service/SourceService.php',
+ 'Application\Service\FormuleIntervenant' => __DIR__ . '/src/Application/Service/FormuleIntervenant.php',
+ 'Application\Service\WfEtape' => __DIR__ . '/src/Application/Service/WfEtape.php',
+ 'Application\Service\TypePieceJointeStatutService' => __DIR__ . '/src/Application/Service/TypePieceJointeStatutService.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',
@@ -858,4 +777,4 @@ return array(
'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/intervenant.config.php b/module/Application/config/intervenant.config.php
index 16b784e517..e4c84bb338 100644
--- a/module/Application/config/intervenant.config.php
+++ b/module/Application/config/intervenant.config.php
@@ -474,11 +474,11 @@ return [
Processus\IntervenantProcessus::class => Processus\Factory\IntervenantProcessusFactory::class
],
'invokables' => [
- 'ApplicationIntervenant' => Service\Intervenant::class,
+ 'ApplicationIntervenant' => Service\IntervenantService::class,
'ApplicationMotifModificationServiceDu' => Service\MotifModificationServiceDu::class,
'ApplicationCivilite' => Service\Civilite::class,
- 'ApplicationStatutIntervenant' => Service\StatutIntervenant::class,
- 'ApplicationTypeIntervenant' => Service\TypeIntervenant::class,
+ 'ApplicationStatutIntervenant' => Service\StatutIntervenantService::class,
+ 'ApplicationTypeIntervenant' => Service\TypeIntervenantService::class,
'assertionIntervenant' => Assertion\IntervenantAssertion::class,
'ModificationServiceDuAssertion' => Assertion\ModificationServiceDuAssertion::class,
],
diff --git a/module/Application/config/paiement.config.php b/module/Application/config/paiement.config.php
index 8c5a3590ca..868632d644 100644
--- a/module/Application/config/paiement.config.php
+++ b/module/Application/config/paiement.config.php
@@ -258,7 +258,7 @@ return [
'ApplicationMiseEnPaiementIntervenantStructure' => Service\MiseEnPaiementIntervenantStructure::class,
'ApplicationTypeHeures' => Service\TypeHeures::class,
'ApplicationCentreCout' => Service\CentreCout::class,
- 'ApplicationCentreCoutEp' => Service\CentreCoutEp::class,
+ 'ApplicationCentreCoutEp' => Service\CentreCoutEpService::class,
'assertionPaiement' => Assertion\PaiementAssertion::class,
],
],
diff --git a/module/Application/src/Application/Controller/AgrementController.php b/module/Application/src/Application/Controller/AgrementController.php
index ba10d141aa..0d7e9dd650 100644
--- a/module/Application/src/Application/Controller/AgrementController.php
+++ b/module/Application/src/Application/Controller/AgrementController.php
@@ -11,7 +11,7 @@ use Application\Form\Agrement\Traits\SaisieAwareTrait;
use Application\Provider\Privilege\Privileges;
use Application\Service\AgrementService;
use Application\Service\Traits\AgrementServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\ServiceAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
use Application\Service\Traits\TblAgrementServiceAwareTrait;
@@ -30,7 +30,7 @@ class AgrementController extends AbstractController
{
use TblAgrementServiceAwareTrait;
use AgrementServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ServiceAwareTrait;
use ContextServiceAwareTrait;
use SaisieAwareTrait;
diff --git a/module/Application/src/Application/Controller/DroitsController.php b/module/Application/src/Application/Controller/DroitsController.php
index 2d96d9c1dd..e0ea3cb104 100644
--- a/module/Application/src/Application/Controller/DroitsController.php
+++ b/module/Application/src/Application/Controller/DroitsController.php
@@ -10,7 +10,7 @@ use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\PersonnelAwareTrait;
use Application\Service\Traits\RoleAwareTrait;
use Application\Service\Traits\SourceServiceAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
use Application\Form\Droits\Traits\RoleFormAwareTrait;
use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait;
@@ -27,7 +27,7 @@ use Application\Exception\DbException;
class DroitsController extends AbstractController
{
use RoleAwareTrait;
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use PrivilegeServiceAwareTrait;
use AffectationServiceAwareTrait;
use StructureServiceAwareTrait;
diff --git a/module/Application/src/Application/Controller/IndexController.php b/module/Application/src/Application/Controller/IndexController.php
index 6c1d40cfc1..3ac135eba4 100755
--- a/module/Application/src/Application/Controller/IndexController.php
+++ b/module/Application/src/Application/Controller/IndexController.php
@@ -4,7 +4,7 @@ namespace Application\Controller;
use Application\Acl\Role;
use Application\Provider\Privilege\Privileges;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
use Zend\View\Model\ViewModel;
@@ -15,7 +15,7 @@ class IndexController extends AbstractController
{
use \Application\Service\Traits\ContextServiceAwareTrait;
use \Application\Service\Traits\AnneeServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use UserContextServiceAwareTrait;
diff --git a/module/Application/src/Application/Controller/IndicateurController.php b/module/Application/src/Application/Controller/IndicateurController.php
index 901b447ab8..d675e7f2d4 100644
--- a/module/Application/src/Application/Controller/IndicateurController.php
+++ b/module/Application/src/Application/Controller/IndicateurController.php
@@ -11,7 +11,7 @@ use Application\Service\Traits\AffectationServiceAwareTrait;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\DossierAwareTrait;
use Application\Service\Traits\IndicateurServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\NotificationIndicateurAwareTrait;
use Application\Filter\IntervenantEmailFormatter;
use Application\Service\Traits\PeriodeAwareTrait;
@@ -35,7 +35,7 @@ use Zend\View\Model\ViewModel;
class IndicateurController extends AbstractController
{
use IndicateurServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ContextServiceAwareTrait;
use NotificationIndicateurAwareTrait;
use AffectationServiceAwareTrait;
diff --git a/module/Application/src/Application/Controller/IntervenantController.php b/module/Application/src/Application/Controller/IntervenantController.php
index b654f43465..6add77ef60 100644
--- a/module/Application/src/Application/Controller/IntervenantController.php
+++ b/module/Application/src/Application/Controller/IntervenantController.php
@@ -22,7 +22,7 @@ use UnicaenApp\Traits\SessionContainerTrait;
use LogicException;
use Application\Entity\Db\Intervenant;
use Application\Service\Traits\ContextServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\TypeHeuresAwareTrait;
use UnicaenApp\View\Model\MessengerViewModel;
use Zend\View\Model\ViewModel;
@@ -35,7 +35,7 @@ class IntervenantController extends AbstractController
{
use WorkflowServiceAwareTrait;
use ContextServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use TypeHeuresAwareTrait;
use HeuresCompFormAwareTrait;
use SessionContainerTrait;
diff --git a/module/Application/src/Application/Controller/ModificationServiceDuController.php b/module/Application/src/Application/Controller/ModificationServiceDuController.php
index 38a8860c61..6a52799b01 100644
--- a/module/Application/src/Application/Controller/ModificationServiceDuController.php
+++ b/module/Application/src/Application/Controller/ModificationServiceDuController.php
@@ -10,7 +10,7 @@ use Application\Service\Traits\ModificationServiceDuAwareTrait;
use Application\Service\Traits\WorkflowServiceAwareTrait;
use Doctrine\DBAL\DBALException;
use Application\Service\Traits\ContextServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use RuntimeException;
use UnicaenApp\View\Model\CsvModel;
@@ -22,7 +22,7 @@ use UnicaenApp\View\Model\CsvModel;
class ModificationServiceDuController extends AbstractController
{
use ContextServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ModificationServiceDuFormAwareTrait;
use ModificationServiceDuAwareTrait;
use WorkflowServiceAwareTrait;
diff --git a/module/Application/src/Application/Controller/PaiementController.php b/module/Application/src/Application/Controller/PaiementController.php
index b335323364..4520a904c2 100644
--- a/module/Application/src/Application/Controller/PaiementController.php
+++ b/module/Application/src/Application/Controller/PaiementController.php
@@ -15,14 +15,14 @@ use Application\Form\Paiement\Traits\MiseEnPaiementRechercheFormAwareTrait;
use Application\Provider\Privilege\Privileges;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\DotationServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\MiseEnPaiementAwareTrait;
use Application\Service\Traits\PeriodeAwareTrait;
use Application\Service\Traits\PersonnelAwareTrait;
use Application\Service\Traits\ServiceAPayerAwareTrait;
use Application\Service\Traits\ServiceAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\Service\Traits\TypeRessourceServiceAwareTrait;
use Application\Service\Traits\WorkflowServiceAwareTrait;
use UnicaenApp\Traits\SessionContainerTrait;
@@ -37,14 +37,14 @@ use Application\Entity\Paiement\MiseEnPaiementRecherche;
class PaiementController extends AbstractController
{
use ContextServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ServiceAwareTrait;
use StructureServiceAwareTrait;
use PersonnelAwareTrait;
use PeriodeAwareTrait;
use MiseEnPaiementAwareTrait;
use ServiceAPayerAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
use MiseEnPaiementFormAwareTrait;
use MiseEnPaiementRechercheFormAwareTrait;
use SessionContainerTrait;
diff --git a/module/Application/src/Application/Controller/ParametreController.php b/module/Application/src/Application/Controller/ParametreController.php
index e312b4ece5..86fdf69aff 100755
--- a/module/Application/src/Application/Controller/ParametreController.php
+++ b/module/Application/src/Application/Controller/ParametreController.php
@@ -11,7 +11,7 @@ use Application\Service\Traits\CampagneSaisieServiceAwareTrait;
use Application\Service\Traits\EtablissementAwareTrait;
use Application\Service\Traits\ParametresAwareTrait;
use Application\Service\Traits\PersonnelAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use Zend\View\Model\JsonModel;
@@ -28,7 +28,7 @@ class ParametreController extends AbstractController
use EtablissementAwareTrait;
use PersonnelAwareTrait;
use AnneeServiceAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
use TypeVolumeHoraireAwareTrait;
use CampagneSaisieServiceAwareTrait;
use CampagneSaisieFormAwareTrait;
diff --git a/module/Application/src/Application/Controller/PieceJointeController.php b/module/Application/src/Application/Controller/PieceJointeController.php
index b575c7373f..518459ff5e 100644
--- a/module/Application/src/Application/Controller/PieceJointeController.php
+++ b/module/Application/src/Application/Controller/PieceJointeController.php
@@ -9,7 +9,7 @@ use Application\Entity\Db\TypePieceJointeStatut;
use Application\Exception\DbException;
use Application\Form\PieceJointe\Traits\ModifierTypePieceJointeStatutFormAwareTrait;
use Application\Service\Traits\PieceJointeAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Service\Traits\TypePieceJointeAwareTrait;
use Application\Service\Traits\TypePieceJointeStatutAwareTrait;
use Application\Form\PieceJointe\Traits\TypePieceJointeSaisieFormAwareTrait;
@@ -28,7 +28,7 @@ class PieceJointeController extends AbstractController
{
use ContextServiceAwareTrait;
use PieceJointeAwareTrait;
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use TypePieceJointeSaisieFormAwareTrait;
use ModifierTypePieceJointeStatutFormAwareTrait;
use TypePieceJointeAwareTrait;
diff --git a/module/Application/src/Application/Controller/Plugin/Context.php b/module/Application/src/Application/Controller/Plugin/Context.php
index c446cd0a63..0dbbbe722d 100644
--- a/module/Application/src/Application/Controller/Plugin/Context.php
+++ b/module/Application/src/Application/Controller/Plugin/Context.php
@@ -2,7 +2,7 @@
namespace Application\Controller\Plugin;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use UnicaenApp\Service\EntityManagerAwareTrait;
use Zend\Mvc\Controller\Plugin\Params;
use LogicException;
@@ -23,7 +23,7 @@ use RuntimeException;
class Context extends Params
{
use EntityManagerAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
/**
* @var bool
diff --git a/module/Application/src/Application/Controller/ServiceController.php b/module/Application/src/Application/Controller/ServiceController.php
index a93c515d83..8e4a6e1ac8 100644
--- a/module/Application/src/Application/Controller/ServiceController.php
+++ b/module/Application/src/Application/Controller/ServiceController.php
@@ -30,7 +30,7 @@ use Application\Service\Traits\VolumeHoraireAwareTrait;
use Application\Service\Traits\ElementPedagogiqueAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use Application\Service\Traits\TypeInterventionAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\ServiceReferentielAwareTrait;
use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
@@ -51,7 +51,7 @@ class ServiceController extends AbstractController
use ElementPedagogiqueAwareTrait;
use TypeVolumeHoraireAwareTrait;
use TypeInterventionAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ServiceReferentielAwareTrait;
use EtatVolumeHoraireAwareTrait;
use StructureServiceAwareTrait;
diff --git a/module/Application/src/Application/Controller/StatutIntervenantController.php b/module/Application/src/Application/Controller/StatutIntervenantController.php
index 9bb5a341f9..8519aaeb0b 100755
--- a/module/Application/src/Application/Controller/StatutIntervenantController.php
+++ b/module/Application/src/Application/Controller/StatutIntervenantController.php
@@ -3,14 +3,14 @@
namespace Application\Controller;
use Application\Entity\Db\StatutIntervenant;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Exception\DbException;
use Application\Form\StatutIntervenant\Traits\StatutIntervenantSaisieFormAwareTrait;
use UnicaenApp\View\Model\MessengerViewModel;
class StatutIntervenantController extends AbstractController
{
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use StatutIntervenantSaisieFormAwareTrait;
public function indexAction()
diff --git a/module/Application/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php b/module/Application/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php
index d8c7c2799c..abd2ef919f 100755
--- a/module/Application/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php
+++ b/module/Application/src/Application/Entity/Db/Traits/IntervenantAwareTrait.php
@@ -5,7 +5,7 @@ namespace Application\Entity\Db\Traits;
use Application\Entity\Db\Intervenant;
/**
- * Description of IntervenantAwareTrait
+ * Description of IntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
diff --git a/module/Application/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php b/module/Application/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php
index 7bdd082477..fc0f7a0ff0 100755
--- a/module/Application/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php
+++ b/module/Application/src/Application/Entity/Db/Traits/TypeIntervenantAwareTrait.php
@@ -5,7 +5,7 @@ namespace Application\Entity\Db\Traits;
use Application\Entity\Db\TypeIntervenant;
/**
- * Description of TypeIntervenantAwareTrait
+ * Description of TypeIntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
diff --git a/module/Application/src/Application/Form/Intervenant/Dossier.php b/module/Application/src/Application/Form/Intervenant/Dossier.php
index dd616133e8..aca81ac5f7 100644
--- a/module/Application/src/Application/Form/Intervenant/Dossier.php
+++ b/module/Application/src/Application/Form/Intervenant/Dossier.php
@@ -8,7 +8,7 @@ use Application\Form\AbstractForm;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\DossierAwareTrait;
use Application\Service\Traits\ServiceServiceAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Validator\NumeroINSEEValidator;
use Zend\Form\Element\Csrf;
@@ -19,7 +19,7 @@ use Zend\Form\Element\Csrf;
*/
class Dossier extends AbstractForm
{
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use ContextServiceAwareTrait;
use DossierAwareTrait;
use ServiceServiceAwareTrait;
diff --git a/module/Application/src/Application/Form/Intervenant/DossierFieldset.php b/module/Application/src/Application/Form/Intervenant/DossierFieldset.php
index 0df267facd..99585dec98 100644
--- a/module/Application/src/Application/Form/Intervenant/DossierFieldset.php
+++ b/module/Application/src/Application/Form/Intervenant/DossierFieldset.php
@@ -9,7 +9,7 @@ use Application\Form\AbstractFieldset;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\DepartementAwareTrait;
use Application\Service\Traits\PaysAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Validator\DepartementNaissanceValidator;
use Application\Validator\NumeroINSEEValidator;
use Application\Validator\PaysNaissanceValidator;
@@ -28,7 +28,7 @@ use Zend\Validator\Date as DateValidator;
class DossierFieldset extends AbstractFieldset
{
use ContextServiceAwareTrait;
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use PaysAwareTrait;
use DepartementAwareTrait;
diff --git a/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php b/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php
index 4362a2f763..ed42a1ac00 100644
--- a/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php
+++ b/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/ElementCentreCoutFieldset.php
@@ -4,8 +4,8 @@ namespace Application\Form\OffreFormation\EtapeCentreCout;
use Application\Entity\Db\CentreCout;
use Application\Form\AbstractFieldset;
-use Application\Service\Traits\CentreCoutAwareTrait;
-use Application\Service\Traits\CentreCoutEpAwareTrait;
+use Application\Service\Traits\CentreCoutServiceAwareTrait;
+use Application\Service\Traits\CentreCoutEpServiceAwareTrait;
use Application\Entity\Db\ElementPedagogique;
use Application\Entity\Db\TypeHeures;
use RuntimeException;
@@ -20,8 +20,8 @@ use Zend\Stdlib\Hydrator\HydratorInterface;
*/
class ElementCentreCoutFieldset extends AbstractFieldset
{
- use CentreCoutAwareTrait;
- use CentreCoutEpAwareTrait;
+ use CentreCoutServiceAwareTrait;
+ use CentreCoutEpServiceAwareTrait;
/**
* element pédagogique associé
@@ -195,8 +195,8 @@ class ElementCentreCoutFieldset extends AbstractFieldset
class ElementCentreCoutFieldsetHydrator implements HydratorInterface
{
- use CentreCoutAwareTrait;
- use CentreCoutEpAwareTrait;
+ use CentreCoutServiceAwareTrait;
+ use CentreCoutEpServiceAwareTrait;
diff --git a/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php b/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php
index d3e9427efc..6e3fa65d4e 100644
--- a/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php
+++ b/module/Application/src/Application/Form/OffreFormation/EtapeCentreCout/EtapeCentreCoutForm.php
@@ -9,7 +9,7 @@ use Application\Entity\Db\TypeHeures;
use Application\Form\AbstractForm;
use Application\Form\OffreFormation\EtapeCentreCout\ElementCentreCoutSaisieFieldset;
use Application\Form\OffreFormation\EtapeCentreCout\Traits\ElementCentreCoutFieldsetAwareTrait;
-use Application\Service\Traits\CentreCoutAwareTrait;
+use Application\Service\Traits\CentreCoutServiceAwareTrait;
use RuntimeException;
use Zend\Stdlib\Hydrator\HydratorInterface;
use Zend\Form\Element\Select;
@@ -22,7 +22,7 @@ use Zend\Form\Element\Select;
*/
class EtapeCentreCoutForm extends AbstractForm
{
- use CentreCoutAwareTrait;
+ use CentreCoutServiceAwareTrait;
use ElementCentreCoutFieldsetAwareTrait;
/**
diff --git a/module/Application/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php b/module/Application/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php
index bc9e3dfee1..5c5ba6b7b3 100644
--- a/module/Application/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php
+++ b/module/Application/src/Application/Form/Paiement/MiseEnPaiementRechercheForm.php
@@ -5,10 +5,10 @@ namespace Application\Form\Paiement;
use Application\Entity\Paiement\MiseEnPaiementRecherche;
use Application\Form\AbstractForm;
use Application\Service\Traits\ContextServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\PeriodeAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Zend\Stdlib\Hydrator\HydratorInterface;
/**
@@ -18,7 +18,7 @@ use Zend\Stdlib\Hydrator\HydratorInterface;
*/
class MiseEnPaiementRechercheForm extends AbstractForm
{
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
use ContextServiceAwareTrait;
/**
@@ -212,10 +212,10 @@ class MiseEnPaiementRechercheForm extends AbstractForm
*/
class MiseEnPaiementRechercheFormHydrator implements HydratorInterface
{
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use PeriodeAwareTrait;
use StructureServiceAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
diff --git a/module/Application/src/Application/Form/Service/RechercheForm.php b/module/Application/src/Application/Form/Service/RechercheForm.php
index 719a810a25..f9d44405a9 100644
--- a/module/Application/src/Application/Form/Service/RechercheForm.php
+++ b/module/Application/src/Application/Form/Service/RechercheForm.php
@@ -15,10 +15,10 @@ use Application\Form\AbstractForm;
use Application\Form\OffreFormation\Traits\ElementPedagogiqueRechercheFieldsetAwareTrait;
use Application\Provider\Privilege\Privileges;
use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\NiveauEtapeAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use UnicaenApp\Service\EntityManagerAwareInterface;
use UnicaenApp\Service\EntityManagerAwareTrait;
@@ -39,11 +39,11 @@ class RechercheForm extends AbstractForm implements EntityManagerAwareInterface
{
use EntityManagerAwareTrait;
use StructureServiceAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
use TypeVolumeHoraireAwareTrait;
use EtatVolumeHoraireAwareTrait;
use AuthorizeServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use NiveauEtapeAwareTrait;
use ElementPedagogiqueRechercheFieldsetAwareTrait;
@@ -255,7 +255,7 @@ class RechercheForm extends AbstractForm implements EntityManagerAwareInterface
class RechercheFormHydrator implements HydratorInterface
{
use EntityManagerAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use NiveauEtapeAwareTrait;
diff --git a/module/Application/src/Application/Form/Service/SaisieFieldset.php b/module/Application/src/Application/Form/Service/SaisieFieldset.php
index 3a846571e1..672a448d59 100644
--- a/module/Application/src/Application/Form/Service/SaisieFieldset.php
+++ b/module/Application/src/Application/Form/Service/SaisieFieldset.php
@@ -17,7 +17,7 @@ use UnicaenAuth\Service\Traits\AuthorizeServiceAwareTrait;
use Zend\Stdlib\Hydrator\HydratorInterface;
use Zend\ServiceManager\ServiceLocatorAwareInterface;
use Zend\ServiceManager\ServiceLocatorAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\ElementPedagogiqueAwareTrait;
use Application\Service\Traits\EtablissementAwareTrait;
@@ -255,7 +255,7 @@ class SaisieFieldset extends AbstractFieldset
class SaisieFieldsetHydrator implements HydratorInterface
{
use ContextServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ElementPedagogiqueAwareTrait;
use EtablissementAwareTrait;
diff --git a/module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php b/module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php
index dace2f50b1..364f1edac9 100755
--- a/module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php
+++ b/module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php
@@ -3,11 +3,11 @@
namespace Application\Form\StatutIntervenant;
use Application\Form\AbstractForm;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Zend\Form\Element\Csrf;
use Zend\Stdlib\Hydrator\HydratorInterface;
use Application\Service\Traits\ContextServiceAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
/**
* Description of StatutIntervenantSaisieForm
@@ -17,7 +17,7 @@ use Application\Service\Traits\TypeIntervenantAwareTrait;
class StatutIntervenantSaisieForm extends AbstractForm
{
use ContextServiceAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
public function init()
{
@@ -389,7 +389,7 @@ class StatutIntervenantSaisieForm extends AbstractForm
class StatutIntervenantHydrator implements HydratorInterface
{
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
/**
* Hydrate $object with the provided $data.
diff --git a/module/Application/src/Application/Form/Workflow/DependanceForm.php b/module/Application/src/Application/Form/Workflow/DependanceForm.php
index 8d8dfdd7e0..2c8821921a 100755
--- a/module/Application/src/Application/Form/Workflow/DependanceForm.php
+++ b/module/Application/src/Application/Form/Workflow/DependanceForm.php
@@ -4,7 +4,7 @@ namespace Application\Form\Workflow;
use Application\Entity\Db\WfEtapeDep;
use Application\Form\AbstractForm;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\Service\Traits\WfEtapeAwareTrait;
use UnicaenApp\Util;
use Zend\Stdlib\Hydrator\HydratorInterface;
@@ -18,7 +18,7 @@ use Zend\Stdlib\Hydrator\HydratorInterface;
class DependanceForm extends AbstractForm
{
use WfEtapeAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
@@ -200,7 +200,7 @@ class DependanceForm extends AbstractForm
class DependanceFormHydrator implements HydratorInterface
{
use WfEtapeAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
diff --git a/module/Application/src/Application/Processus/Intervenant/SuppressionDataProcessus.php b/module/Application/src/Application/Processus/Intervenant/SuppressionDataProcessus.php
index a24908bb37..0274111419 100644
--- a/module/Application/src/Application/Processus/Intervenant/SuppressionDataProcessus.php
+++ b/module/Application/src/Application/Processus/Intervenant/SuppressionDataProcessus.php
@@ -46,7 +46,7 @@ class SuppressionDataProcessus
use VolumeHoraireReferentielAwareTrait;
use ServiceServiceAwareTrait;
use ServiceReferentielAwareTrait;
- use \Application\Service\Traits\IntervenantAwareTrait;
+ use \Application\Service\Traits\IntervenantServiceAwareTrait;
use ContratAwareTrait;
use DbEventServiceAwareTrait;
diff --git a/module/Application/src/Application/Provider/Identity/IdentityProvider.php b/module/Application/src/Application/Provider/Identity/IdentityProvider.php
index 699d7f9535..a9a54b7ac3 100644
--- a/module/Application/src/Application/Provider/Identity/IdentityProvider.php
+++ b/module/Application/src/Application/Provider/Identity/IdentityProvider.php
@@ -5,7 +5,7 @@ namespace Application\Provider\Identity;
use Application\Entity\Db\Affectation;
use Application\Entity\Db\Role;
use Application\Service\Traits\ContextServiceAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\PersonnelAwareTrait;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenAuth\Provider\Identity\ChainableProvider;
@@ -21,7 +21,7 @@ class IdentityProvider implements ChainableProvider, IdentityProviderInterface
{
use EntityManagerAwareTrait;
use SessionContainerTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use PersonnelAwareTrait;
use ContextServiceAwareTrait;
diff --git a/module/Application/src/Application/Provider/Role/RoleProvider.php b/module/Application/src/Application/Provider/Role/RoleProvider.php
index 399f50b94d..27ebf50e60 100644
--- a/module/Application/src/Application/Provider/Role/RoleProvider.php
+++ b/module/Application/src/Application/Provider/Role/RoleProvider.php
@@ -12,9 +12,9 @@ use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenAuth\Provider\Privilege\PrivilegeProviderAwareTrait;
use Zend\Permissions\Acl\Role\RoleInterface;
use Application\Acl\Role;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use UnicaenApp\Traits\SessionContainerTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
/**
* Fournisseur des rôles utilisateurs de l'application :
@@ -25,9 +25,9 @@ use Application\Service\Traits\IntervenantAwareTrait;
class RoleProvider implements ProviderInterface, EntityManagerAwareInterface
{
use EntityManagerAwareTrait;
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use SessionContainerTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use PersonnelAwareTrait;
use PrivilegeProviderAwareTrait;
use ContextServiceAwareTrait;
diff --git a/module/Application/src/Application/Service/CampagneSaisieService.php b/module/Application/src/Application/Service/CampagneSaisieService.php
index 32f028d954..d857040e47 100755
--- a/module/Application/src/Application/Service/CampagneSaisieService.php
+++ b/module/Application/src/Application/Service/CampagneSaisieService.php
@@ -3,7 +3,7 @@
namespace Application\Service;
use Application\Entity\Db\CampagneSaisie;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
+use Application\Entity\Db\TypeIntervenant;
use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
use Application\Service\Traits\ContextServiceAwareTrait;
@@ -49,12 +49,12 @@ class CampagneSaisieService extends AbstractEntityService
/**
- * @param TypeIntervenantEntity $typeIntervenant
+ * @param TypeIntervenant $typeIntervenant
* @param TypeVolumeHoraireEntity $typeVolumeHoraire
*
* @return CampagneSaisie
*/
- public function getBy(TypeIntervenantEntity $typeIntervenant, TypeVolumeHoraireEntity $typeVolumeHoraire)
+ public function getBy(TypeIntervenant $typeIntervenant, TypeVolumeHoraireEntity $typeVolumeHoraire)
{
$annee = $this->getServiceContext()->getAnnee();
diff --git a/module/Application/src/Application/Service/CentreCoutEp.php b/module/Application/src/Application/Service/CentreCoutEpService.php
similarity index 95%
rename from module/Application/src/Application/Service/CentreCoutEp.php
rename to module/Application/src/Application/Service/CentreCoutEpService.php
index a690b5b1db..c3c8ce6685 100644
--- a/module/Application/src/Application/Service/CentreCoutEp.php
+++ b/module/Application/src/Application/Service/CentreCoutEpService.php
@@ -8,11 +8,11 @@ use Application\Service\Traits\SourceServiceAwareTrait;
use BjyAuthorize\Exception\UnAuthorizedException;
/**
- * Description of CentreCoutEp
+ * Description of CentreCoutEpService
*
* @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
*/
-class CentreCoutEp extends AbstractEntityService
+class CentreCoutEpService extends AbstractEntityService
{
use SourceServiceAwareTrait;
diff --git a/module/Application/src/Application/Service/ContextService.php b/module/Application/src/Application/Service/ContextService.php
index 7892e8e41b..3a98ce2810 100644
--- a/module/Application/src/Application/Service/ContextService.php
+++ b/module/Application/src/Application/Service/ContextService.php
@@ -7,7 +7,7 @@ use Application\Entity\Db\Etablissement as EntityEtablissement;
use Application\Entity\Db\Annee;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Utilisateur as UtilisateurEntity;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\PersonnelAwareTrait;
use UnicaenApp\Traits\SessionContainerTrait;
use DateTime;
@@ -22,13 +22,13 @@ class ContextService extends AbstractService
{
use Traits\EtablissementAwareTrait;
use Traits\AnneeServiceAwareTrait;
- use Traits\IntervenantAwareTrait;
+ use Traits\IntervenantServiceAwareTrait;
use Traits\ParametresAwareTrait;
use Traits\StructureServiceAwareTrait;
use SessionContainerTrait;
use UserContextServiceAwareTrait;
use PersonnelAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
/**
* selectedIdentityRole
diff --git a/module/Application/src/Application/Service/Contrat.php b/module/Application/src/Application/Service/Contrat.php
index 5d63a58c3b..fd087a4562 100644
--- a/module/Application/src/Application/Service/Contrat.php
+++ b/module/Application/src/Application/Service/Contrat.php
@@ -10,7 +10,7 @@ use Application\Service\Traits\ValidationAwareTrait;
use Application\Service\Traits\VolumeHoraireAwareTrait;
use Doctrine\ORM\QueryBuilder;
use Application\Entity\Db\Contrat as ContratEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\Fichier as FichierEntity;
@@ -131,7 +131,7 @@ class Contrat extends AbstractEntityService
*
* @return int
*/
- public function getNextNumeroAvenant(IntervenantEntity $intervenant, $avenantsValidesSeulement = true)
+ public function getNextNumeroAvenant(Intervenant $intervenant, $avenantsValidesSeulement = true)
{
$qb = $this->finderByIntervenant($intervenant);
$qb = $this->finderByTypeContrat($this->getServiceTypeContrat()->getAvenant(), $qb);
diff --git a/module/Application/src/Application/Service/DbEventService.php b/module/Application/src/Application/Service/DbEventService.php
index eb06e7da1e..88e8118725 100755
--- a/module/Application/src/Application/Service/DbEventService.php
+++ b/module/Application/src/Application/Service/DbEventService.php
@@ -2,7 +2,7 @@
namespace Application\Service;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
/**
* Description of DbEventService
@@ -31,7 +31,7 @@ class DbEventService extends AbstractService {
- public function forcerCalculer( IntervenantEntity $intervenant )
+ public function forcerCalculer( Intervenant $intervenant )
{
$iid = (int)$intervenant->getId();
diff --git a/module/Application/src/Application/Service/Dossier.php b/module/Application/src/Application/Service/Dossier.php
index 0e2323a060..b94ec7c8ab 100644
--- a/module/Application/src/Application/Service/Dossier.php
+++ b/module/Application/src/Application/Service/Dossier.php
@@ -3,11 +3,11 @@
namespace Application\Service;
use Application\Entity\Db\Dossier as DossierEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\Utilisateur as UtilisateurEntity;
use Application\Entity\Db\TypeValidation as TypeValidationEntity;
use Application\Entity\Db\Validation as ValidationEntity;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\ValidationAwareTrait;
/**
@@ -21,7 +21,7 @@ use Application\Service\Traits\ValidationAwareTrait;
*/
class Dossier extends AbstractEntityService
{
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use ValidationAwareTrait;
/**
@@ -57,11 +57,11 @@ class Dossier extends AbstractEntityService
/**
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return DossierEntity|null
*/
- public function getByIntervenant(IntervenantEntity $intervenant)
+ public function getByIntervenant(Intervenant $intervenant)
{
if (isset($this->dcache[$intervenant->getId()])){
return $this->dcache[$intervenant->getId()];
@@ -107,7 +107,7 @@ class Dossier extends AbstractEntityService
*
* @return Intervenant Intervenant de l'année précédente
*/
- public function intervenantVacataireAnneesPrecedentes(IntervenantEntity $intervenant, $x = 1)
+ public function intervenantVacataireAnneesPrecedentes(Intervenant $intervenant, $x = 1)
{
$sourceCode = $intervenant->getSourceCode();
@@ -128,11 +128,11 @@ class Dossier extends AbstractEntityService
/**
* Retourne la validation d'un dossier d'intervenant
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return ValidationEntity
*/
- public function getValidation(IntervenantEntity $intervenant)
+ public function getValidation(Intervenant $intervenant)
{
$validation = null;
$serviceValidation = $this->getServiceValidation();
@@ -152,12 +152,12 @@ class Dossier extends AbstractEntityService
/**
* Suppression (historisation) de l'historique des modifications sur les données perso d'un intervenant.
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param UtilisateurEntity $destructeur
*
* @return $this
*/
- public function purgerDonneesPersoModif(IntervenantEntity $intervenant, UtilisateurEntity $destructeur)
+ public function purgerDonneesPersoModif(Intervenant $intervenant, UtilisateurEntity $destructeur)
{
$qb = $this->getEntityManager()->createQueryBuilder()
->update(\Application\Entity\Db\IndicModifDossier::class, 't')
diff --git a/module/Application/src/Application/Service/IndicateurService.php b/module/Application/src/Application/Service/IndicateurService.php
index d1a260aa2b..5088ec35a6 100644
--- a/module/Application/src/Application/Service/IndicateurService.php
+++ b/module/Application/src/Application/Service/IndicateurService.php
@@ -2,7 +2,7 @@
namespace Application\Service;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Doctrine\ORM\QueryBuilder;
use Application\Entity\Db\Indicateur;
use Application\Entity\Db\Structure;
@@ -21,7 +21,7 @@ class IndicateurService extends AbstractEntityService
{
protected $countCache = [];
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
diff --git a/module/Application/src/Application/Service/Intervenant.php b/module/Application/src/Application/Service/IntervenantService.php
similarity index 92%
rename from module/Application/src/Application/Service/Intervenant.php
rename to module/Application/src/Application/Service/IntervenantService.php
index 4e04c749e3..eacfcc9b16 100644
--- a/module/Application/src/Application/Service/Intervenant.php
+++ b/module/Application/src/Application/Service/IntervenantService.php
@@ -2,7 +2,7 @@
namespace Application\Service;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Periode as PeriodeEntity;
use Application\Entity\Db\Annee;
@@ -10,7 +10,7 @@ use Application\Entity\Db\TypeIntervenant as TypeIntervenantService;
use Application\Filter\StringFromFloat;
use Application\Service\Traits\MiseEnPaiementAwareTrait;
use Application\Service\Traits\MiseEnPaiementIntervenantStructureAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Service\Traits\WorkflowServiceAwareTrait;
use RuntimeException;
use Doctrine\ORM\QueryBuilder;
@@ -23,9 +23,9 @@ use UnicaenImport\Service\Traits\QueryGeneratorServiceAwareTrait;
*
* @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
*/
-class Intervenant extends AbstractEntityService
+class IntervenantService extends AbstractEntityService
{
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
use ImportProcessusAwareTrait;
use QueryGeneratorServiceAwareTrait;
use MiseEnPaiementAwareTrait;
@@ -42,7 +42,7 @@ class Intervenant extends AbstractEntityService
*/
public function getEntityClass()
{
- return IntervenantEntity::class;
+ return Intervenant::class;
}
@@ -50,11 +50,11 @@ class Intervenant extends AbstractEntityService
/**
* Retourne l'intervenant de l'année précédente
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
- * @return IntervenantEntity
+ * @return Intervenant
*/
- public function getPrecedent(IntervenantEntity $intervenant)
+ public function getPrecedent(Intervenant $intervenant)
{
return $this->getBySourceCode(
$intervenant->getSourceCode(),
@@ -70,7 +70,7 @@ class Intervenant extends AbstractEntityService
* @param string $sourceCode
* @param Annee $annee
*
- * @return IntervenantEntity
+ * @return Intervenant
*/
public function getBySourceCode($sourceCode, Annee $annee = null, $autoImport = true)
{
@@ -141,10 +141,10 @@ class Intervenant extends AbstractEntityService
/**
* Sauvegarde une entité
*
- * @param IntervenantEntity $entity
+ * @param Intervenant $entity
*
* @throws \RuntimeException
- * @return IntervenantEntity
+ * @return Intervenant
*/
public function save($entity)
{
@@ -202,7 +202,7 @@ class Intervenant extends AbstractEntityService
/**
* Supprime (historise par défaut) le service spécifié.
*
- * @param IntervenantEntity $entity Entité à détruire
+ * @param Intervenant $entity Entité à détruire
* @param bool $softDelete
*
* @return self
diff --git a/module/Application/src/Application/Service/LocalContext.php b/module/Application/src/Application/Service/LocalContext.php
index 2b444882fc..c43d08a3d0 100644
--- a/module/Application/src/Application/Service/LocalContext.php
+++ b/module/Application/src/Application/Service/LocalContext.php
@@ -4,7 +4,7 @@ namespace Application\Service;
use Application\Service\Traits\ElementPedagogiqueAwareTrait;
use Application\Service\Traits\EtapeAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\NiveauEtapeAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
use UnicaenApp\Traits\SessionContainerTrait;
@@ -22,7 +22,7 @@ use Application\Entity\Db\ElementPedagogique as EntityElementPedagogique;
*/
class LocalContext extends AbstractService
{
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use StructureServiceAwareTrait;
use EtapeAwareTrait;
use ElementPedagogiqueAwareTrait;
diff --git a/module/Application/src/Application/Service/MiseEnPaiement.php b/module/Application/src/Application/Service/MiseEnPaiement.php
index 0dc6674243..722f826df2 100644
--- a/module/Application/src/Application/Service/MiseEnPaiement.php
+++ b/module/Application/src/Application/Service/MiseEnPaiement.php
@@ -4,11 +4,11 @@ namespace Application\Service;
use Application\Entity\Db\MiseEnPaiement as MiseEnPaiementEntity;
use Application\Entity\Db\ServiceAPayerInterface;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
+use Application\Entity\Db\TypeIntervenant;
use Application\Entity\Paiement\MiseEnPaiementRecherche;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Periode as PeriodeEntity;
-use Application\Service\Traits\CentreCoutAwareTrait;
+use Application\Service\Traits\CentreCoutServiceAwareTrait;
use Application\Service\Traits\DomaineFonctionnelAwareTrait;
use Application\Service\Traits\FormuleResultatServiceReferentielAwareTrait;
use Application\Service\Traits\FormuleResultatServiceServiceAwareTrait;
@@ -25,9 +25,9 @@ use Doctrine\ORM\QueryBuilder;
*/
class MiseEnPaiement extends AbstractEntityService
{
- use Traits\IntervenantAwareTrait;
+ use Traits\IntervenantServiceAwareTrait;
use MiseEnPaiementIntervenantStructureAwareTrait;
- use CentreCoutAwareTrait;
+ use CentreCoutServiceAwareTrait;
use DomaineFonctionnelAwareTrait;
use TypeHeuresAwareTrait;
use FormuleResultatServiceServiceAwareTrait;
@@ -85,7 +85,7 @@ class MiseEnPaiement extends AbstractEntityService
- public function finderByTypeIntervenant(TypeIntervenantEntity $typeIntervenant = null, QueryBuilder $qb = null, $alias = null)
+ public function finderByTypeIntervenant(TypeIntervenant $typeIntervenant = null, QueryBuilder $qb = null, $alias = null)
{
$serviceMIS = $this->getServiceMiseEnPaiementIntervenantStructure();
diff --git a/module/Application/src/Application/Service/ModificationServiceDu.php b/module/Application/src/Application/Service/ModificationServiceDu.php
index 844cdba5cc..fb71ad74df 100644
--- a/module/Application/src/Application/Service/ModificationServiceDu.php
+++ b/module/Application/src/Application/Service/ModificationServiceDu.php
@@ -14,7 +14,7 @@ use Application\Entity\Db\Structure;
*/
class ModificationServiceDu extends AbstractEntityService
{
- use Traits\IntervenantAwareTrait;
+ use Traits\IntervenantServiceAwareTrait;
diff --git a/module/Application/src/Application/Service/Periode.php b/module/Application/src/Application/Service/Periode.php
index 64b2ccd217..3de93470d4 100644
--- a/module/Application/src/Application/Service/Periode.php
+++ b/module/Application/src/Application/Service/Periode.php
@@ -5,7 +5,7 @@ namespace Application\Service;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Periode as PeriodeEntity;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\MiseEnPaiementAwareTrait;
use Application\Service\Traits\MiseEnPaiementIntervenantStructureAwareTrait;
use Doctrine\ORM\QueryBuilder;
@@ -19,7 +19,7 @@ use Doctrine\ORM\QueryBuilder;
class Periode extends AbstractEntityService
{
use MiseEnPaiementAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use MiseEnPaiementIntervenantStructureAwareTrait;
/**
diff --git a/module/Application/src/Application/Service/PieceJointe.php b/module/Application/src/Application/Service/PieceJointe.php
index 1079db1b19..8a6f94cdf7 100644
--- a/module/Application/src/Application/Service/PieceJointe.php
+++ b/module/Application/src/Application/Service/PieceJointe.php
@@ -8,7 +8,7 @@ use Application\Service\Traits\ValidationAwareTrait;
use Application\Entity\Db\TypePieceJointe as TypePieceJointeEntity;
use Application\Entity\Db\PieceJointe as PieceJointeEntity;
use Application\Entity\Db\Fichier as FichierEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\TypeValidation as TypeValidationEntity;
use BjyAuthorize\Exception\UnAuthorizedException;
@@ -56,12 +56,12 @@ class PieceJointe extends AbstractEntityService
/**
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param TypePieceJointeEntity $type
*
* @return PieceJointeEntity
*/
- public function getByType(IntervenantEntity $intervenant, TypePieceJointeEntity $type)
+ public function getByType(Intervenant $intervenant, TypePieceJointeEntity $type)
{
$qb = $this->finderByType($type);
$this->finderByHistorique($qb);
@@ -75,11 +75,11 @@ class PieceJointe extends AbstractEntityService
/**
* Retourne la liste des types de pièces jointes demandées
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return TypePieceJointeEntity[]
*/
- public function getTypesPiecesDemandees(IntervenantEntity $intervenant)
+ public function getTypesPiecesDemandees(Intervenant $intervenant)
{
$dql = "
SELECT
@@ -112,11 +112,11 @@ class PieceJointe extends AbstractEntityService
/**
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return float
*/
- public function getHeuresPourSeuil(IntervenantEntity $intervenant)
+ public function getHeuresPourSeuil(Intervenant $intervenant)
{
if (!isset($this->hps[$intervenant->getId()])) {
$this->getTypesPiecesDemandees($intervenant);
@@ -128,11 +128,11 @@ class PieceJointe extends AbstractEntityService
/**
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return \Application\Entity\Db\PieceJointe[]
*/
- public function getPiecesFournies(IntervenantEntity $intervenant)
+ public function getPiecesFournies(Intervenant $intervenant)
{
$dql = "
SELECT
@@ -225,7 +225,7 @@ class PieceJointe extends AbstractEntityService
*
* @return PieceJointeEntity[]
*/
- public function ajouterFichiers($files, IntervenantEntity $intervenant, TypePieceJointeEntity $type, $deleteFiles = true)
+ public function ajouterFichiers($files, Intervenant $intervenant, TypePieceJointeEntity $type, $deleteFiles = true)
{
if (!$files) {
throw new \LogicException("Aucune donnée sur les fichiers spécifiée.");
diff --git a/module/Application/src/Application/Service/PlafondService.php b/module/Application/src/Application/Service/PlafondService.php
index a667e29936..a7139d1ec0 100755
--- a/module/Application/src/Application/Service/PlafondService.php
+++ b/module/Application/src/Application/Service/PlafondService.php
@@ -30,6 +30,13 @@ class PlafondService extends AbstractEntityService
+ public function controle()
+ {
+
+ }
+
+
+
/**
* Retourne l'alias d'entité courante
*
diff --git a/module/Application/src/Application/Service/RegleStructureValidationService.php b/module/Application/src/Application/Service/RegleStructureValidationService.php
index 4bfc54722f..88f0e7f5db 100755
--- a/module/Application/src/Application/Service/RegleStructureValidationService.php
+++ b/module/Application/src/Application/Service/RegleStructureValidationService.php
@@ -3,9 +3,8 @@
namespace Application\Service;
use Application\Entity\Db\RegleStructureValidation;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
/**
* Description of RegleStructureValidationService
@@ -47,11 +46,11 @@ class RegleStructureValidationService extends AbstractEntityService
/**
* @param TypeVolumeHoraireEntity $typeVolumeHoraire
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return RegleStructureValidation
*/
- public function getBy(TypeVolumeHoraireEntity $typeVolumeHoraire, IntervenantEntity $intervenant)
+ public function getBy(TypeVolumeHoraireEntity $typeVolumeHoraire, Intervenant $intervenant)
{
$typeIntervenant = $intervenant->getStatut()->getTypeIntervenant();
diff --git a/module/Application/src/Application/Service/ServiceAPayer.php b/module/Application/src/Application/Service/ServiceAPayer.php
index 328536ba1f..4e2a3bcb08 100644
--- a/module/Application/src/Application/Service/ServiceAPayer.php
+++ b/module/Application/src/Application/Service/ServiceAPayer.php
@@ -2,7 +2,7 @@
namespace Application\Service;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\ServiceAPayerInterface;
use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
@@ -22,11 +22,11 @@ class ServiceAPayer extends AbstractService
/**
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
* @return ServiceAPayerInterface[]
*/
- public function getListByIntervenant(IntervenantEntity $intervenant)
+ public function getListByIntervenant(Intervenant $intervenant)
{
$typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getRealise();
$etatVolumeHoraire = $this->getServiceEtatVolumeHoraire()->getValide();
diff --git a/module/Application/src/Application/Service/ServiceReferentiel.php b/module/Application/src/Application/Service/ServiceReferentiel.php
index 1820a93345..c3dcef49dc 100644
--- a/module/Application/src/Application/Service/ServiceReferentiel.php
+++ b/module/Application/src/Application/Service/ServiceReferentiel.php
@@ -6,12 +6,12 @@ use Application\Entity\Db\FonctionReferentiel as FonctionReferentielEntity;
use Application\Provider\Privilege\Privileges;
use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
use Application\Service\Traits\FonctionReferentielAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use Application\Service\Traits\VolumeHoraireReferentielAwareTrait;
use Doctrine\ORM\QueryBuilder;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\ServiceReferentiel as ServiceReferentielEntity;
use Application\Entity\Db\Structure;
use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
@@ -25,7 +25,7 @@ use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
*/
class ServiceReferentiel extends AbstractEntityService
{
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use StructureServiceAwareTrait;
use FonctionReferentielAwareTrait;
use TypeVolumeHoraireAwareTrait;
@@ -132,7 +132,7 @@ class ServiceReferentiel extends AbstractEntityService
/**
* Retourne un service unique selon ses critères précis
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param FonctionReferentielEntity $fonction
* @param Structure $structure
* @param string $commentaires
@@ -140,7 +140,7 @@ class ServiceReferentiel extends AbstractEntityService
* @return null|\Application\Entity\Db\ServiceReferentiel
*/
public function getBy(
- IntervenantEntity $intervenant,
+ Intervenant $intervenant,
FonctionReferentielEntity $fonction,
Structure $structure,
$commentaires=null
@@ -318,10 +318,10 @@ class ServiceReferentiel extends AbstractEntityService
* Prend les services d'un intervenant, année n-1, et reporte ces services (et les volumes horaires associés)
* sur l'année n
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
*/
- public function setPrevusFromPrevus(IntervenantEntity $intervenant)
+ public function setPrevusFromPrevus(Intervenant $intervenant)
{
$old = $this->getPrevusFromPrevusData($intervenant);
@@ -352,7 +352,7 @@ class ServiceReferentiel extends AbstractEntityService
- public function getPrevusFromPrevusData(IntervenantEntity $intervenant)
+ public function getPrevusFromPrevusData(Intervenant $intervenant)
{
$tvhPrevu = $this->getServiceTypeVolumeHoraire()->getPrevu();
$evhValide = $this->getServiceEtatVolumeHoraire()->getSaisi();
diff --git a/module/Application/src/Application/Service/ServiceService.php b/module/Application/src/Application/Service/ServiceService.php
index 63c100998d..2c89d47ba3 100644
--- a/module/Application/src/Application/Service/ServiceService.php
+++ b/module/Application/src/Application/Service/ServiceService.php
@@ -6,12 +6,12 @@ use Application\Entity\Db\ElementPedagogique as ElementPedagogiqueEntity;
use Application\Entity\Db\Etablissement as EtablissementEntity;
use Application\Entity\Db\Etape as EtapeEntity;
use Application\Entity\Db\EtatVolumeHoraire as EtatVolumeHoraireEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\Service as ServiceEntity;
use Application\Entity\Db\Service;
use Application\Entity\Db\Structure;
use Application\Entity\Db\TypeIntervention as TypeInterventionEntity;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
+use Application\Entity\Db\TypeIntervenant;
use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
use Application\Entity\Db\VolumeHoraire;
use Application\Entity\NiveauEtape as NiveauEtapeEntity;
@@ -21,12 +21,12 @@ use Application\Hydrator\Service\Traits\RechercheHydratorAwareTrait;
use Application\Provider\Privilege\Privileges;
use Application\Service\Traits\ElementPedagogiqueAwareTrait;
use Application\Service\Traits\EtapeAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\LocalContextAwareTrait;
use Application\Service\Traits\PeriodeAwareTrait;
-use Application\Service\Traits\StatutIntervenantAwareTrait;
+use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
use Application\Service\Traits\StructureServiceAwareTrait;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\Service\Traits\TypeInterventionAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use Application\Service\Traits\ValidationAwareTrait;
@@ -48,18 +48,18 @@ class ServiceService extends AbstractEntityService
{
use ElementPedagogiqueAwareTrait;
use EtapeAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use StructureServiceAwareTrait;
use TypeInterventionAwareTrait;
use EtatVolumeHoraireAwareTrait;
use TypeVolumeHoraireAwareTrait;
use VolumeHoraireAwareTrait;
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
use PeriodeAwareTrait;
use LocalContextAwareTrait;
use RechercheHydratorAwareTrait;
use ValidationAwareTrait;
- use StatutIntervenantAwareTrait;
+ use StatutIntervenantServiceAwareTrait;
/**
*
@@ -202,14 +202,14 @@ class ServiceService extends AbstractEntityService
/**
* Retourne un service unique selon ses critères précis
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param ElementPedagogiqueEntity $elementPedagogique
* @param EtablissementEntity $etablissement
*
* @return null|ServiceEntity
*/
public function getBy(
- IntervenantEntity $intervenant,
+ Intervenant $intervenant,
$elementPedagogique,
EtablissementEntity $etablissement
)
@@ -558,12 +558,12 @@ class ServiceService extends AbstractEntityService
/**
* Retourne la liste des services selon l'étape donnée
*
- * @param TypeIntervenantEntity $typeIntervenant
+ * @param TypeIntervenant $typeIntervenant
* @param QueryBuilder|null $queryBuilder
*
* @return QueryBuilder
*/
- public function finderByTypeIntervenant(TypeIntervenantEntity $typeIntervenant = null, QueryBuilder $qb = null, $alias = null)
+ public function finderByTypeIntervenant(TypeIntervenant $typeIntervenant = null, QueryBuilder $qb = null, $alias = null)
{
list($qb, $alias) = $this->initQuery($qb, $alias);
if ($typeIntervenant) {
@@ -580,10 +580,10 @@ class ServiceService extends AbstractEntityService
* Prend les services d'un intervenant, année n-1, et reporte ces services (et les volumes horaires associés)
* sur l'année n
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*
*/
- public function setPrevusFromPrevus(IntervenantEntity $intervenant, $plafondControl = true)
+ public function setPrevusFromPrevus(Intervenant $intervenant, $plafondControl = true)
{
$old = $this->getPrevusFromPrevusData($intervenant);
$typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getPrevu();
@@ -620,7 +620,7 @@ class ServiceService extends AbstractEntityService
- public function getPrevusFromPrevusData(IntervenantEntity $intervenant)
+ public function getPrevusFromPrevusData(Intervenant $intervenant)
{
$tvhPrevu = $this->getServiceTypeVolumeHoraire()->getPrevu();
$evhValide = $this->getServiceEtatVolumeHoraire()->getValide();
@@ -1278,10 +1278,10 @@ class ServiceService extends AbstractEntityService
/**
* Retourne le total HETD des enseignements (réalisés et validés) d'un intervenant.
*
- * @prama IntervenantEntity $intervenant
+ * @prama Intervenant $intervenant
* @return float
*/
- public function getTotalHetdIntervenant(IntervenantEntity $intervenant)
+ public function getTotalHetdIntervenant(Intervenant $intervenant)
{
$typeVolumeHoraire = $this->getServiceTypeVolumeHoraire()->getRealise();
$etatVolumeHoraire = $this->getServiceEtatVolumeHoraire()->getValide();
@@ -1296,12 +1296,12 @@ class ServiceService extends AbstractEntityService
/**
* Contrôle du plafond des heures FC (D714-60) après saisie.
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param TypeVolumeHoraireEntity $typeVolumeHoraire
*
* @return $this
*/
- public function controlePlafondFcMaj(IntervenantEntity $intervenant, TypeVolumeHoraireEntity $typeVolumeHoraire)
+ public function controlePlafondFcMaj(Intervenant $intervenant, TypeVolumeHoraireEntity $typeVolumeHoraire)
{
$intervenantId = (int)$intervenant->getId();
$tvhId = (int)$typeVolumeHoraire->getId();
diff --git a/module/Application/src/Application/Service/StatutIntervenant.php b/module/Application/src/Application/Service/StatutIntervenantService.php
similarity index 80%
rename from module/Application/src/Application/Service/StatutIntervenant.php
rename to module/Application/src/Application/Service/StatutIntervenantService.php
index 71afd08b6f..00d9dc6317 100644
--- a/module/Application/src/Application/Service/StatutIntervenant.php
+++ b/module/Application/src/Application/Service/StatutIntervenantService.php
@@ -2,6 +2,7 @@
namespace Application\Service;
+use Application\Entity\Db\StatutIntervenant;
use Application\Service\Traits\SourceServiceAwareTrait;
use Doctrine\ORM\QueryBuilder;
@@ -10,7 +11,7 @@ use Doctrine\ORM\QueryBuilder;
*
* @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
*/
-class StatutIntervenant extends AbstractEntityService
+class StatutIntervenantService extends AbstractEntityService
{
use SourceServiceAwareTrait;
/**
@@ -21,7 +22,7 @@ class StatutIntervenant extends AbstractEntityService
*/
public function getEntityClass()
{
- return \Application\Entity\Db\StatutIntervenant::class;
+ return StatutIntervenant::class;
}
/**
@@ -38,7 +39,7 @@ class StatutIntervenant extends AbstractEntityService
*
* @param QueryBuilder|null $queryBuilder
* @param string|null $alias
- * @return \Application\Entity\Db\StatutIntervenant[]
+ * @return StatutIntervenant[]
*/
public function getList( QueryBuilder $qb=null, $alias=null )
{
@@ -50,11 +51,11 @@ class StatutIntervenant extends AbstractEntityService
/**
* Retourne une nouvelle entité, initialisée avec les bons paramètres
*
- * @return \Application\Entity\Db\StatutIntervenant
+ * @return StatutIntervenant
*/
public function newEntity()
{
- /** @var \Application\Entity\Db\StatutIntervenant $entity */
+ /** @var StatutIntervenant $entity */
$entity = parent::newEntity();
// toutes les entités créées ont OSE pour source!!
diff --git a/module/Application/src/Application/Service/StructureService.php b/module/Application/src/Application/Service/StructureService.php
index 8d6f2b60d5..32eeb4725a 100644
--- a/module/Application/src/Application/Service/StructureService.php
+++ b/module/Application/src/Application/Service/StructureService.php
@@ -2,7 +2,8 @@
namespace Application\Service;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Entity\Db\Intervenant;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\MiseEnPaiementAwareTrait;
use Application\Service\Traits\MiseEnPaiementIntervenantStructureAwareTrait;
use Application\Service\Traits\ServiceAwareTrait;
@@ -24,7 +25,7 @@ class StructureService extends AbstractEntityService
{
use Traits\AffectationServiceAwareTrait;
use ServiceAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use MiseEnPaiementAwareTrait;
use MiseEnPaiementIntervenantStructureAwareTrait;
@@ -262,9 +263,9 @@ class StructureService extends AbstractEntityService
/**
* Fetch des structures d'enseignement distinctes d'un intervenant.
*
- * @param \Application\Service\IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
*/
- public function getListStructuresEnseignIntervenant(IntervenantEntity $intervenant)
+ public function getListStructuresEnseignIntervenant(Intervenant $intervenant)
{
$serviceService = $this->getServiceService();
diff --git a/module/Application/src/Application/Service/Traits/CentreCoutEpAwareTrait.php b/module/Application/src/Application/Service/Traits/CentreCoutEpAwareTrait.php
index 94b049fa9b..9f0578f569 100644
--- a/module/Application/src/Application/Service/Traits/CentreCoutEpAwareTrait.php
+++ b/module/Application/src/Application/Service/Traits/CentreCoutEpAwareTrait.php
@@ -2,28 +2,28 @@
namespace Application\Service\Traits;
-use Application\Service\CentreCoutEp;
+use Application\Service\CentreCoutEpService;
/**
- * Description of CentreCoutEpAwareTrait
+ * Description of CentreCoutEpServiceAwareTrait
*
* @author UnicaenCode
*/
-trait CentreCoutEpAwareTrait
+trait CentreCoutEpServiceAwareTrait
{
/**
- * @var CentreCoutEp
+ * @var CentreCoutEpService
*/
private $serviceCentreCoutEp;
/**
- * @param CentreCoutEp $serviceCentreCoutEp
+ * @param CentreCoutEpService $serviceCentreCoutEp
*
* @return self
*/
- public function setServiceCentreCoutEp(CentreCoutEp $serviceCentreCoutEp)
+ public function setServiceCentreCoutEp(CentreCoutEpService $serviceCentreCoutEp)
{
$this->serviceCentreCoutEp = $serviceCentreCoutEp;
@@ -33,7 +33,7 @@ trait CentreCoutEpAwareTrait
/**
- * @return CentreCoutEp
+ * @return CentreCoutEpService
*/
public function getServiceCentreCoutEp()
{
diff --git a/module/Application/src/Application/Service/Traits/CentreCoutAwareTrait.php b/module/Application/src/Application/Service/Traits/CentreCoutServiceAwareTrait.php
similarity index 90%
rename from module/Application/src/Application/Service/Traits/CentreCoutAwareTrait.php
rename to module/Application/src/Application/Service/Traits/CentreCoutServiceAwareTrait.php
index 023010c3e5..1587993239 100644
--- a/module/Application/src/Application/Service/Traits/CentreCoutAwareTrait.php
+++ b/module/Application/src/Application/Service/Traits/CentreCoutServiceAwareTrait.php
@@ -5,11 +5,11 @@ namespace Application\Service\Traits;
use Application\Service\CentreCout;
/**
- * Description of CentreCoutAwareTrait
+ * Description of CentreCoutServiceAwareTrait
*
* @author UnicaenCode
*/
-trait CentreCoutAwareTrait
+trait CentreCoutServiceAwareTrait
{
/**
* @var CentreCout
diff --git a/module/Application/src/Application/Service/Traits/IntervenantAwareTrait.php b/module/Application/src/Application/Service/Traits/IntervenantServiceAwareTrait.php
similarity index 62%
rename from module/Application/src/Application/Service/Traits/IntervenantAwareTrait.php
rename to module/Application/src/Application/Service/Traits/IntervenantServiceAwareTrait.php
index 5a3196b17e..751eeca37b 100644
--- a/module/Application/src/Application/Service/Traits/IntervenantAwareTrait.php
+++ b/module/Application/src/Application/Service/Traits/IntervenantServiceAwareTrait.php
@@ -2,28 +2,28 @@
namespace Application\Service\Traits;
-use Application\Service\Intervenant;
+use Application\Service\IntervenantService;
/**
- * Description of IntervenantAwareTrait
+ * Description of IntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
-trait IntervenantAwareTrait
+trait IntervenantServiceAwareTrait
{
/**
- * @var Intervenant
+ * @var IntervenantService
*/
private $serviceIntervenant;
/**
- * @param Intervenant $serviceIntervenant
+ * @param IntervenantService $serviceIntervenant
*
* @return self
*/
- public function setServiceIntervenant(Intervenant $serviceIntervenant)
+ public function setServiceIntervenant(IntervenantService $serviceIntervenant)
{
$this->serviceIntervenant = $serviceIntervenant;
@@ -33,7 +33,7 @@ trait IntervenantAwareTrait
/**
- * @return Intervenant
+ * @return IntervenantService
*/
public function getServiceIntervenant()
{
diff --git a/module/Application/src/Application/Service/Traits/StatutIntervenantAwareTrait.php b/module/Application/src/Application/Service/Traits/StatutIntervenantServiceAwareTrait.php
similarity index 67%
rename from module/Application/src/Application/Service/Traits/StatutIntervenantAwareTrait.php
rename to module/Application/src/Application/Service/Traits/StatutIntervenantServiceAwareTrait.php
index 69dc00205a..f968f03058 100644
--- a/module/Application/src/Application/Service/Traits/StatutIntervenantAwareTrait.php
+++ b/module/Application/src/Application/Service/Traits/StatutIntervenantServiceAwareTrait.php
@@ -2,28 +2,28 @@
namespace Application\Service\Traits;
-use Application\Service\StatutIntervenant;
+use Application\Service\StatutIntervenantService;
/**
- * Description of StatutIntervenantAwareTrait
+ * Description of StatutIntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
-trait StatutIntervenantAwareTrait
+trait StatutIntervenantServiceAwareTrait
{
/**
- * @var StatutIntervenant
+ * @var StatutIntervenantService
*/
private $serviceStatutIntervenant;
/**
- * @param StatutIntervenant $serviceStatutIntervenant
+ * @param StatutIntervenantService $serviceStatutIntervenant
*
* @return self
*/
- public function setServiceStatutIntervenant(StatutIntervenant $serviceStatutIntervenant)
+ public function setServiceStatutIntervenant(StatutIntervenantService $serviceStatutIntervenant)
{
$this->serviceStatutIntervenant = $serviceStatutIntervenant;
@@ -33,7 +33,7 @@ trait StatutIntervenantAwareTrait
/**
- * @return StatutIntervenant
+ * @return StatutIntervenantService
*/
public function getServiceStatutIntervenant()
{
diff --git a/module/Application/src/Application/Service/Traits/TypeIntervenantAwareTrait.php b/module/Application/src/Application/Service/Traits/TypeIntervenantServiceAwareTrait.php
similarity index 61%
rename from module/Application/src/Application/Service/Traits/TypeIntervenantAwareTrait.php
rename to module/Application/src/Application/Service/Traits/TypeIntervenantServiceAwareTrait.php
index 59583e15fe..304c9c960a 100644
--- a/module/Application/src/Application/Service/Traits/TypeIntervenantAwareTrait.php
+++ b/module/Application/src/Application/Service/Traits/TypeIntervenantServiceAwareTrait.php
@@ -2,28 +2,28 @@
namespace Application\Service\Traits;
-use Application\Service\TypeIntervenant;
+use Application\Service\TypeIntervenantService;
/**
- * Description of TypeIntervenantAwareTrait
+ * Description of TypeIntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
-trait TypeIntervenantAwareTrait
+trait TypeIntervenantServiceAwareTrait
{
/**
- * @var TypeIntervenant
+ * @var TypeIntervenantService
*/
private $serviceTypeIntervenant;
/**
- * @param TypeIntervenant $serviceTypeIntervenant
+ * @param TypeIntervenantService $serviceTypeIntervenant
*
* @return self
*/
- public function setServiceTypeIntervenant(TypeIntervenant $serviceTypeIntervenant)
+ public function setServiceTypeIntervenant(TypeIntervenantService $serviceTypeIntervenant)
{
$this->serviceTypeIntervenant = $serviceTypeIntervenant;
@@ -33,7 +33,7 @@ trait TypeIntervenantAwareTrait
/**
- * @return TypeIntervenant
+ * @return TypeIntervenantService
*/
public function getServiceTypeIntervenant()
{
diff --git a/module/Application/src/Application/Service/TypeIntervenant.php b/module/Application/src/Application/Service/TypeIntervenantService.php
similarity index 73%
rename from module/Application/src/Application/Service/TypeIntervenant.php
rename to module/Application/src/Application/Service/TypeIntervenantService.php
index ba69b3e1ee..9ae2573e2e 100644
--- a/module/Application/src/Application/Service/TypeIntervenant.php
+++ b/module/Application/src/Application/Service/TypeIntervenantService.php
@@ -2,14 +2,14 @@
namespace Application\Service;
-use Application\Entity\Db\TypeIntervenant as TypeIntervenantEntity;
+use Application\Entity\Db\TypeIntervenant;
/**
- * Description of TypeIntervenant
+ * Description of TypeIntervenantService
*
* @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
*/
-class TypeIntervenant extends AbstractEntityService
+class TypeIntervenantService extends AbstractEntityService
{
/**
@@ -20,27 +20,27 @@ class TypeIntervenant extends AbstractEntityService
*/
public function getEntityClass()
{
- return TypeIntervenantEntity::class;
+ return TypeIntervenant::class;
}
/**
* Retourne le type d'intervenant Permanent
*
- * @return TypeIntervenantEntity
+ * @return TypeIntervenant
*/
public function getPermanent()
{
- return $this->getRepo()->findOneBy(['code' => TypeIntervenantEntity::CODE_PERMANENT]);
+ return $this->getRepo()->findOneBy(['code' => TypeIntervenant::CODE_PERMANENT]);
}
/**
* Retourne le type d'intervenant Extérieur
*
- * @return TypeIntervenantEntity
+ * @return TypeIntervenant
*/
public function getExterieur()
{
- return $this->getRepo()->findOneBy(['code' => TypeIntervenantEntity::CODE_EXTERIEUR]);
+ return $this->getRepo()->findOneBy(['code' => TypeIntervenant::CODE_EXTERIEUR]);
}
/**
@@ -55,7 +55,7 @@ class TypeIntervenant extends AbstractEntityService
/**
*
* @param string $code
- * @return TypeIntervenantEntity
+ * @return TypeIntervenant
*/
public function getByCode( $code )
{
diff --git a/module/Application/src/Application/Service/Validation.php b/module/Application/src/Application/Service/Validation.php
index 04b59b2cdb..68b6a1b0d8 100644
--- a/module/Application/src/Application/Service/Validation.php
+++ b/module/Application/src/Application/Service/Validation.php
@@ -4,7 +4,7 @@ namespace Application\Service;
use Application\Entity\Db\Contrat as ContratEntity;
use Application\Entity\Db\Dossier as DossierEntity;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\MiseEnPaiement as MiseEnPaiementEntity;
use Application\Entity\Db\Structure;
use Application\Entity\Db\TypeValidation as TypeValidationEntity;
@@ -72,12 +72,12 @@ class Validation extends AbstractEntityService
/**
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param TypeVolumeHoraireEntity|null $tvh
*
* @return ValidationEntity|null
*/
- public function getValidationClotureServices(IntervenantEntity $intervenant)
+ public function getValidationClotureServices(Intervenant $intervenant)
{
$tv = $this->getServiceTypeValidation()->getByCode(TypeValidationEntity::CODE_CLOTURE_REALISE);
@@ -190,12 +190,12 @@ class Validation extends AbstractEntityService
/**
* @param TypeValidationEntity $typeValidation
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param Structure|null $structure
*
* @return array
*/
- public function lister(TypeValidationEntity $typeValidation, IntervenantEntity $intervenant, Structure $structure = null)
+ public function lister(TypeValidationEntity $typeValidation, Intervenant $intervenant, Structure $structure = null)
{
$dql = "
SELECT
diff --git a/module/Application/src/Application/Service/VolumeHoraire.php b/module/Application/src/Application/Service/VolumeHoraire.php
index 59dcff35a5..979d519adb 100644
--- a/module/Application/src/Application/Service/VolumeHoraire.php
+++ b/module/Application/src/Application/Service/VolumeHoraire.php
@@ -7,7 +7,7 @@ use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
use Application\Service\Traits\ServiceServiceAwareTrait;
use Application\Service\Traits\TypeVolumeHoraireAwareTrait;
use Doctrine\ORM\QueryBuilder;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\EtatVolumeHoraire as EtatVolumeHoraireEntity;
use Application\Entity\Db\VolumeHoraire as VolumeHoraireEntity;
@@ -111,12 +111,12 @@ class VolumeHoraire extends AbstractEntityService
/**
* Recherche par intervenant concerné.
*
- * @param IntervenantEntity $intervenant
+ * @param Intervenant $intervenant
* @param QueryBuilder|null $qb
*
* @return QueryBuilder
*/
- public function finderByIntervenant(IntervenantEntity $intervenant, QueryBuilder $qb = null, $alias = null)
+ public function finderByIntervenant(Intervenant $intervenant, QueryBuilder $qb = null, $alias = null)
{
list($qb, $alias) = $this->initQuery($qb, $alias);
diff --git a/module/Application/src/Application/Service/WorkflowService.php b/module/Application/src/Application/Service/WorkflowService.php
index da26929fb7..6fe58282f3 100755
--- a/module/Application/src/Application/Service/WorkflowService.php
+++ b/module/Application/src/Application/Service/WorkflowService.php
@@ -2,7 +2,7 @@
namespace Application\Service;
-use Application\Entity\Db\Intervenant as IntervenantEntity;
+use Application\Entity\Db\Intervenant;
use Application\Entity\Db\Structure;
use Application\Entity\Db\TblWorkflow;
use Application\Entity\Db\TypeVolumeHoraire as TypeVolumeHoraireEntity;
@@ -30,7 +30,7 @@ class WorkflowService extends AbstractService
- protected function prepareEtapeParams($etape, IntervenantEntity $intervenant = null, Structure $structure = null)
+ protected function prepareEtapeParams($etape, Intervenant $intervenant = null, Structure $structure = null)
{
switch (true) {
case $etape === WfEtape::CURRENT || empty($etape):
@@ -76,12 +76,12 @@ class WorkflowService extends AbstractService
/**
* @param WfEtape|WorkflowEtape|TblWorkflow|string $etape
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape
*/
- public function getEtape($etape, IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getEtape($etape, Intervenant $intervenant = null, Structure $structure = null)
{
list($etapeCode, $intervenant, $structure) = $this->prepareEtapeParams($etape, $intervenant, $structure);
@@ -101,12 +101,12 @@ class WorkflowService extends AbstractService
/**
* @param WfEtape|WorkflowEtape|TblWorkflow|string $etape
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape
*/
- public function getNextEtape($etape, IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getNextEtape($etape, Intervenant $intervenant = null, Structure $structure = null)
{
list($etapeCode, $intervenant, $structure) = $this->prepareEtapeParams($etape, $intervenant, $structure);
@@ -128,12 +128,12 @@ class WorkflowService extends AbstractService
/**
* @param WfEtape|WorkflowEtape|TblWorkflow|string $etape
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape
*/
- public function getPreviousAccessibleEtape($etape, IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getPreviousAccessibleEtape($etape, Intervenant $intervenant = null, Structure $structure = null)
{
list($etapeCode, $intervenant, $structure) = $this->prepareEtapeParams($etape, $intervenant, $structure);
@@ -155,12 +155,12 @@ class WorkflowService extends AbstractService
/**
* @param WfEtape|WorkflowEtape|TblWorkflow|string $etape
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape
*/
- public function getNextAccessibleEtape($etape, IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getNextAccessibleEtape($etape, Intervenant $intervenant = null, Structure $structure = null)
{
list($etapeCode, $intervenant, $structure) = $this->prepareEtapeParams($etape, $intervenant, $structure);
@@ -197,12 +197,12 @@ class WorkflowService extends AbstractService
/**
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape|null
*/
- public function getEtapeCourante(IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getEtapeCourante(Intervenant $intervenant = null, Structure $structure = null)
{
$fdr = $this->getFeuilleDeRoute($intervenant, $structure);
@@ -217,12 +217,12 @@ class WorkflowService extends AbstractService
/**
*
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
* @param Structure|null $structure
*
* @return WorkflowEtape[]
*/
- public function getFeuilleDeRoute(IntervenantEntity $intervenant = null, Structure $structure = null)
+ public function getFeuilleDeRoute(Intervenant $intervenant = null, Structure $structure = null)
{
if (!$intervenant || !$structure) {
/* Filtrage en fonction du contexte */
@@ -285,7 +285,7 @@ class WorkflowService extends AbstractService
/**
* @param array $tableauxBords
- * @param IntervenantEntity|IntervenantEntity[]|string $intervenant
+ * @param Intervenant|Intervenant[]|string $intervenant
*/
public function calculerTableauxBord($tableauxBords = [], $intervenant)
{
@@ -396,11 +396,11 @@ class WorkflowService extends AbstractService
/**
- * @param IntervenantEntity|null $intervenant
+ * @param Intervenant|null $intervenant
*
* @return TblWorkflow[]
*/
- protected function getEtapes(IntervenantEntity $intervenant, Structure $structure = null)
+ protected function getEtapes(Intervenant $intervenant, Structure $structure = null)
{
$dql = "
diff --git a/module/Application/src/Application/View/Helper/Service/Liste.php b/module/Application/src/Application/View/Helper/Service/Liste.php
index 541807fb00..4c4a9e7ec6 100644
--- a/module/Application/src/Application/View/Helper/Service/Liste.php
+++ b/module/Application/src/Application/View/Helper/Service/Liste.php
@@ -6,7 +6,7 @@ use Application\Entity\Db\Intervenant;
use Application\Processus\Traits\IntervenantProcessusAwareTrait;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\EtatVolumeHoraireAwareTrait;
-use Application\Service\Traits\IntervenantAwareTrait;
+use Application\Service\Traits\IntervenantServiceAwareTrait;
use Application\Service\Traits\ServiceAwareTrait;
use Application\Service\Traits\TypeInterventionAwareTrait;
use Application\View\Helper\AbstractViewHelper;
@@ -28,7 +28,7 @@ class Liste extends AbstractViewHelper
use TypeInterventionAwareTrait;
use ServiceTypeVolumeHoraireAwareTrait;
use EtatVolumeHoraireAwareTrait;
- use IntervenantAwareTrait;
+ use IntervenantServiceAwareTrait;
use IntervenantProcessusAwareTrait;
/**
diff --git a/module/Application/src/Application/View/Helper/Service/Resume.php b/module/Application/src/Application/View/Helper/Service/Resume.php
index ea18288f59..c2da4c8e8d 100644
--- a/module/Application/src/Application/View/Helper/Service/Resume.php
+++ b/module/Application/src/Application/View/Helper/Service/Resume.php
@@ -2,7 +2,7 @@
namespace Application\View\Helper\Service;
-use Application\Service\Traits\TypeIntervenantAwareTrait;
+use Application\Service\Traits\TypeIntervenantServiceAwareTrait;
use Application\View\Helper\AbstractViewHelper;
/**
@@ -12,7 +12,7 @@ use Application\View\Helper\AbstractViewHelper;
*/
class Resume extends AbstractViewHelper
{
- use TypeIntervenantAwareTrait;
+ use TypeIntervenantServiceAwareTrait;
/**
* Filtre de données
diff --git a/tests/OSETest/Entity/Db/EntityProvider.php b/tests/OSETest/Entity/Db/EntityProvider.php
index 16bcfbefd6..d83f9bcbeb 100644
--- a/tests/OSETest/Entity/Db/EntityProvider.php
+++ b/tests/OSETest/Entity/Db/EntityProvider.php
@@ -396,26 +396,6 @@ class EntityProvider
return $structureEns;
}
- /**
- * Recherche et retourne le TypeIntervenant permanent ou extérieur.
- *
- * @param boolean $permanent
- * @return TypeIntervenant
- */
- public function getTypeIntervenant($permanent = true)
- {
- $code = $permanent ? TypeIntervenant::CODE_PERMANENT : TypeIntervenant::CODE_EXTERIEUR;
-
- if (null === $this->typesIntervenant[$code]) {
- $type = $this->getEntityManager()->getRepository('Application\Entity\Db\TypeIntervenant')->findOneByCode($code);
- if (!$type) {
- throw new RuntimeException(sprintf("Type d'intervenant '%s' introuvable.", $code));
- }
- $this->typesIntervenant[$code] = $type;
- }
-
- return $this->typesIntervenant[$code];
- }
/**
* Retourne à chaque appel une nouvelle instance de StatutIntervenant persistée.
--
GitLab