From 12983bbfb3ab6a1d8d69f02a1020f49f44f8e94f Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Thu, 30 Sep 2021 15:53:51 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20structure=20hi=C3=A9rarchique?=
=?UTF-8?q?=20de=20l'intervenant=20dans=20l'export=20des=20agr=C3=A9ments.?=
=?UTF-8?q?=20(cf=20#40053)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/ddl/view/V_AGREMENT_EXPORT_CSV.sql | 3 +++
.../Application/src/Application/Service/AgrementService.php | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql b/data/ddl/view/V_AGREMENT_EXPORT_CSV.sql
index 6b99983c6c..a79c2ba49f 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 874cf2f800..bba30d766a 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'],
--
GitLab