Merge branch 'features/household-members-list' into features/household-editor

src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig

@@ -0,0 +1,28 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household.Edit member household'|trans %}
+
+{% block content %}
+
+<h1>{{ block('title') }}</h1>
+
+{{ form_start(form) }}
+{{ form_widget(form) }}
+
+<ul class="record_actions sticky-form-buttons">
+  <li class="cancel">
+    <a 
+      href="{{ chill_return_path_or('chill_person_household_members', { 'household_id': household.id}) }}"
+      class="sc-button bt-cancel"
+      >
+      {{ 'Cancel'|trans }}
+    </a>
+  </li>
+  <li>
+    <button type="submit" class="sc-button bt-save">{{ 'Save'|trans }}</button>
+  </li>
+</ul>
+
+{{ form_end(form) }}
+
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig

@@ -5,7 +5,7 @@
             <div class="grid-6">{% set title = title %}
                 <h1>
                     <i class="fa fa-child"></i>
-                    {{ 'Household'|trans }}
+                    {{ 'household.Household'|trans }}
                     <span style="font-weight: lighter; font-size: 50%;">(n°{{ household.id  }})</span>
                 </h1>
             </div>

src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig

@@ -1,10 +1,131 @@
 {% extends '@ChillPerson/Household/layout.html.twig' %}
 
-{% block title 'Household members'|trans %}
+{% block title 'household.Household members'|trans %}
 
 {% block content %}
 <h1>{{ block('title') }}</h1>
 
-<p>Household with id {{ household.id }}</p>
+{% for p in positions %}
+<h3>{{ p.label|localize_translatable_string }}</h3>
+
+{% if false == p.shareHousehold %}
+<p>{{ 'household.Those members does not share address'|trans }}</p>
+{% endif %}
+
+{%- set members = household.currentMembersByPosition(p) %}
+{% if members|length > 0 %}
+<div class="household-list-members flex-table list-with-period">
+  {% for m in members %}
+  <div class="item-bloc">
+    <div class="item-row person">
+      <div class="item-col box-person">
+        <div>
+          {{ m.person|chill_entity_render_box({'addLink': true}) }}
+          {% if m.holder %}
+            <span class="badge badge-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 box-where">
+        <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="sc-button bt-edit" 
+            />
+              {{ 'household.Update membership'|trans }}
+            </a>
+          </li>
+          <li>
+            <a href="#" class="sc-button" /><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>
+  {% endfor %}
+</div>
+{% else %}
+<p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+{% endif %}
+
+{% set members = household.nonCurrentMembersByPosition(p) %}
+{% if members|length > 0 %}
+<p><!-- force a space after table --></p>
+<button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+  {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
+</button>
+
+<div id="nonCurrent_{{ p.id }}" class="collapse">
+  <div class="household-list-members flex-table list-with-period">
+    {% for m in members %}
+  <div class="item-bloc">
+    <div class="item-row person">
+      <div class="item-col box-person">
+        <div>
+          {{ m.person|chill_entity_render_box({'addLink': true}) }}
+          {% if m.holder %}
+            <span class="badge badge-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 box-where">
+        <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="sc-button bt-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>
+
+    {% endfor %}
+  </div>
+</div>
+
+{% endif %}
+
+{% endfor %}
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -1,14 +1,53 @@
 {% extends '@ChillPerson/Household/layout.html.twig' %}
 
-{% block title 'Household summary'|trans %}
+{% block title 'household.Household summary'|trans %}
 
 {% block content %}
 <h1>{{ block('title') }}</h1>
 
-<p>Household with id {{ household.id }}</p>
+<h2>{{ 'household.Current household members'|trans }}</h2>
 
-<h2>{{ 'Actual household members'|trans }}</h2>
+{% for p in positions %}
+{%- set members = household.currentMembersByPosition(p) %}
+{% if members|length > 0 %}
+<h3>{{ p.label|localize_translatable_string }}</h3>
 
-<p>TODO</p>
+{% if false == p.shareHousehold %}
+<p>{{ 'household.Those members does not share address'|trans }}</p>
+{% endif %}
+
+<div class="household-list-members flex-table list-with-period">
+  {% for m in members %}
+  <div class="item-bloc">
+    <div class="item-row person">
+      <div class="item-col box-person">
+        <div>
+          {{ m.person|chill_entity_render_box({'addLink': true}) }}
+          {% if m.holder %}
+            <span class="badge badge-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 box-where">
+        <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>
+      </div>
+    </div>
+  </div>
+  {% endfor %}
+</div>
+
+{% endif %}
+
+{% endfor %}
 
 {% endblock %}