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

timeline adapt view + corrections

Browse Source
This commit is contained in:
Tchama 2019-04-18 12:09:53 +02:00
parent 7212f086cc
commit 642ec803e8
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Resources/views/Timeline/event_person_context.html.twig
View File

@ -11,23 +11,27 @@
{% endfor %} {% endfor %}
</pre> </pre>
#} #}
{% if "now"|date('d/m/Y') < event.date|date('d/m/Y') %} {% if "now"|date('U') > event.date|date('U') %}
{% set boolDate = 'past' %} {% set boolDate = 'past' %}
{% else %} {% else %}
{% set boolDate = 'futur' %} {% set boolDate = 'futur' %}
{% endif %} {% endif %}
<div> <div>
<h3>{{ event.date|localizeddate('long', 'none') }} <h3>{{ event.date|localizeddate('long', 'short') }}
<span class="event"> / {{ 'Event'|trans }} <span style="color: slategrey;">{{ boolDate|trans }}</span></span></h3> <span class="event"> /
{% if boolDate|trans == 'futur' %}
<span class="chill-orange">Prochain</span> événement
{% else %}
{{ 'Event'|trans }} <span class="chill-light-gray">passé</span>
{% endif %}
</span>
</h3>
<div class="statement"> <div class="statement">
<span class="statement">{{ 'subscribed by %user% to event "%event%" (%event_type%)'|trans({ <ul class="statement">
'%user%' : user, <li>{{ 'Type: ' ~ event.type.name|localize_translatable_string }}</li>
'%person%' : person, <li>{{ 'Nom: ' ~ event.name }}</li>
'%event%' : event.name, </ul>
'%event_type%': event.type.name|localize_translatable_string,
'%date%' : event.date|localizeddate('long', 'none') }
) }}</span>
{% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), event) %} {% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), event) %}
@ -53,13 +57,5 @@
{{ 'Show the event'|trans }} {{ 'Show the event'|trans }}
</a> </a>
</li> </li>
{% if is_granted('CHILL_EVENT_UPDATE', event) %}
<li>
<a href="{{ path('chill_event__event_edit', { 'event_id': event.id} ) }}" class="sc-button bt-edit">
{{ 'Edit the event'|trans }}
</a>
</li>
{% endif %}
</ul> </ul>
</div> </div>

2
Timeline/TimelineEventProvider.php
View File

@ -96,7 +96,7 @@ class TimelineEventProvider implements TimelineProviderInterface
'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person']) 'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person'])
); );
dump($query); //dump($query);
return $query; return $query;
} }