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 @@

{{ 'acpw_duplicate.title'|trans }}

+
+

{{ 'acpw_duplicate.description'|trans }}

+
-

{{ 'acpw_duplicate.Accompanying period work to delete'|trans }}: - {{ 'acpw_duplicate.Accompanying period work to delete explanation'|trans }} -

- -

-

- -

{{ 'Deleted datas'|trans ~ ':' }}

+

{{ 'acpw_duplicate.to delete'|trans ~ ':' }}

{{ details.details(acpw2, accompanyingCourse) }} @@ -28,15 +24,8 @@
-

{{ 'acpw_duplicate.Accompanying period work to keep'|trans }}: - {{ 'acpw_duplicate.Accompanying period work to keep explanation'|trans }} -

-
- -

-

- -

{{ 'acpw_duplicate.Data to keep'|trans ~ ':' }}

+
+

{{ 'acpw_duplicate.to keep'|trans ~ ':' }}

{{ 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