Commit 12983bbf authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Ajout de la structure hiérarchique de l'intervenant dans l'export des agréments. (cf #40053)

parent 77710355

data/ddl/view/V_AGREMENT_EXPORT_CSV.sql

+3 −0
Changes for data/ddl/view/V_AGREMENT_EXPORT_CSV.sql: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ WITH heures_s AS ( 
SELECT

  a.id                                                                        annee_id,

  i.id                                                                        intervenant_id,

  s2.id                                                                       intervenant_structure_id,

  s2.libelle_court															  intervenant_structure_libelle,

  s.id                                                                        structure_id,



  a.libelle                                                                   annee,
@@ -72,6 +74,7 @@ FROM 




  LEFT JOIN structure                 s ON s.id = ta.structure_id

  LEFT JOIN structure                 s2 ON s2.id = i.structure_id

  LEFT JOIN agrement                agr ON agr.id = ta.agrement_id

  LEFT JOIN utilisateur               u ON u.id = agr.histo_modificateur_id

  LEFT JOIN discipline                d ON d.id = i.discipline_id

module/Application/src/Application/Service/AgrementService.php

+3 −1
Changes for module/Application/src/Application/Service/AgrementService.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -94,8 +94,9 @@ class AgrementService extends AbstractEntityService 
        $res  = [

            'head' => [

                'annee'                        => 'Année',

                'structure-libelle'            => 'Structure d\'affectation',

                'intervenant-code'             => 'Code intervenant',

                'intervenant-structure'        => 'Structure hiérarchique',

                'structure-libelle'            => 'Structure d\'affectation',

                'intervenant-nom-usuel'        => 'Nom usuel',

                'intervenant-nom-patronymique' => 'Nom patronymique',

                'intervenant-prenom'           => 'Prénom',
@@ -118,6 +119,7 @@ class AgrementService extends AbstractEntityService 
                'annee'                        => $d['ANNEE'],

                'structure-libelle'            => $d['STRUCTURE_LIBELLE'],

                'intervenant-code'             => $d['INTERVENANT_CODE'],

                'intervenant-structure'        => $d['INTERVENANT_STRUCTURE_LIBELLE'],

                'intervenant-nom-usuel'        => $d['INTERVENANT_NOM_USUEL'],

                'intervenant-nom-patronymique' => $d['INTERVENANT_NOM_PATRONYMIQUE'],

                'intervenant-prenom'           => $d['INTERVENANT_PRENOM'],