mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-12 21:34:25 +00:00
timeline adapt view + corrections
This commit is contained in:
parent
7212f086cc
commit
642ec803e8
@ -11,23 +11,27 @@
|
||||
{% endfor %}
|
||||
</pre>
|
||||
#}
|
||||
{% if "now"|date('d/m/Y') < event.date|date('d/m/Y') %}
|
||||
{% if "now"|date('U') > event.date|date('U') %}
|
||||
{% set boolDate = 'past' %}
|
||||
{% else %}
|
||||
{% set boolDate = 'futur' %}
|
||||
{% endif %}
|
||||
|
||||
<div>
|
||||
<h3>{{ event.date|localizeddate('long', 'none') }}
|
||||
<span class="event"> / {{ 'Event'|trans }} <span style="color: slategrey;">{{ boolDate|trans }}</span></span></h3>
|
||||
<h3>{{ event.date|localizeddate('long', 'short') }}
|
||||
<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">
|
||||
<span class="statement">{{ 'subscribed by %user% to event "%event%" (%event_type%)'|trans({
|
||||
'%user%' : user,
|
||||
'%person%' : person,
|
||||
'%event%' : event.name,
|
||||
'%event_type%': event.type.name|localize_translatable_string,
|
||||
'%date%' : event.date|localizeddate('long', 'none') }
|
||||
) }}</span>
|
||||
<ul class="statement">
|
||||
<li>{{ 'Type: ' ~ event.type.name|localize_translatable_string }}</li>
|
||||
<li>{{ 'Nom: ' ~ event.name }}</li>
|
||||
</ul>
|
||||
|
||||
|
||||
{% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), event) %}
|
||||
@ -53,13 +57,5 @@
|
||||
{{ 'Show the event'|trans }}
|
||||
</a>
|
||||
</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>
|
||||
</div>
|
||||
|
@ -96,7 +96,7 @@ class TimelineEventProvider implements TimelineProviderInterface
|
||||
'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person'])
|
||||
);
|
||||
|
||||
dump($query);
|
||||
//dump($query);
|
||||
return $query;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user