Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Adjust templates and add translations

Browse Source
This commit is contained in:
Julie Lenaerts 2025-03-03 20:15:17 +01:00
parent d84f3ee5ad
commit 3d397c0145
7 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
View File

@ -49,7 +49,10 @@
<a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
{ 'thirdparty_id': entity.id }) }}"
title="{{ 'Merge'|trans }}"
class="btn btn-misc">{{ 'Merge'|trans }}</a>
class="btn btn-misc">
<i class="bi bi-chevron-contract"></i>
{{ 'Merge'|trans }}
</a>
</li>
{% endblock %}
{% block content_view_actions_edit_link %}

8
src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
View File

@ -161,7 +161,13 @@
<a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
href="{{ path('chill_crud_3party_3party_view', { id: thirdparty.isChild ? thirdparty.parent.id : thirdparty.id }) }}"></a>
</li>
{% else %}
{% elseif is_granted('CHILL_3PARTY_3PARTY_UPDATE', thirdparty) %}
<li>
<a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
{ 'thirdparty_id': thirdparty.id }) }}"
title="{{ 'Merge'|trans }}"
class="btn btn-misc"><i class="bi bi-chevron-contract"></i></a>
</li>
{% endif %}
{% if options['customButtons']['after'] is defined %}

2
src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig vendored
View File

@ -116,7 +116,7 @@
<div class="flex-table">
{% for tp in thirdParty.activeChildren %}
<div class="item-bloc">
{{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false }) }}
{{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false, 'showFusion': true }) }}
</div>
{% endfor %}
</div>

9
src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/_details.html.twig
View File

@ -17,11 +17,18 @@
{% if thirdparty.telephone %}{{ thirdparty.telephone }}{% endif %}</li>
<li><b>{{ 'email'|trans }}</b>:
{% if thirdparty.email is not null %}{{ thirdparty.email }}{% endif %}</li>
<li><b>{{ 'address'|trans }}</b>:
<li><b>{{ 'Address'|trans }}</b>:
{%- if thirdparty.getAddress is not empty -%}
{{ thirdparty.getAddress|chill_entity_render_box }}
{% endif %}</li>
<li><b>{{ 'thirdparty.Contact data are confidential'|trans }}</b>:
{{ thirdparty.contactDataAnonymous }}</li>
<li><b>{{ 'Contacts'|trans }}</b>:
<ul>
{% for c in thirdparty.getChildren %}
<li>{{ c.name }} {{ c.firstName }}</li>
{% endfor %}
</ul>
</li>
</ul>
{% endmacro %}

8
src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/confirm.html.twig
View File

@ -21,7 +21,7 @@
</style>
<div class="container-fluid content"><div class="duplicate-content">
<h1>{{ 'thirdparty_duplicate.Merge duplicate thirdparties'|trans }}</h1>
<h1>{{ 'thirdparty_duplicate.title'|trans }}</h1>
<div class="col-md-11">
<p><b>{{ 'thirdparty_duplicate.Thirdparty to delete'|trans }}</b>:
@ -41,9 +41,9 @@
</div>
</div>
<div class="col-md-11">
<div class="col-md-11 mt-3">
<p><b>{{ 'thirdparty_duplicate.Thirdparty to keep'|trans }}</b>:
{{ 'thirdparty_duplicate.Thirdparty to delete explanation'|trans }}
{{ 'thirdparty_duplicate.Thirdparty to keep explanation'|trans }}
</p>
<div class="col border">
@ -51,7 +51,7 @@
{{ thirdparty }}
</h1>
<h4>{{ 'thirdparty_duplicate.data to keep'|trans ~ ':' }}</h4>
<h4>{{ 'thirdparty_duplicate.Data to keep'|trans ~ ':' }}</h4>
{{ details.details(thirdparty) }}
{# <h4>{{ 'thirdparty_duplicate.links to keep'|trans ~ ':' }}</h4>#}

2
src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/find_duplicate.html.twig
View File

@ -8,7 +8,7 @@
{% block content %}
<div class="person-duplicate">
<h1>{{ 'find_thirdparty_duplicate'|trans }}</h1>
<h1>{{ 'thirdparty_duplicate.find'|trans }}</h1>
{{ form_start(form) }}
{{ form_rest(form) }}

9
src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
View File

@ -133,4 +133,11 @@ is thirdparty: Le demandeur est un tiers
Filter by person's who have a residential address located at a thirdparty of type: Filtrer les usagers qui ont une addresse de résidence chez un tiers
"Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Uniquement les usagers qui ont une addresse de résidence chez un tiers de catégorie %thirdparty_type% et valide sur la date %date_calc%"
find_thirdparty_duplicate: 'Désigner un tiers doublon'
thirdparty_duplicate:
title: Fusionner les tiers doublons
find: Désigner un tiers doublon
Thirdparty to keep: Tiers à conserver
Thirdparty to delete: Tiers à supprimer
Thirdparty to delete explanation: Ce tiers sera supprimé. Seuls les contacts de ce tiers, énumérés ci-dessous, seront transférés.
Thirdparty to keep explanation: Ce tiers sera conserver
Data to keep: Données conservées