managers, is_future, ul,

models.py

@@ -1,9 +1,27 @@
+import datetime
+
 from django.db import models
 from django.template.defaultfilters import slugify
 
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 
+class FutureEventsManager(models.Manager):
+    ''' Return all of the events, next one first
+    '''
+    def get_query_set(self):
+        return super(FutureEventsManager, self).get_query_set().filter(
+                start__gte=datetime.datetime.now()-datetime.timedelta(hours=1)
+        ).order_by('start')
+
+class PastEventsManager(models.Manager):
+    ''' Return all events in the past, starting with most recent
+    '''
+    def get_query_set(self):
+        return super(PastEventsManager, self).get_query_set().filter(
+                start__lte=datetime.datetime.now()-datetime.timedelta(hours=1)
+        ).order_by('-start')
+
 class Event(models.Model):
     ''' Simple event-tag with owner and content_object + meta_data '''
     title = models.CharField(max_length=255)
@@ -19,6 +37,13 @@ class Event(models.Model):
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey()
 
+    objects = models.Manager()
+    futures = FutureEventsManager()
+    pasts = PastEventsManager()
+
+    def is_future(self):
+        return self.start >= datetime.datetime.now()
+
     def __unicode__(self):
         return "%s, %s" % (self.slug, self.start.date())
 
@@ -40,5 +65,3 @@ class Meta:
         ordering=( '-start', )
         unique_together = (('start', 'slug'),)
 
-
-#class FutureEventsManager(models.Manager):

templates/events/event_list.html

@@ -32,9 +32,12 @@
 </div>
 <div style="clear:both;"></div>
 <div id="event_list">
-{% for event in object_list %}
-  {% show_event event request.user 25 %}
-{% endfor %}
+
+    <ul id="event_list">
+    {% for event in object_list %}
+        {% show_event event request.user 25 %}
+    {% endfor %}
+    </ul>
 
 </div>
 {% endblock %}

templates/events/tags/show_event.html

@@ -1,4 +1,4 @@
-<div class="event-unit">
+<li class="event-unit">
 
     <p>
     {% if truncate %}
@@ -8,7 +8,7 @@
     {% endif %}    
     </p>
     <p>
-        {{event.start|date}}
+        {{event.start|date:'F j, Y, P'}}
     </p>
 
     {% if event.description %}
@@ -26,6 +26,5 @@
     <a href="{% url events_change id=event.id %}">Change this event</a>
     {% endif %}
 
-</div>
+</li>
 
-<hr>

views.py

@@ -33,7 +33,7 @@ def all(request):
         qs = Event.objects.filter(q)
 
     else:
-        qs = Event.objects.all()
+        qs = Event.futures.all()
         search_form = SearchForm()
 
     context = { 'search_form':search_form, }