diff --git a/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql b/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql index 6b99983c6cb5aea410bbe68fb87f8d01160102a3..a79c2ba49f20f8755dfce575fde4b92195feb8ec 100644 --- a/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql +++ b/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql @@ -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 diff --git a/module/Application/src/Application/Service/AgrementService.php b/module/Application/src/Application/Service/AgrementService.php index 874cf2f800ca83546d4ead861cb67bad5764489e..bba30d766ae01764e958e32c3d60e527914015f0 100755 --- a/module/Application/src/Application/Service/AgrementService.php +++ b/module/Application/src/Application/Service/AgrementService.php @@ -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'],