Merge lp:~ronnie.vd.c/loco-team-portal/688064 into lp:loco-team-portal

[Ronnie]

Upcoming events contains meetings

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-12-30 19:46:26 +0000
+++ loco_directory/events/models.py	2011-01-10 17:38:33 +0000
@@ -120,6 +120,7 @@
     global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
     venue = models.ForeignKey(Venue, help_text=_('Venue of the Event'), verbose_name=_('Event Venue'), blank=True, null=True) 
     registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
+    template = 'events/team_event_li.inc.html'
     
     def __unicode__(self):
         return "%s %s %s" % (self.name, self.venue, self.date_begin or "")

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2011-01-05 15:50:08 +0000
+++ loco_directory/meetings/models.py	2011-01-10 17:38:33 +0000
@@ -56,6 +56,7 @@
     a meeting of one or more teams
     """
     teams = models.ManyToManyField(Team, help_text=_('teams of this meeting.'), verbose_name=_('Teams Participating'), db_index=True)
+    template = 'meetings/team_meeting_li.inc.html'
         
     def __unicode__(self):
         return "%s %s" % (self.name, self.date_begin or "")

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2010-12-25 08:02:40 +0000
+++ loco_directory/teams/models.py	2011-01-10 17:38:33 +0000
@@ -112,6 +112,22 @@
     @models.permalink
     def get_absolute_url(self):
         return ('team-detail', [str(self.lp_name)])
+        
+    def next_5_events_and_meetings(self):
+        """ a list with all upcoming team meetings """
+        events_and_meetings = []
+        events = self.teamevent_set.next_5_events().iterator()
+        meetings = self.teammeeting_set.next_meetings()[:5].iterator()
+        for event in events:
+            events_and_meetings.append(event)
+        for meeting in meetings:
+            events_and_meetings.append(meeting)
+
+        events_and_meetings.sort(key=lambda event: event.date_begin)
+
+        if len(events_and_meetings) > 5:
+            events_and_meetings = events_and_meetings[:5]
+        return events_and_meetings
 
 def teams_without_country():
     return Team.objects.filter(countries__isnull=True)

=== added file 'loco_directory/templates/events/team_event_li.inc.html'
--- loco_directory/templates/events/team_event_li.inc.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_li.inc.html	2011-01-10 17:38:33 +0000
@@ -0,0 +1,5 @@
+    {% load i18n %}
+    {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
+    <li>
+        <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} 
+    </li> 

=== added file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
--- loco_directory/templates/meetings/team_meeting_li.inc.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/meetings/team_meeting_li.inc.html	2011-01-10 17:38:33 +0000
@@ -0,0 +1,5 @@
+    {% load i18n %}
+    {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
+    <li>
+        <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} 
+    </li>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-12-25 08:02:40 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-01-10 17:38:33 +0000
@@ -207,13 +207,10 @@
                     <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li>
                     <li style="font-size:0.98em"><a href="{% url team-event-list-ical team.lp_name %}">{% trans "iCal Feed" %}</a></li>
                 </ul>
-                {% if team.teamevent_set.next_5_events %}
+                {% if team.next_5_events_and_meetings %}
                     <ul>
-                        {% for team_event in team.teamevent_set.next_5_events %}
-                            {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
-                            <li>
-                                <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} 
-                            </li>  
+                        {% for team_event in team.next_5_events_and_meetings %}
+                            {% include team_event.template %}
                         {% endfor %}
                     </ul>   
                 {% else %}