Merge branch 'issue505_create_household_composition' into 'master'

Issue505 create household composition

See merge request Chill-Projet/chill-bundles!378

CHANGELOG.md

@@ -43,6 +43,7 @@ and this project adheres to
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 
 ## Test releases

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php

@@ -134,7 +134,7 @@ class HouseholdCompositionController extends AbstractController
     public function index(Household $household, Request $request): Response
     {
         if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit an household');
+            throw new AccessDeniedException('not allowed to edit a household');
         }
 
         $count = $this->householdCompositionRepository->countByHousehold($household);
@@ -146,6 +146,20 @@ class HouseholdCompositionController extends AbstractController
             $paginator->getCurrentPageFirstItemNumber()
         );
 
+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions,
+            ]
+        ));
+    }
+
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
+     */
+    public function newAction(Household $household, Request $request): Response
+    {
         if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
             $isEdit = $request->query->has('edit');
 
@@ -195,10 +209,9 @@ class HouseholdCompositionController extends AbstractController
         }
 
         return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
+            '@ChillPerson/HouseholdComposition/create.html.twig',
             [
                 'household' => $household,
-                'compositions' => $compositions,
                 'form' => isset($form) ? $form->createView() : null,
                 'isPosted' => isset($form) ? $form->isSubmitted() : false,
                 'editId' => $request->query->getInt('edit', -1),

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}

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

@@ -15,7 +15,7 @@
     {% else %}
         <div class="flex-table">
             {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                     <div class="item-bloc">
                         <div class="item-row">
                             <div class="item-col">
@@ -42,7 +42,7 @@
                             <div class="item-row">
                                 <ul class="record_actions">
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
                                         <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,45 +54,17 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
-                    {{ form_start(form) }}
-
-                    {{ form_widget(form) }}
-
-                    <ul class="record_actions">
-                        <li class="cancel" style="margin-right: auto;">
-                            <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
-                        </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
-                    </ul>
-                    {{ form_end(form) }}
-                {% endif %}
             {% endfor %}
         </div>
     {% endif %}
 
-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
         <ul class="record_actions sticky-form-buttons">
-                <li>
+            <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
-                        {{ 'Create'|trans }}
+                        class="btn btn-new"
-                    </button>
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
-                </li>
+            </li>
         </ul>
     {% endif %}
 </div>

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -566,6 +566,7 @@ household_composition:
     Currently no composition: Aucune composition familiale renseignée.
     Add a composition: Ajouter une composition familiale
     Update composition: Modifier la composition familiale
+    Create: Créér une nouvelle composition familiale
 
 # docgen
 Linked evaluations: Évaluations associées