From 0ba36598fa1c3d648024640988eb9c637726768f Mon Sep 17 00:00:00 2001
From: Arnaud Fornerot <afornerot@cadoles.com>
Date: Tue, 23 Nov 2021 14:55:23 +0100
Subject: [PATCH] =?UTF-8?q?ajout=20du=20l'activit=C3=A9=20et=20du=20domain?=
 =?UTF-8?q?e=20dans=20l'export=20(fixes=20#77)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schedule-2.0/src/Controller/ExportController.php          | 2 ++
 .../templates/Export/export_project_weekly.csv.twig           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/ExportController.php b/src/schedule-2.0/src/Controller/ExportController.php
index 58d6e54..1072105 100644
--- a/src/schedule-2.0/src/Controller/ExportController.php
+++ b/src/schedule-2.0/src/Controller/ExportController.php
@@ -262,6 +262,8 @@ class ExportController extends AbstractController
             $tbproject["projectname"] = $project->getDisplayname();
             $tbproject["name"] = $project->getname();
             $tbproject["customer"] = $project->getCustomer()->getName();
+            $tbproject["service"] = $project->getService()->getName();
+            $tbproject["domaine"] = $project->getDomaine()->getName();
             // Somme event validé par semaine
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
diff --git a/src/schedule-2.0/templates/Export/export_project_weekly.csv.twig b/src/schedule-2.0/templates/Export/export_project_weekly.csv.twig
index 75ddc1b..b91f02f 100644
--- a/src/schedule-2.0/templates/Export/export_project_weekly.csv.twig
+++ b/src/schedule-2.0/templates/Export/export_project_weekly.csv.twig
@@ -1,12 +1,12 @@
 {% block body %}
-Client;Projet;Tâche;Nature;Utilisateur;Année;Semaine;Cumul;
+Client;Projet;Tâche;Activité;Domaine;Nature;Utilisateur;Année;Semaine;Cumul;
 {% for project in projects %}
 {% if project.weeks_by_task_by_user is defined %}
 {% for year,weeks in project.weeks_by_task_by_user %}
 {% for week in weeks %}
 {% for task in week.tasks%}
 {% for user in task.users%}
-{{project.customer}};{{project.name}};{{task.taskname|replace({"&": "et"})}};{{task.nature}};{{user.displayname}};{{week.isoyear}};{{week.isoweek}};{{user.cumul|replace({".": ","})}};
+{{project.customer}};{{project.name}};{{task.taskname|replace({"&": "et"})}};{{project.service}};{{project.domaine}};{{task.nature}};{{user.displayname}};{{week.isoyear}};{{week.isoweek}};{{user.cumul|replace({".": ","})}};
 {% endfor %}
 {% endfor %}
 {% endfor %}