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

add ordering on some social work + minor improves

Browse Source
This commit is contained in:
Julien Fastré
2022-05-13 15:36:20 +02:00
parent b26fcc4566
commit a9df9f4880
8 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
View File

@@ -5,13 +5,9 @@
{% block table_entities_thead_tr %}
<th>{{ 'Id'|trans }}</th>
<th>{{ 'Title'|trans }}</th>
<th>{{ 'Parent'|trans }}</th>
<th>{{ 'Social issue'|trans }}</th>
<th>{{ 'Results'|trans }}</th>
<th>{{ 'Goals'|trans }}</th>
<th>{{ 'Evaluations'|trans }}</th>
<th>{{ 'Ordering'|trans }}</th>
<th>{{ 'goal.desactivationDate'|trans }}</th>
<th>{{ 'socialAction.defaultNotificationDelay'|trans }}</th>
<th>&nbsp;</th>
{% endblock %}
@@ -19,50 +15,14 @@
{% for entity in entities %}
<tr>
<td>{{ entity.id }}</td>
<td>{{ entity.title|localize_translatable_string }}</td>
<td>
{% if entity.parent is not null %}
{{ entity.parent.title|localize_translatable_string }}
{% endif %}
</td>
<td>
{% for e in entity.issue %}
{{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
</td>
<td>
{% for e in entity.results %}
{{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
</td>
<td>
{% for e in entity.goals %}
{{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
</td>
<td>
{% for e in entity.evaluations %}
{{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
</td>
<td>{{ entity|chill_entity_render_box }}</td>
<td>{{ entity.issue|chill_entity_render_box }}</td>
<td>{{ entity.ordering }}</td>
<td>
{% if entity.desactivationDate is not null %}
{{ entity.desactivationDate|date('Y-m-d') }}
{% endif %}
</td>
<td>
{% if entity.defaultNotificationDelay is not null %}
{% if entity.defaultNotificationDelay.d > 0 %}
{{ entity.defaultNotificationDelay.d }} {{'days'|trans}}
{% endif %}
{% if entity.defaultNotificationDelay.m > 0 %}
{{ entity.defaultNotificationDelay.m }} {{'months'|trans}}
{% endif %}
{% if entity.defaultNotificationDelay.y > 0 %}
{{ entity.defaultNotificationDelay.y }} {{'years'|trans}}
{% endif %}
{% endif %}
</td>
<td>
<ul class="record_actions">
<li>

8
src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
View File

@@ -5,7 +5,7 @@
{% block table_entities_thead_tr %}
<th>{{ 'Id'|trans }}</th>
<th>{{ 'Title'|trans }}</th>
<th>{{ 'Parent'|trans }}</th>
<th>{{ 'Ordering'|trans }}</th>
<th>{{ 'goal.desactivationDate'|trans }}</th>
<th>&nbsp;</th>
{% endblock %}
@@ -14,12 +14,10 @@
{% for entity in entities %}
<tr>
<td>{{ entity.id }}</td>
<td>{{ entity.title|localize_translatable_string }}</td>
<td>
{% if entity.parent is not null %}
{{ entity.parent.title|localize_translatable_string }}
{% endif %}
{{ entity|chill_entity_render_box }}
</td>
<td>{{ entity.ordering }}</td>
<td>
{% if entity.desactivationDate is not null %}
{{ entity.desactivationDate|date('Y-m-d') }}