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

[Accompanying period] fix closing motive label

Browse Source
This commit is contained in:
Julien Fastré 2020-06-30 17:45:03 +02:00
parent 523b60c69a
commit 98b9f5d2d7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -110,3 +110,4 @@ Master branch
============= =============
- [Accompanying period list] Fix period label in list - [Accompanying period list] Fix period label in list
- [Accompanying period list] Fix label of closing motive

13
Resources/views/AccompanyingPeriod/list.html.twig
View File

@ -28,6 +28,14 @@
'%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'), '%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'),
'%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')} '%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')}
) }} ) }}
{% if accompanying_period.isOpen == false %}
<dl class="chill_view_data">
<dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
<dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
</dl>
{% endif %}
{% endif %} {% endif %}
</td> </td>
{% if chill_accompanying_periods.fields.user == 'visible' %} {% if chill_accompanying_periods.fields.user == 'visible' %}
@ -40,10 +48,7 @@
</td> </td>
{% endif %} {% endif %}
<td> <td>
{% if accompanying_period.isOpen == false %}
<div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
<br/>
{% endif %}
{{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }} {{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}
</td> </td>
<td> <td>