From 3fefaf1e4dddbbf91f596d62a29fdaf447513ba5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 13:59:31 +0200
Subject: [PATCH] household summary: put member box in a reused include
 template

---
 .../views/Household/_render_member.html.twig  |  65 +++++++++
 .../views/Household/summary.html.twig         | 127 ++++--------------
 2 files changed, 93 insertions(+), 99 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
new file mode 100644
index 000000000..f1c96e5fa
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
@@ -0,0 +1,65 @@
+{% macro addHolder(holder) %}
+    {% if holder %}
+        <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
+            <i class="fa fa-circle fa-stack-1x text-success"></i>
+            <i class="fa fa-stack-1x">T</i>
+        </span>
+    {% endif %}
+{% endmacro %}
+
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col" style="flex-basis: 30%;">
+            {{ member.person|chill_entity_render_box({
+                'render': 'label',
+                'addLink': true,
+                'addInfo': true,
+                'customArea': {
+                    'afterLabel': _self.addHolder(member.holder)
+                }
+            }) }}
+        </div>
+        <div class="item-col">
+            <div class="floatbutton top"><div class="box">
+
+                    <div class="action">
+                        <ul class="record_actions">
+
+                            {% if customButtons['before'] is defined %}
+                                {{ customButtons['before'] }}
+                            {% endif %}
+
+                            <li>
+                                <a  class="btn btn-sm btn-edit"
+                                    title="{{ 'household.Update membership'|trans }}"
+                                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
+                            </li>
+
+                            {% if customButtons['after'] is defined %}
+                                {{ customButtons['after'] }}
+                            {% endif %}
+
+                        </ul>
+                    </div>
+
+                    <ul class="list-content fa-ul small ms-0">
+                    {% if member.startDate is not empty %}
+                        <li><i class="fa fa-long-arrow-right"></i>
+                            {{ 'Since %date%'|trans({'%date%': member.startDate|format_date('short') }) }}</li>
+                    {% endif %}
+                    {% if member.endDate is not empty %}
+                        <li><i class="fa fa-long-arrow-right"></i>
+                            {{ 'Until %date%'|trans({'%date%': member.endDate|format_date('short') }) }}</li>
+                    {% endif %}
+                    </ul>
+
+                    {% if member.comment is not empty %}
+                        <blockquote class="chill-user-quote ms-0 mb-0" style="clear: right">
+                            {{ member.comment|chill_markdown_to_html }}
+                        </blockquote>
+                    {% endif %}
+
+                </div></div>
+        </div>
+    </div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 933032426..1b1d22775 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -12,11 +12,13 @@
 {% set address = household.currentAddress %}
 
 {% if address is empty %}
-<p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+    <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
 {% else %}
-<div>
-  {{ address|chill_entity_render_box({'multiline': true}) }}
-</div>
+    <div class="flex-table">
+        <div class="item-bloc">
+          {{ address|chill_entity_render_box({'multiline': true}) }}
+        </div>
+    </div>
 {% endif %}
 
 <h2>{{ 'household.Household members'|trans }}</h2>
@@ -81,67 +83,31 @@
   {% endif %}
 
   {%- set members = household.currentMembersByPosition(p) %}
+
+  {% macro customButtons(member, household) %}
+      <li>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
+             class="btn btn-sm btn-misc"><i class="fa fa-arrows-h"></i>
+              {{ 'household.Change position'|trans }}</a>
+      </li>
+      <li>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
+             class="btn btn-sm btn-misc"><i class="fa fa-sign-out"></i>
+              {{ 'household.Leave'|trans }}</a>
+      </li>
+  {% endmacro %}
+
   {% if members|length > 0 %}
     <div class="flex-table list-household-members">
       {% for m in members %}
-        <div class="item-bloc">
-          <div class="item-row">
-            <div class="item-col">
-              <div>
-                {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                {% if m.holder %}
-                  <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
-                {% endif %}
-              </div>
-              <div>
-                {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-              </div>
-            </div>
-            <div class="item-col">
-              <ul class="list-content fa-ul">
-                {% if m.startDate is not empty %}
-                  <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                {% endif %}
-                {% if m.endDate is not empty %}
-                  <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                {% endif %}
-              </ul>
-              <ul class="record_actions">
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
-                        class="btn btn-edit" />
-                        {{ 'household.Update membership'|trans }}
-                    </a>
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'household': household.id} ) }}"
-                        class="btn btn-misc" />
-                        <i class="fa fa-arrows-h"></i>
-                        {{ 'household.Change position'|trans }}
-                    </a>
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
-                        class="btn btn-misc" />
-                        <i class="fa fa-sign-out"></i>
-                        {{ 'household.Leave'|trans }}
-                    </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-          {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-          {% endif %}
-        </div>
+          {% include '@ChillPerson/Household/_render_member.html.twig' with {
+              'member': m,
+              'customButtons': { 'after': _self.customButtons(m, household) }
+          } %}
       {% endfor %}
     </div>
   {% else %}
-  <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+    <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
   {% endif %}
 
   {% set members = household.nonCurrentMembersByPosition(p) %}
@@ -154,46 +120,9 @@
     <div id="nonCurrent_{{ p.id }}" class="collapse">
       <div class="flex-table list-household-members">
         {% for m in members %}
-          <div class="item-bloc">
-            <div class="item-row">
-              <div class="item-col">
-                <div>
-                  {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                  {% if m.holder %}
-                    <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
-                  {% endif %}
-                </div>
-                <div>
-                  {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-                </div>
-              </div>
-              <div class="item-col">
-                <ul class="list-content fa-ul">
-                  {% if m.startDate is not empty %}
-                    <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                  {% endif %}
-                  {% if m.endDate is not empty %}
-                    <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                  {% endif %}
-                </ul>
-                <ul class="record_actions">
-                  <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
-                    class="btn btn-edit">
-                      {{ 'household.Update membership'|trans }}
-                    </a>
-                  </li>
-                </ul>
-              </div>
-            </div>
-            {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-            {% endif %}
-          </div>
+            {% include '@ChillPerson/Household/_render_member.html.twig' with {
+                'member': m
+            } %}
         {% endfor %}
       </div>
     </div>