From 642ec803e80f894ef6702d10b882f47a1c2a517f Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Thu, 18 Apr 2019 12:09:53 +0200
Subject: [PATCH] timeline adapt view + corrections

---
 .../Timeline/event_person_context.html.twig   | 32 ++++++++-----------
 Timeline/TimelineEventProvider.php            |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Resources/views/Timeline/event_person_context.html.twig b/Resources/views/Timeline/event_person_context.html.twig
index 274ace1f3..01910c44f 100644
--- a/Resources/views/Timeline/event_person_context.html.twig
+++ b/Resources/views/Timeline/event_person_context.html.twig
@@ -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>
diff --git a/Timeline/TimelineEventProvider.php b/Timeline/TimelineEventProvider.php
index a718882d4..07b0f6829 100644
--- a/Timeline/TimelineEventProvider.php
+++ b/Timeline/TimelineEventProvider.php
@@ -96,7 +96,7 @@ class TimelineEventProvider implements TimelineProviderInterface
             'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person'])
         );
         
-        dump($query);
+        //dump($query);
         return $query;
     }