From ac5fc59c21d1cf82e8fa4577424006c184de3a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Mar 2020 16:39:12 +0100
Subject: [PATCH] [closing motivve] display closing motive in remark

---
 CHANGELOG.md                                      | 5 +++++
 Resources/views/AccompanyingPeriod/list.html.twig | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73e743c02..a9753f86d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,3 +79,8 @@ Version 1.5.9
 - [UI] set action button bottom of edit form according to crud template
 - [closing motive] add an hierarchy for closing motives ;
 - [closing motive] Add an admin section for closing motives ;
+
+Version 1.5.10
+==============
+
+- [closing motive] display closing motive in remark
diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig
index b3c5a9b0c..135810e4b 100644
--- a/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/Resources/views/AccompanyingPeriod/list.html.twig
@@ -28,7 +28,6 @@
                         '%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'),
                         '%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')} 
                     ) }}
-                    <div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
                 {% endif %}
             </td>
             {% if chill_accompanying_periods.fields.user == 'visible'  %}
@@ -41,6 +40,10 @@
             </td>
             {% endif %}
             <td>
+                {% if accompanying_period.isOpen == false %}
+                    <div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
+                    <br/>
+                {% endif %}
                 {{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}
             </td>
             <td>