Merge branch 'master' into VSR-issues

src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig

@@ -72,6 +72,8 @@
     {% if onlyButton is defined and onlyButton == 1 %}
         data-hide-address="true"
     {% endif %}
+
+    data-address-defaults="{{ add_address|json_encode|e('html') }}"
 ></div>
 
 {{ encore_entry_script_tags('vue_address') }}

src/Bundle/ChillMainBundle/Resources/views/Admin/Regroupment/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/ChillMainBundle/Resources/views/Admin/Regroupment/index.html.twig

@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.name }}</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_regroupment_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/ChillMainBundle/Resources/views/Admin/Regroupment/new.html.twig

@@ -0,0 +1,11 @@
+{% 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 %}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -9,6 +9,11 @@
     {% block head_custom %}{% endblock %}
     <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
 
+    <script type="application/javascript">
+        {# this is global data, in use for all js app #}
+        window.addaddress = {{ add_address|json_encode|raw }};
+    </script>
+
     {{ encore_entry_link_tags('mod_bootstrap') }}
     {{ encore_entry_link_tags('mod_forkawesome') }}
     {{ encore_entry_link_tags('mod_ckeditor5') }}