Merge branch 'master' into testing

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -48,10 +48,13 @@
 {% endmacro %}
 
 {% block content %}
+
+    {# WARNING: this list is rendered in either person context or houshold context #}
+
     {%- set acps = [] %}
     {%- set acpsClosed = [] %}
     {% for acp in accompanying_periods %}
-        {% if acp.step == 'CLOSED' or (acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
+        {% if acp.step == 'CLOSED' or (person is defined and acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
             {%- set acpsClosed = acpsClosed|merge([acp]) %}
         {% else %}
             {%- set acps = acps|merge([acp]) %}
@@ -69,24 +72,30 @@
     </div>
 
     {% if acpsClosed|length > 0 %}
-        <div class="accordion" id="member_{{ person.id }}">
+        {% if person is defined %}
+            {% set identifier = person.id %}
+        {% else  %}
+            {% set identifier = household.id %}
+        {% endif %}
+
+        <div class="accordion" id="member_{{ identifier }}">
             <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_{{ person.id }}">
+                <h2 class="accordion-header" id="heading_{{ identifier }}">
                     <button
                         class="accordion-button collapsed"
                         type="button"
                         data-bs-toggle="collapse"
-                        data-bs-target="#collapse_{{ person.id }}"
+                        data-bs-target="#collapse_{{ identifier }}"
                         aria-expanded="false"
-                        aria-controls="collapse_{{ person.id }}">
+                        aria-controls="collapse_{{ identifier }}">
                         <span class="folded">{{ 'periods.show closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                         <span class="unfolded text-secondary">{{ 'periods.hide closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                     </button>
                 </h2>
 
-                <div id="collapse_{{ person.id }}"
+                <div id="collapse_{{ identifier }}"
                      class="accordion-collapse collapse"
-                     aria-labelledby="heading_{{ person.id }}"
+                     aria-labelledby="heading_{{ identifier }}"
                      data-bs-parent="#nonCurrent">
 
                     <div class="flex-table accompanyingcourse-list">

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

@@ -180,10 +180,16 @@
               {% if members|length > 0 %}
                 <div class="flex-table list-household-members">
                   {% for m in members %}
+                    {% if m.position.shareHousehold %}
                       {% include '@ChillPerson/Household/_render_member.html.twig' with {
                           'member': m,
                           'customButtons': { 'before': _self.customButtons(m, household) }
                       } %}
+                    {% else %}
+                        {% include '@ChillPerson/Household/_render_member.html.twig' with {
+                          'member': m,
+                      } %}
+                    {% endif %}
                   {% endfor %}
                 </div>
               {% else %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/edit.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/index.html.twig

@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_household_position_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/new.html.twig

@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+