From 949366cf7b053fa02c2ad14bc90dbfb7917c4462 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 30 Jul 2021 21:44:57 +0200
Subject: [PATCH] fix test failures

---
 .../Resources/views/layout.html.twig          | 38 ++++++++-----------
 .../views/layoutWithVerticalMenu.html.twig    | 37 ++++++++----------
 .../Resources/views/Person/banner.html.twig   |  3 +-
 .../Resources/views/Person/create.html.twig   |  2 -
 .../views/Person/create_review.html.twig      |  3 --
 5 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 3cc05e434..140557d69 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -53,31 +53,23 @@
         {% block sublayout_content %}
             <div class="row justify-content-center my-5">
 
-                {# Flash messages ! #}
-                {% if app.session.flashbag.keys()|length > 0 %}
-                <div class="col-8 mb-5 flash_message">
+                {% for flashMessage in app.session.flashbag.get('success') %}
+                    <div class="col-8 mb-5 alert alert-success flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
 
+                {% for flashMessage in app.session.flashbag.get('error') %}
+                    <div class="col-8 mb-5 alert alert-danger flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
 
-                    {% for flashMessage in app.session.flashbag.get('success') %}
-                        <div class="col-8 alert alert-success flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('error') %}
-                        <div class="col-8 alert alert-danger flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('notice') %}
-                        <div class="col-8 alert alert-warning flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                </div>
-                {% endif %}
+                {% for flashMessage in app.session.flashbag.get('notice') %}
+                    <div class="col-8 mb-5 alert alert-warning flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
 
                 {% block content %}
                 <div class="col-8 main_search">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index be582ab3b..e11e5f51c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -27,30 +27,23 @@
     <div class="row">
         <div class="col-md-9 my-5">
 
-            {# Flash messages ! #}
-            {% if app.session.flashbag.keys()|length > 0 %}
-            <div class="row justify-content-center mb-5">
+            {% for flashMessage in app.session.flashbag.get('success') %}
+                <div class="col-8 mb-5 alert alert-success flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
 
-                {% for flashMessage in app.session.flashbag.get('success') %}
-                    <div class="col-8 alert alert-success flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
+            {% for flashMessage in app.session.flashbag.get('error') %}
+                <div class="col-8 mb-5 alert alert-danger flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
 
-                {% for flashMessage in app.session.flashbag.get('error') %}
-                    <div class="col-8 alert alert-danger flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
-
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <div class="col-8 alert alert-warning flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
-
-            </div>
-            {% endif %}
+            {% for flashMessage in app.session.flashbag.get('notice') %}
+                <div class="col-8 mb-5 alert alert-warning flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
 
             {% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
             {% endblock  %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index 67c8375fc..b603dd70c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -45,12 +45,13 @@
                             </span>
                         {% endif %}
 
+                        {% set address = null %}
                         {%- if person.currentHouseholdAddress is not empty -%}
                             {% set address = person.currentHouseholdAddress %}
                         {%- elseif person.lastAddress is not empty -%}
                             {% set address = person.lastAddress %}
                         {%- endif -%}
-                        {%- if address -%}
+                        {%- if address is not null -%}
                             <span class=" d-block d-sm-inline-block">
                                 {{ address|chill_entity_render_box({
                                     'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a8c2d6356..036dc5d01 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -36,8 +36,6 @@
 
         {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
-        {{ form_row(form.creation_date, { 'label' : 'Creation date'|trans }) }}
-
         {{ form_rest(form) }}
 
         <button class="btn btn-create" type="submit" alt="add a person">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
index 532ba9ecd..cf3e37beb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
@@ -77,9 +77,6 @@
                 <dt>{{ 'Gender'|trans }}</dt>
                 <dd>{{ gender|trans }}</dd>
 
-                <dt>{{ 'Creation date'|trans }}</dt>
-                <dd>{{ creation_date|format_date('long') }}</dd>
-
                 {% if form.altNames is defined %}
                     {# mark as rendered #}
                     {{ form_widget(form.altNames) }}