From 0197fc119c8c5fa6b1255d411c3c67d3d0c9e27a Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 28 Jul 2020 10:44:00 +0200
Subject: [PATCH] update report csv format

---
 src/schedule-2.0/src/Controller/ReportController.php | 2 ++
 src/schedule-2.0/templates/Report/export.csv.twig    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php
index 735d4f4..7dcc188 100755
--- a/src/schedule-2.0/src/Controller/ReportController.php
+++ b/src/schedule-2.0/src/Controller/ReportController.php
@@ -1126,6 +1126,8 @@ class ReportController extends AbstractController
 
             $tbproject= [];
             $tbproject["projectname"] = $project->getDisplayname();
+            $tbproject["name"] = $project->getname();
+            $tbproject["customer"] = $project->getCustomer()->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/Report/export.csv.twig b/src/schedule-2.0/templates/Report/export.csv.twig
index 6e75a0d..5ccce07 100644
--- a/src/schedule-2.0/templates/Report/export.csv.twig
+++ b/src/schedule-2.0/templates/Report/export.csv.twig
@@ -1,11 +1,11 @@
 {% block body %}
-Projet;Tâche;Utilisateur;Année;Semaine;Cumul;
+Client;Projet;Tâche;Utilisateur;Année;Semaine;Cumul;
 {% for project in projects %}
 {% 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.projectname}};{{task.taskname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
+{{project.customer}};{{project.name}};{{task.taskname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
 {% endfor %}
 {% endfor %}
 {% endfor %}