Skip to content
Snippets Groups Projects
Commit 0c8831be authored by lecluse's avatar lecluse
Browse files

Poursuite Refactoring nommage des services

parent cf2345a9
Branches
Tags
No related merge requests found
Showing
with 125 additions and 196 deletions
......@@ -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
This diff is collapsed.
......@@ -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,
],
......
......@@ -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,
],
],
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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()
......
......@@ -5,7 +5,7 @@ namespace Application\Entity\Db\Traits;
use Application\Entity\Db\Intervenant;
/**
* Description of IntervenantAwareTrait
* Description of IntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
......
......@@ -5,7 +5,7 @@ namespace Application\Entity\Db\Traits;
use Application\Entity\Db\TypeIntervenant;
/**
* Description of TypeIntervenantAwareTrait
* Description of TypeIntervenantServiceAwareTrait
*
* @author UnicaenCode
*/
......
......@@ -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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment