From 66fa43497ee8073109b7dc5815ac272913f1a7e9 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 22 Sep 2020 10:49:43 +0200
Subject: [PATCH] Add atsk nature on export

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

diff --git a/src/schedule-2.0/.gitignore b/src/schedule-2.0/.gitignore
index 4a6cd2b..19b388e 100644
--- a/src/schedule-2.0/.gitignore
+++ b/src/schedule-2.0/.gitignore
@@ -20,3 +20,4 @@
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+*~
\ No newline at end of file
diff --git a/src/schedule-2.0/src/Controller/ExportController.php b/src/schedule-2.0/src/Controller/ExportController.php
index 081921e..46f2fd7 100644
--- a/src/schedule-2.0/src/Controller/ExportController.php
+++ b/src/schedule-2.0/src/Controller/ExportController.php
@@ -327,6 +327,7 @@ class ExportController extends AbstractController
                 if(!isset($tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()])){
                     $tbproject["weeks_by_task_by_user"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["tasks"][$event->getTask()->getId()] = [
                         "taskname" => $event->getTask()->getName(),
+                        "nature" => $event->getTask()->getNature()->getName(),
                         "users" => [],
                     ];
                 }
@@ -405,6 +406,7 @@ class ExportController extends AbstractController
                 if(!isset($tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()])){
                     $tbproject["weeks_by_task_by_user"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["tasks"][$penalty->getTask()->getId()] = [
                         "taskname" => $penalty->getTask()->getName(),
+                        "nature" => $event->getTask()->getNature()->getName(),
                         "users" => [],
                     ];
                 }
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 ff1b4b1..a0902a1 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;Utilisateur;Année;Semaine;Cumul;
+Client;Projet;Tâche;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}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
+{{project.customer}};{{project.name}};{{task.taskname|replace({"&": "et"})}};{{task.nature}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
 {% endfor %}
 {% endfor %}
 {% endfor %}