Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to
 <!-- write down unreleased development here -->
 * renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
 * renomme date de début en date d'ouverture dans le formulaire parcours
+* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
 
 
 ## Test releases

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php

@@ -16,9 +16,12 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Chill\PersonBundle\Form\HouseholdCompositionType;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionRepository;
+use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,7 +34,7 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class HouseholdCompositionController
+class HouseholdCompositionController extends AbstractController
 {
     private EngineInterface $engine;
 
@@ -41,6 +44,8 @@ class HouseholdCompositionController
 
     private HouseholdCompositionRepository $householdCompositionRepository;
 
+    private HouseholdRepository $householdRepository;
+
     private PaginatorFactory $paginatorFactory;
 
     private Security $security;
@@ -52,6 +57,7 @@ class HouseholdCompositionController
     public function __construct(
         Security $security,
         HouseholdCompositionRepository $householdCompositionRepository,
+        HouseholdRepository $householdRepository,
         PaginatorFactory $paginatorFactory,
         FormFactoryInterface $formFactory,
         EntityManagerInterface $entityManager,
@@ -67,6 +73,59 @@ class HouseholdCompositionController
         $this->translator = $translator;
         $this->engine = $engine;
         $this->urlGenerator = $urlGenerator;
+        $this->householdRepository = $householdRepository;
+    }
+
+    /**
+     * @Route("/{_locale}/person/household/{household_id}/composition/{composition_id}/delete", name="chill_person_household_composition_delete")
+     *
+     * @param mixed $household_id
+     * @param mixed $composition_id
+     */
+    public function deleteAction(Request $request, $household_id, $composition_id): Response
+    {
+        $composition = $this->householdCompositionRepository->find($composition_id);
+        $household = $this->householdRepository->find($household_id);
+
+        $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household);
+
+        if (null === $composition) {
+            throw $this->createNotFoundException('Unable to find composition entity.');
+        }
+
+        $form = $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_household_composition_delete', [
+                'composition_id' => $composition_id,
+                'household_id' => $household_id,
+            ]))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->entityManager->remove($composition);
+                $this->entityManager->flush();
+
+                $this->addFlash('success', $this->translator
+                    ->trans('The composition has been successfully removed.'));
+
+                return $this->redirectToRoute('chill_person_household_composition_index', [
+                    'id' => $household_id,
+                ]);
+            }
+        }
+
+        return $this->render(
+            'ChillPersonBundle:HouseholdComposition:delete.html.twig',
+            [
+                'household' => $household,
+                'composition' => $composition,
+                'form' => $form->createView(),
+            ]
+        );
     }
 
     /**

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

@@ -0,0 +1,38 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% set activeRouteKey = 'chill_person_household_composition_index' %}
+
+{% block title  'Remove household composition'|trans %}
+
+{% block display_content %}
+    <p>{{ 'Concerns household n°%id%'|trans({ '%id%' : household.id } ) }}</p>
+    <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Composition'|trans }}:</h3>
+                    </div>
+                    <div class="wl-col list">
+                        {% for m in household.members %}
+                            <span class="wl-item">
+                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                    action: 'show', displayBadge: true,
+                                    targetEntity: { name: 'person', id: m.person.id },
+                                    buttonText: m.person|chill_entity_render_string,
+                                    isDead: m.person.deathdate is not null
+                                } %}
+                            </span>
+                        {% endfor %}
+                    </div>
+                </div>
+{% endblock %}
+
+{% block content %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Remove household composition'|trans,
+        'confirm_question'  : 'Are you sure you want to remove this composition?'|trans,
+        'display_content'   : block('display_content'),
+        'cancel_route'      : 'chill_person_household_composition_index',
+        'cancel_parameters' : { 'composition_id' : composition.id, 'id' : household.id },
+        'form'              : form
+    } ) }}
+{% endblock %}

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

@@ -22,7 +22,7 @@
                                 <h3>{{ c.householdCompositionType.label|localize_translatable_string }}</h3>
                                 <p>{{ 'household_composition.numberOfChildren'|trans }}: {{ c.numberOfChildren }}</p>
                             </div>
-                            <div class="item-col">{{ 'household_composition.Since'|trans({'startDate': c.startDate}) }}</div>
+                            <div class="item-col" style="justify-content: flex-end">{{ 'household_composition.Since'|trans({'startDate': c.startDate}) }}</div>
                         </div>
                         <div class="item-row">
                             <div class="item-col">
@@ -45,7 +45,10 @@
                                         <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
+                                                        'household_id': c.household.id}) }}"
+                                            class="btn btn-delete"
+                                            title="{{ 'Delete'|trans }}"></a>
                                     </li>
                                 </ul>
                             </div>
@@ -57,8 +60,8 @@
                     {{ form_widget(form) }}
 
                     <ul class="record_actions">
-                        <li class="cancel">
-                            <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
+                        <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>

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

@@ -487,6 +487,10 @@ Household summary: Résumé du ménage
 Edit household address: Modifier l'adresse du ménage
 Show household: Voir le ménage
 Back to household: Revenir au ménage
+Remove household composition: Supprimer composition familiale
+Are you sure you want to remove this composition?: Etes-vous sûr de vouloir supprimer cette composition familiale ?
+Concerns household n°%id%: Concerne le ménage n°%id%
+Composition: Composition
 
 # accompanying course work
 Accompanying Course Actions: Actions d'accompagnements