update welcome page (show five events in right order, on right side: show always one event)
This commit is contained in:
@@ -26,11 +26,19 @@ def index(request):
|
||||
# remove the pinned post
|
||||
posts.remove(featured_post)
|
||||
|
||||
featured_event = Event.only_events.get_future_events().first()
|
||||
# if there is no futurity event
|
||||
if not featured_event:
|
||||
featured_event = Event.only_events.get_past_events().first()
|
||||
|
||||
featured_meeting = FetMeeting.objects.get_meetings()
|
||||
|
||||
context = {
|
||||
'posts': posts,
|
||||
'events': Event.all_events.get_five_events(),
|
||||
'featured_post': featured_post,
|
||||
'featured_meeting': FetMeeting.objects.get_meetings(),
|
||||
'featured_event': featured_event,
|
||||
'featured_meeting': featured_meeting,
|
||||
'tags_list': ", ".join(t)
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,8 @@ class AllEventManager(models.Manager):
|
||||
return super().get_queryset().filter(Q(post_type='E') | Q(post_type='F'))
|
||||
|
||||
def get_five_events(self):
|
||||
return self.get_queryset().order_by('-event_start')[:5]
|
||||
date_today = timezone.now()
|
||||
return self.get_queryset().filter(event_start__gt=date_today).order_by('event_start')[:5]
|
||||
|
||||
|
||||
class EventManager(models.Manager):
|
||||
@@ -59,6 +60,14 @@ class EventManager(models.Manager):
|
||||
def get_queryset(self):
|
||||
return super().get_queryset().filter(post_type='E')
|
||||
|
||||
def get_future_events(self):
|
||||
date_today = timezone.now()
|
||||
return self.get_queryset().filter(event_start__gt=date_today).order_by('event_start')
|
||||
|
||||
def get_past_events(self):
|
||||
date_today = timezone.now()
|
||||
return self.get_queryset().filter(event_start__lt=date_today).order_by('-event_start')
|
||||
|
||||
|
||||
class FetMeetingManager(models.Manager):
|
||||
"""
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<div class="medium-4 responsive-side-box cell">
|
||||
<a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a>
|
||||
<div class="article-row-section">
|
||||
{% with post=featured_post %}
|
||||
{% with post=featured_event %}
|
||||
{% include 'posts/partials/_article_row.html' %}
|
||||
{% endwith %}
|
||||
{% for post in featured_meeting %}
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
{% if post.subtitle is not None %}
|
||||
<p class="article-row-content-description">{{post.subtitle}}</p>
|
||||
{% endif %}
|
||||
<p class="article-row-content-author">{{post.author}}</p>
|
||||
<time class="article-row-content-time" datetime="2008-02-14 20:00">{{post.public_date}}</time>
|
||||
<!--<p class="article-row-content-author">{{post.author}}</p>-->
|
||||
<time class="article-row-content-time">{{post.event_start|date}}</time>
|
||||
</div>
|
||||
</article>
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user