Improve EventIndex

mpicms/base/models.py

@@ -15,7 +15,8 @@
 from wagtail.snippets.models import register_snippet
 
 from mpicms.news.mixins import NewsMixin
-from mpicms.events.models import Event, EventIndex
+# from mpicms.events.models import Event, EventIndex
+from mpicms.events.mixins import EventMixin
 
 
 Page.show_in_menus_default = True
@@ -74,7 +75,7 @@ class Meta:  # noqa
         abstract = True
 
 
-class HomePage(NewsMixin, Page):
+class HomePage(EventMixin, NewsMixin, Page):
     banner = models.ForeignKey(
         'Banner',
         null=True,
@@ -94,19 +95,6 @@ class HomePage(NewsMixin, Page):
     def categories(self):
         return self.get_children().type(CategoryPage).live()
 
-    def get_context(self, request, *args, **kwargs):
-        context = super().get_context(request, *args, **kwargs)
-
-        # Events
-        events = []
-        for event in Event.objects.live():
-            events.append(event.get_dict(request))
-
-        context["events"] = json.dumps(events)
-        context['event_index'] = EventIndex.objects.get()
-
-        return context
-
     class Meta: # noqa
         verbose_name = _("homepage")
         verbose_name_plural = _("homepages")

mpicms/events/mixins.py

@@ -0,0 +1,13 @@
+from django.db import models
+
+from .models import EventIndex
+
+
+class EventMixin(models.Model):
+
+    @property
+    def event_index(self):
+        return self.get_children().type(EventIndex).first()
+
+    class Meta:  # noqa
+        abstract = True

mpicms/events/models.py

@@ -47,7 +47,7 @@ def end(self):
             return datetime.combine(self.end_date, self.end_time)
         return self.end_date
 
-    def get_dict(self, request):
+    def get_dict(self, request=None):
         return {
             'title': self.title,
             'start': self.start.isoformat(),
@@ -86,16 +86,15 @@ class EventIndex(Page):
 
     content_panels = Page.content_panels
 
-    def get_context(self, request, *args, **kwargs):
-        context = super().get_context(request, *args, **kwargs)
-
-        events = []
-        for child in self.get_children().type(Event).live().specific():
-            events.append(child.get_dict(request))
-
-        context["events"] = json.dumps(events)
-
-        return context
+    @property
+    def events(self):
+        if self.depth <= 3:
+            return Event.objects.live().specific()
+        return self.get_children().stype(Event).live().specific()
+
+    def get_json_events(self, request=None):
+        event_dicts = [event.get_dict(request) for event in self.events]
+        return json.dumps(event_dicts)
 
     def clean(self):  # Prevent more than one event index
         model = self.__class__

mpicms/events/templatetags/event_tags.py

@@ -0,0 +1,9 @@
+from django import template
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def get_json_events(context, event_index):
+    return event_index.get_json_events(request=context['request'])

mpicms/templates/base/home_page.html

@@ -22,18 +22,19 @@
         <div class="column">
             {% include 'news/components/news_preview.html' with news=page.news %}
         </div>
+        {% if page.event_index %}
         <div class="column calendar-list">
             <h3 class="title is-3">{% trans 'Upcoming events' %}</h3>
-            {% include 'events/components/event_list.html' %}
+            {% include 'events/components/event_list.html' with event_index=page.event_index %}
             <div class="section-button" >
-                <a href="{% pageurl event_index %}"><button class="button">{% trans 'All events' %}&nbsp&nbsp<i class="fas fa-chevron-right"></i></button></a>
+                <a href="{% pageurl page.event_index %}"><button class="button">{% trans 'All events' %}&nbsp&nbsp<i class="fas fa-chevron-right"></i></button></a>
             </div>
         </div>
+        {% endif %}
     </div>
 
 
     <h3 class="title is-3">{% trans 'Content' %}</h3>
     {% include 'base/components/content_preview.html' with pages=page.categories %}
 
-    <!-- </section> -->
 {% endblock %}

mpicms/templates/events/components/event_list.html

@@ -1,5 +1,9 @@
+{% load event_tags %}
+
 <div id="event_list"></div>
 
+
+{% get_json_events event_index.specific as events %}
 <script>
 
     document.addEventListener('DOMContentLoaded', function() {

mpicms/templates/events/event_index.html

@@ -1,4 +1,5 @@
 {% extends 'base/page.html' %}
+{% load event_tags %}
 
 {% block content %}
     <div class="section">
@@ -9,6 +10,7 @@ <h2 class="title is-2">{{ page.title }}</h2>
 
     </div>
 
+    {% get_json_events page as events %}
     <script>
 
         document.addEventListener('DOMContentLoaded', function() {