From 7c113e3478e038b639f38edf46acb8b02c882109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 18 Oct 2018 20:05:02 +0200
Subject: [PATCH] add assignee in task list + fix some translation

---
 CHANGELOG.md                               | 2 ++
 Resources/translations/messages.fr.yml     | 2 +-
 Resources/views/SingleTask/_list.html.twig | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc10c555c..77986b1fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,6 @@ Branch master
 =============
 
 - fix bug in filter task form: allow to show the list of users, which was hidden when the user had access to multiple centers;
+- add assignee in task list;
+- fix some translation; 
 
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index bea9f527e..04d7d2dbe 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -59,7 +59,7 @@ Any user: Tous les utilisateurs
 Unassigned: Non assigné
 Associated person: Personne associée
 Default task: Tâche par défaut
-
+Not assigned: Aucun utilisateur assigné
 
 # transitions - default task definition
 'new': 'nouvelle'
diff --git a/Resources/views/SingleTask/_list.html.twig b/Resources/views/SingleTask/_list.html.twig
index 0f465e17b..341fbcc8a 100644
--- a/Resources/views/SingleTask/_list.html.twig
+++ b/Resources/views/SingleTask/_list.html.twig
@@ -26,6 +26,14 @@
                                 {% for place in workflow_marked_places(task) %}
                                     <span class="">{{ place|trans }}</span>
                                 {% endfor %}
+                                
+                                {% if task.assignee is not null %}
+                                <dl>
+                                    <dt>{{ 'Assignee'|trans }}</dt>
+                                    <dd>{{ task.assignee.username }}</dd>
+                                </dl>
+                                {% endif %}
+                                    
                             </td>
                             <td>
                                 {% if task.startDate is null and task.warningDate is null and task.endDate is null %}