Commit 2493a3c4 authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Icone 

# Conflicts:
#	module/Intervenant/view/intervenant/statut/index.phtml
parents 6c023744 4eb81d02

module/Application/autoload_classmap.php

+0 −2
Changes for module/Application/autoload_classmap.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ return [ 
    'Application\Entity\Db\TypeContrat'                                                 => __DIR__ . '/src/Entity/Db/TypeContrat.php',

    'Application\Entity\Db\TypeFormation'                                               => __DIR__ . '/src/Entity/Db/TypeFormation.php',

    'Application\Entity\Db\TypeHeures'                                                  => __DIR__ . '/src/Entity/Db/TypeHeures.php',

    'Application\Entity\Db\TypeIntervenant'                                             => __DIR__ . '/src/Entity/Db/TypeIntervenant.php',

    'Application\Entity\Db\TypeIntervention'                                            => __DIR__ . '/src/Entity/Db/TypeIntervention.php',

    'Application\Entity\Db\TypeInterventionStatut'                                      => __DIR__ . '/src/Entity/Db/TypeInterventionStatut.php',

    'Application\Entity\Db\TypeInterventionStructure'                                   => __DIR__ . '/src/Entity/Db/TypeInterventionStructure.php',
@@ -448,7 +447,6 @@ return [ 
    'Application\Service\TypeContratService'                                            => __DIR__ . '/src/Service/TypeContratService.php',

    'Application\Service\TypeFormationService'                                          => __DIR__ . '/src/Service/TypeFormationService.php',

    'Application\Service\TypeHeuresService'                                             => __DIR__ . '/src/Service/TypeHeuresService.php',

    'Application\Service\TypeIntervenantService'                                        => __DIR__ . '/src/Service/TypeIntervenantService.php',

    'Application\Service\TypeInterventionService'                                       => __DIR__ . '/src/Service/TypeInterventionService.php',

    'Application\Service\TypeInterventionStatutService'                                 => __DIR__ . '/src/Service/TypeInterventionStatutService.php',

    'Application\Service\TypeInterventionStructureService'                              => __DIR__ . '/src/Service/TypeInterventionStructureService.php',

module/Application/config/intervenant.config.php

+0 −2
Changes for module/Application/config/intervenant.config.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -602,8 +602,6 @@ return [ 
            Service\MotifModificationServiceDuService::class => Service\MotifModificationServiceDuService::class,

            Service\CiviliteService::class                   => Service\CiviliteService::class,

            Service\GradeService::class                      => Service\GradeService::class,

            Service\StatutService::class                     => Service\StatutService::class,

            Service\TypeIntervenantService::class            => Service\TypeIntervenantService::class,

        ],

    ],

    'view_helpers'    => [

module/Application/src/Controller/FormuleController.php

+1 −1
Changes for module/Application/src/Controller/FormuleController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Application\Entity\Db\Annee; 
use Application\Entity\Db\EtatVolumeHoraire;

use Application\Entity\Db\Formule;

use Application\Entity\Db\FormuleTestIntervenant;

use Application\Entity\Db\TypeIntervenant;

use Intervenant\Entity\Db\TypeIntervenant;

use Application\Entity\Db\TypeVolumeHoraire;

use Application\Service\Traits\ContextServiceAwareTrait;

use Application\Service\Traits\FormuleTestIntervenantServiceAwareTrait;

module/Application/src/Controller/PaiementController.php

+1 −1
Changes for module/Application/src/Controller/PaiementController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ use Application\Service\Traits\MiseEnPaiementServiceAwareTrait; 
use Application\Service\Traits\PeriodeServiceAwareTrait;

use Application\Service\Traits\ServiceAPayerServiceAwareTrait;

use Application\Service\Traits\StructureServiceAwareTrait;

use Application\Service\Traits\TypeIntervenantServiceAwareTrait;

use Intervenant\Service\TypeIntervenantServiceAwareTrait;

use Application\Service\Traits\TypeRessourceServiceAwareTrait;

use Application\Service\Traits\UtilisateurServiceAwareTrait;

use Application\Service\Traits\WorkflowServiceAwareTrait;

module/Application/src/Controller/ParametreController.php

+1 −1
Changes for module/Application/src/Controller/ParametreController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ use Application\Service\Traits\AnneeServiceAwareTrait; 
use Application\Service\Traits\CampagneSaisieServiceAwareTrait;

use Application\Service\Traits\EtablissementServiceAwareTrait;

use Application\Service\Traits\ParametresServiceAwareTrait;

use Application\Service\Traits\TypeIntervenantServiceAwareTrait;

use Intervenant\Service\TypeIntervenantServiceAwareTrait;

use Application\Service\Traits\TypeVolumeHoraireServiceAwareTrait;

use Laminas\View\Model\JsonModel;