Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve duplicates templates

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-03-21 14:38:58 +01:00
parent aa40716898
commit a86feafa53
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
View File

@@ -36,10 +36,10 @@
{%- macro links(person, options) -%}
<ul>
{# TODO suivre toutes les jointures #}
<li>compteur activités</li>
<li>compteur tâches</li>
<li>compteur rapports</li>
<li>compteur événements</li>
<li>compteur documents</li>
<li><b>3</b> activités</li>
<li><b>5</b> tâches</li>
<li><b>2</b> rapports</li>
<li><b>3</b> événements</li>
<li><b>6</b> documents</li>
</ul>
{% endmacro %}

4
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
View File

@@ -38,7 +38,7 @@
<h4>{{ 'Deleted datas'|trans ~ ':' }}</h4>
{{ sidepane.details(person2) }}
<h4>{{ 'Moved datas'|trans ~ ':' }}</h4>
<h4>{{ 'Moved links'|trans ~ ':' }}</h4>
{{ sidepane.links(person2) }}
</div>
</div>
@@ -56,7 +56,7 @@
<h4>{{ 'Keeped datas'|trans ~ ':' }}</h4>
{{ sidepane.details(person) }}
<h4>{{ 'Keeped datas'|trans ~ ':' }}</h4>
<h4>{{ 'Keeped links'|trans ~ ':' }}</h4>
{{ sidepane.links(person) }}
</div>
</div>

24
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
View File

@@ -10,16 +10,16 @@
<h1>{{ title|default('Person duplicate')|trans }}</h1>
{% if duplicatePersons|length > 0 %}
<h1>{{ title|default('Person duplicate')|trans }}</h1>
<p>{{ title|default('Person duplicate explained')|trans }}</p>
<table>
<thead>
<tr>
<th class="chill-orange">{% trans %}Name{% endtrans %}</th>
<th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
<th class="chill-green">{% trans %}Name{% endtrans %}</th>
<th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-green">{% trans %}Nationality{% endtrans %}</th>
<th>&nbsp;</th>
</tr>
</thead>
@@ -62,11 +62,11 @@
</li>
<li>
<a class="sc-button bt-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
Confirmer Doublons</a>
{{ 'Merge'|trans }}</a>
</li>
<li>
<a class="sc-button bt-not-duplicate" href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
Changer vers Faux-positif</a>
{{ 'Switch to truefalse'|trans }}</a>
</li>
</ul>
</td>
@@ -76,15 +76,15 @@
{% endif %}
{% if notDuplicatePersons|length > 0 %}
<h1>{{ 'Person flaged as duplicate' | trans }}</h1>
<h2>{{ 'Person flaged as duplicate' | trans }}</h2>
<p>{{ 'Person flaged as duplicate explained' | trans }}</p>
<table>
<thead>
<tr>
<th class="chill-green">{% trans %}Name{% endtrans %}</th>
<th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-green">{% trans %}Nationality{% endtrans %}</th>
<th class="chill-orange">{% trans %}Name{% endtrans %}</th>
<th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
<th>&nbsp;</th>
</tr>
</thead>
@@ -126,8 +126,8 @@
<a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
</li>
<li>
<a class="sc-button bt-action" href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
Changer vers doublon</a>
<a class="sc-button bt-not-duplicate" href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
{{ 'Switch to duplicate'|trans }}</a>
</li>
</ul>
</td>