Merge lp:~mhall119/loco-team-portal/fixes-619883 into lp:loco-team-portal

[Michael Hall]

I had initially limited the upcoming events because I was going to display team events. Since we're not doing that, I don't think we need a limit. Also, instead of passing the entire list of team events to the template context, I'm only passing the count now.

[Chris Johnston (cjohnston)]

The order needs to be changed for global events to where date_end is displayed first.

review: Needs Fixing

[lp:~mhall119/loco-team-portal/fixes-619883]

244. By Michael Hall on 2010-08-18

Short events by end_date rather than begin_date, so the ones ending soonest come first

[Chris Johnston (cjohnston)]

Great!

review: Approve

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2010-08-15 20:11:04 +0000
+++ loco_directory/common/views.py	2010-08-18 16:21:44 +0000
@@ -8,9 +8,9 @@
 
 def index(request):
     from events.models import GlobalEvent, TeamEvent
-    team_event_list = TeamEvent.objects.next_events()[:5]
-    global_event_list = GlobalEvent.objects.next_events()[:2]
-    context = {'team_event_list': team_event_list,
+    team_event_count = TeamEvent.objects.next_events().count()
+    global_event_list = GlobalEvent.objects.next_events()[:5]
+    context = {'team_event_count': team_event_count,
                'global_event_list': global_event_list,}
 
     return render_to_response('index.html', context,

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-08-17 01:55:04 +0000
+++ loco_directory/events/models.py	2010-08-18 16:21:44 +0000
@@ -50,11 +50,11 @@
     """ manager for a global event """
     def next_events(self):
         """ a list with all upcoming global events """
-        return self.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
     
     def history_events(self):
         """ all  global events in history """
-        return self.filter(date_end__lt=datetime.datetime.now()).order_by('-date_begin')
+        return self.filter(date_end__lt=datetime.datetime.now()).order_by('date_end')
 
     def random_5(self):
         """ return 5 random Team Events for this global event """
@@ -87,12 +87,12 @@
     def next_5_events(self):
         """ a list with the next 5 events """
 # XXX: Workaround for https://bugs.launchpad.net/loco-directory/+bug/531970
-        return self.filter(date_end__gt=datetime.datetime.now()-datetime.timedelta(days=1)).order_by('date_begin')[:5]
+        return self.filter(date_end__gt=datetime.datetime.now()-datetime.timedelta(days=1)).order_by('date_end')[:5]
 
     def next_events(self):
         """ a list with all upcoming team events """
 # XXX: Workaround for https://bugs.launchpad.net/loco-directory/+bug/531970
-        return self.filter(date_end__gt=datetime.datetime.now()-datetime.timedelta(days=1)).order_by('date_begin')
+        return self.filter(date_end__gt=datetime.datetime.now()-datetime.timedelta(days=1)).order_by('date_end')
 
     def history_events(self):
         """ all team events in history """

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2010-08-17 15:09:14 +0000
+++ loco_directory/templates/index.html	2010-08-18 16:21:44 +0000
@@ -65,8 +65,8 @@
             {% endif %}
             
             <br />
-            {% if team_event_list %}
-            <h3><a href="{% url event-list %}">{{ team_event_list.count }} {% trans "Upcoming Team Events" %}</a>
+            {% if team_event_count %}
+            <h3><a href="{% url event-list %}">{{ team_event_count }} {% trans "Upcoming Team Events" %}</a>
             <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
             <img src="/media/images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h3>
             {% else %}