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

Raw integration of accompanying person (with respect of 'cahier de cahrge)

Browse Source
This commit is contained in:
Marc Ducobu
2015-08-24 14:41:24 +02:00
parent 9decbf119a
commit f967285e34
15 changed files with 148 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Resources/views/AccompanyingPeriod/form.html.twig
View File

@@ -10,17 +10,17 @@
{{ form_start(form) }}
{{ 'Last opening since %last_opening%'|trans(
{ '%last_opening%' : accompanying_period.dateOpening|localizeddate('long', 'none', app.request.locale) }) }}
{ '%last_opening%' : accompanying_period.openingDate|localizeddate('long', 'none', app.request.locale) }) }}
{% if form.dateClosing is defined %}
{{ form_row(form.dateClosing, {'label' : 'Closing date'} ) }}
{% if form.closingDate is defined %}
{{ form_row(form.closingDate, {'label' : 'Closing date'} ) }}
{% endif %}
{% if form.closingMotive is defined %}
{{ form_row(form.closingMotive, {'label' : 'Closing motive'} ) }}
{% endif %}
{{ form_row(form.memo, {'label' : 'Memo' } ) }}
{{ form_row(form.remark, {'label' : 'Remark' } ) }}
{{ form_rest(form) }}

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

@@ -18,13 +18,13 @@
{% set i = 0 %}
{% for accompanying_period in accompanying_periods %}
<tr class="{% if i is not even %}striped{% endif %}">
<td>{{ accompanying_period.dateOpening|localizeddate('long', 'none', app.request.locale) }}</td>
<td>{{ accompanying_period.openingDate|localizeddate('long', 'none', app.request.locale) }}</td>
<td>{% spaceless %}
{% if accompanying_period.isOpen %}
{{ 'Still open'|trans }}
{% else %}
{{ accompanying_period.dateClosing|localizeddate('long', 'none', app.request.locale) }}
{{ accompanying_period.closingDate|localizeddate('long', 'none', app.request.locale) }}
{% endif %}
{% endspaceless %}</td>
@@ -34,10 +34,10 @@
</div>
</td>
</tr>
{% if accompanying_period.memo is not empty %}
{% if accompanying_period.remark is not empty %}
<tr class="{% if i is not even %}striped{% endif %}">
<td colspan="3">
<pre>{{ accompanying_period.memo }}</pre>
<pre>{{ accompanying_period.remark }}</pre>
</td>
</tr>
{% endif %}