Skip to content

Commit

Permalink
past events for #11
Browse files Browse the repository at this point in the history
  • Loading branch information
loufranco committed Sep 28, 2013
1 parent c1d5462 commit 5b730c2
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
13 changes: 13 additions & 0 deletions seedlibrary/templates/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,17 @@
{% else %}
There are no events
{% endif %}
<h2>Past Events</h2>
{% if past_event_list %}
{% for event in past_event_list %}
<ul>
<li><a href="{% url 'seedlibrary.views.seeds_at_event' id=event.id %}">{{ event.name }}</a> on {{ event.date|date }}
<p>{{ event.description }}</p>
</li>
</ul>
{% endfor %}
{% else %}
There are no events
{% endif %}

{% endblock %}
4 changes: 4 additions & 0 deletions seedlibrary/templates/seeds-at-event.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
{% block title %}Seeds at {{ event.name }}{% endblock %}
{% block pagetitle %}Seeds at {{ event.name }}{% endblock %}
{% block content %}
<p>Date: {{ event.date }}</p>
<p>{{ event.description }}</p>
{% if seed_list %}
{% with seed_list_for_table=seed_list full=True %}
{% include 'inc-seed-table.html' %}
{% endwith %}
{% else %}
<p>No seeds at this event.</p>
{% endif %}
{% endblock %}
8 changes: 6 additions & 2 deletions seedlibrary/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
from seedlibrary.forms import SeedForm
from seedlibrary.models import Seed, Event

from datetime import datetime, timedelta


def home(request):
return render_to_response('seedlib-home.html',
Expand Down Expand Up @@ -130,10 +132,12 @@ def seed_confirm_archive(request, id):

@login_required
def events(request):
event_list = Event.objects.all()
yesterday = datetime.now() - timedelta(days=1)
event_list = Event.objects.filter(date__gte=yesterday).order_by('date')
past_event_list = Event.objects.filter(date__lt=yesterday).order_by('-date')

return render_to_response('events.html',
{ "event_list": event_list,},
{ "event_list": event_list, "past_event_list":past_event_list},
context_instance=RequestContext(request))

@login_required
Expand Down

0 comments on commit 5b730c2

Please sign in to comment.