Widget: also show ongoing event

elefan-grenoble · Sep 12, 2023 · 2151725 · 2151725
1 parent 8866838
commit 2151725
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/app/Resources/views/admin/event/_partial/card.html.twig b/app/Resources/views/admin/event/_partial/card.html.twig
@@ -1,4 +1,3 @@
-{% set ongoing = ongoing ?? false %}
 {% set from_admin = from_admin ?? false %}
 
 <div class="card small {% if from_admin %}blue-grey darken-1{% endif %}">
@@ -15,7 +14,7 @@
             {% if event.kind %}
                 <span class="badge teal white-text">{{ event.kind }}</span>
             {% endif %}
-            {% if ongoing %}
+            {% if event.end and event.isOngoing %}
                 <span class="badge deep-purple white-text">En cours</span>
             {% endif %}
         </p>

diff --git a/app/Resources/views/admin/event/index.html.twig b/app/Resources/views/admin/event/index.html.twig
@@ -15,7 +15,7 @@
     <div class="row">
         {% for event in eventsOngoing %}
             <div class="col m12 l6">
-                {% include "admin/event/_partial/card.html.twig" with { event: event, ongoing: true, from_admin: true } %}
+                {% include "admin/event/_partial/card.html.twig" with { event: event, from_admin: true } %}
             </div>
         {% endfor %}
     </div>

diff --git a/app/Resources/views/event/_partial/widget.html.twig b/app/Resources/views/event/_partial/widget.html.twig
@@ -14,7 +14,12 @@
             <span>-</span>
             <strong>{% if links %}<a href="{{ path('event_detail', { 'id': event.id }) }}" target="_blank">{% endif %}{{ event.title }}{% if links %}</a>{% endif %}</strong>
             {{ event.date | date_fr_full_with_time }}
-            {% if event.end %}<i>({{ event.duration }})</i>{% endif %}
+            {% if event.end %}
+                <i>({{ event.duration }})</i>
+                {% if event.isOngoing %}
+                    <span>[en cours]</span>
+                {% endif %}
+            {% endif %}
             {# {% if not eventKind %}[{{ event.kind }}] {% endif %} #}
         </li>
     {% endfor %}

diff --git a/app/Resources/views/event/index.html.twig b/app/Resources/views/event/index.html.twig
@@ -14,7 +14,7 @@
     <div class="row">
         {% for event in eventsOngoing %}
             <div class="col m12 l6">
-                {% include "admin/event/_partial/card.html.twig" with { event: event, ongoing: true } %}
+                {% include "admin/event/_partial/card.html.twig" with { event: event } %}
             </div>
         {% endfor %}
     </div>

diff --git a/src/AppBundle/Controller/EventController.php b/src/AppBundle/Controller/EventController.php
@@ -48,7 +48,7 @@ public function widgetAction(Request $request)
             $eventKind = $em->getRepository('AppBundle:EventKind')->find($filter_event_kind_id);
         }
 
-        $events = $em->getRepository('AppBundle:Event')->findFutures($eventKind, $eventDateMax, $filter_limit);
+        $events = $em->getRepository('AppBundle:Event')->findFutureOrOngoing($eventKind, $eventDateMax, $filter_limit);
 
         return $this->render('event/_partial/widget.html.twig', [
             'events' => $events,

diff --git a/src/AppBundle/Entity/Event.php b/src/AppBundle/Entity/Event.php
@@ -297,6 +297,15 @@ public function isStartBeforeEnd()
         return true;
     }
 
+    /**
+     * @return boolean
+     */
+    public function getIsOngoing()
+    {
+        $now = new \DateTime('now');
+        return ($this->date < $now) && $this->end && ($this->end > $now);
+    }
+
     /**
      * Set description
      *