From a2115494325773cd1c0a0948ce15559f11883e03 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Mar 2025 15:16:27 +0100
Subject: [PATCH] Adjust template and add translations

---
 .../confirm.html.twig                         | 23 +++++--------------
 .../translations/messages.fr.yml              |  7 ++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/confirm.html.twig
index abc6d820a..eb0833657 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/confirm.html.twig
@@ -8,17 +8,13 @@
     <div class="container-fluid content"><div class="duplicate-content">
 
             <h1>{{ 'acpw_duplicate.title'|trans }}</h1>
+            <div class="col-md-11 border mb-3 mt-3 p-2">
+                <p>{{ 'acpw_duplicate.description'|trans }}</p>
+            </div>
 
             <div class="col-md-11">
-                <p><b>{{ 'acpw_duplicate.Accompanying period work to delete'|trans }}</b>:
-                    {{ 'acpw_duplicate.Accompanying period work to delete explanation'|trans }}
-                </p>
                 <div class="col">
-
-                    <h1><span><a class="btn btn-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_crud_3party_3party_view', { id : acpw2.id }) }}"></a></span>
-                    </h1>
-
-                    <h4>{{ 'Deleted datas'|trans ~ ':' }}</h4>
+                    <h4>{{ 'acpw_duplicate.to delete'|trans ~ ':' }}</h4>
                     <div class="accompanying-course-work">
                         <div class="flex-table">
                             {{ details.details(acpw2, accompanyingCourse) }}
@@ -28,15 +24,8 @@
             </div>
 
             <div class="col-md-11 mt-3">
-                <p><b>{{ 'acpw_duplicate.Accompanying period work to keep'|trans }}</b>:
-                    {{ 'acpw_duplicate.Accompanying period work to keep explanation'|trans }}
-                </p>
-                <div class="col border">
-
-                    <h1><span><a class="btn btn-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_accompanying_period_work_show', { id : acpw.id }) }}"></a></span>
-                    </h1>
-
-                    <h4>{{ 'acpw_duplicate.Data to keep'|trans ~ ':' }}</h4>
+                <div class="col">
+                    <h4>{{ 'acpw_duplicate.to keep'|trans ~ ':' }}</h4>
                     <div class="accompanying-course-work">
                         <div class="flex-table">
                             {{ details.details(acpw, accompanyingCourse) }}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index aaf258507..65f5e05f9 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -1496,5 +1496,12 @@ entity_display_title:
     Accompanying Course (n°%w%): "Parcours d'accompagnement (n°%w%)"
 
 acpw_duplicate:
+    title: Fusionner les actions d'accompagnement
+    description: Cette fusion conservera la date de début la plus ancienne, la date de fin la plus récente, toutes les évaluations, documents et workflows. Les agents traitants seront additionnés ainsi que les tiers intervenants. Les commentaires seront mis l'un à la suite de l'autre.
     Select accompanying period work: Selectionner un action d'accompagnement
     Assign duplicate: Désigner un action d'accompagnement doublon
+    Accompanying period work to delete: Action d'accompagnement à supprimer
+    Accompanying period work to delete explanation: Cet action d'accompagnement sera supprimé.
+    Accompanying period work to keep: Action d'accompagnement à conserver
+    to keep: Action d'accompagnement à conserver
+    to delete: Action d'accompagnement à supprimer