From 8764aacd92b42e068c11bbdfda1e3bdf7e3c77db Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 1 Mar 2022 15:03:21 +0100
Subject: [PATCH 1/4] fix confusion between document dates

---
 .../Resources/views/List/list_item.html.twig                  | 4 ++--
 .../Resources/views/Macro/updatedBy.html.twig                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 44bcf5cbc..847ddd388 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -24,8 +24,8 @@
         <div class="item-col">
             <div class="container">
                 {% if document.date is not null %}
-                    <div class="dates row" style="float: right;">
-                        <span>{{ document.createdAt|format_date('short') }}</span>
+                    <div class="dates row text-end">
+                        <span>{{ document.date|format_date('short') }}</span>
                     </div>
                 {% endif %}
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
index cbfd7660b..3df3f9afb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
@@ -8,7 +8,7 @@
         {% endif %}
         {% if entity.updatedBy != null %}
             {% if entity.updatedAt != null %}
-                {{ ', ' ~ 'by_user'|trans }}
+                {{ ', ' }}<br>{{ 'by_user'|trans }}
             {% else %}
                 {{ 'Last updated by'|trans }}
             {% endif %}
@@ -29,7 +29,7 @@
         {% endif %}
         {% if entity.createdBy != null %}
             {% if entity.createdAt != null %}
-                {{ ', ' ~ 'by_user'|trans }}
+                {{ ', ' }}<br>{{ 'by_user'|trans }}
             {% else %}
                 {{ 'Created by'|trans }}
             {% endif %}

From 4543c411e76532dc904a5eec5fc1c0050b41b66f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Mar 2022 15:24:44 +0100
Subject: [PATCH 2/4] quick fix: remove duplicate email info in
 PersonRenderBox.vue

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index d87e0f50c..f77f006db 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -113,15 +113,6 @@
                             <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
                         </li>
 
-                        <li v-if="person.email">
-                            <i class="fa fa-li fa-envelope-o"></i>
-                            <a :href="'mailto: ' + person.email">{{ person.email }}</a>
-                        </li>
-                        <li v-else-if="options.addNoData">
-                            <i class="fa fa-li fa-envelope-o"></i>
-                            <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
-                        </li>
-
                         <li v-if="person.centers !== undefined && person.centers.length > 0 && options.addCenter">
                             <i class="fa fa-li fa-long-arrow-right"></i>
                             <template v-for="c in person.centers">{{ c.name }}</template>

From f5accb827c463b3757faee0fbfbd80d37a44d679 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 1 Mar 2022 15:27:18 +0100
Subject: [PATCH 3/4] fix inline address -> reopen issue462

---
 .../ChillMainBundle/Resources/public/chill/scss/render_box.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index c42c592a9..37d4f97c4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -72,7 +72,7 @@ section.chill-entity {
                 }
             }
             p {
-                // display: inline-block;
+                display: inline-block;
                 margin: 0 0 0 1.5em;
                 text-indent: -1.5em;
 

From 2b108d0d700def2d98c4d50628fbee03d50ad7e1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 1 Mar 2022 15:32:47 +0100
Subject: [PATCH 4/4] update changelog

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b38afb37..000536651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,10 +47,9 @@ and this project adheres to
 * [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
 * [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
 
+
 ## Test releases
 * Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
-* [renderbox]: Fix display of address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/462)
-* [renderbox]: Add email in personRenderBox, this was not yet displayed.
 
 ### test release 2022-02-14