Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into issue469_budget

Browse Source
This commit is contained in:
Julie Lenaerts 2022-03-01 15:42:59 +01:00
commit 83760cc980
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -48,10 +48,9 @@ and this project adheres to
* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465) * [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460) * [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
## Test releases ## Test releases
* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType * Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
* [renderbox]: Fix display of address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/462)
* [renderbox]: Add email in personRenderBox, this was not yet displayed.
### test release 2022-02-14 ### test release 2022-02-14

4
src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
View File

@ -24,8 +24,8 @@
<div class="item-col"> <div class="item-col">
<div class="container"> <div class="container">
{% if document.date is not null %} {% if document.date is not null %}
<div class="dates row" style="float: right;"> <div class="dates row text-end">
<span>{{ document.createdAt|format_date('short') }}</span> <span>{{ document.date|format_date('short') }}</span>
</div> </div>
{% endif %} {% endif %}
</div> </div>

2
src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
View File

@ -72,7 +72,7 @@ section.chill-entity {
} }
} }
p { p {
// display: inline-block; display: inline-block;
margin: 0 0 0 1.5em; margin: 0 0 0 1.5em;
text-indent: -1.5em; text-indent: -1.5em;

9
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
View File

@ -113,15 +113,6 @@
<p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p> <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
</li> </li>
<li v-if="person.email">
<i class="fa fa-li fa-envelope-o"></i>
<a :href="'mailto: ' + person.email">{{ person.email }}</a>
</li>
<li v-else-if="options.addNoData">
<i class="fa fa-li fa-envelope-o"></i>
<p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
</li>
<li v-if="person.centers !== undefined && person.centers.length > 0 && options.addCenter"> <li v-if="person.centers !== undefined && person.centers.length > 0 && options.addCenter">
<i class="fa fa-li fa-long-arrow-right"></i> <i class="fa fa-li fa-long-arrow-right"></i>
<template v-for="c in person.centers">{{ c.name }}</template> <template v-for="c in person.centers">{{ c.name }}</template>

4
src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
View File

@ -8,7 +8,7 @@
{% endif %} {% endif %}
{% if entity.updatedBy != null %} {% if entity.updatedBy != null %}
{% if entity.updatedAt != null %} {% if entity.updatedAt != null %}
{{ ', ' ~ 'by_user'|trans }} {{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %} {% else %}
{{ 'Last updated by'|trans }} {{ 'Last updated by'|trans }}
{% endif %} {% endif %}
@ -29,7 +29,7 @@
{% endif %} {% endif %}
{% if entity.createdBy != null %} {% if entity.createdBy != null %}
{% if entity.createdAt != null %} {% if entity.createdAt != null %}
{{ ', ' ~ 'by_user'|trans }} {{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %} {% else %}
{{ 'Created by'|trans }} {{ 'Created by'|trans }}
{% endif %} {% endif %}