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

Proposed by Ronnie
Status: Merged
Approved by: Chris Johnston
Approved revision: 346
Merged at revision: 347
Proposed branch: lp:~ronnie.vd.c/loco-team-portal/540384
Merge into: lp:loco-team-portal
Diff against target: 36 lines (+15/-0)
2 files modified
loco_directory/events/models.py (+10/-0)
loco_directory/templates/events/global_event_detail_basic.inc.html (+5/-0)
To merge this branch: bzr merge lp:~ronnie.vd.c/loco-team-portal/540384
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+44537@code.launchpad.net

Description of the change

Added attendees details on global event detail page

To post a comment you must log in.
347. By Ronnie

Changed label from attendees to participating, and checked for attendance 'sure'

Revision history for this message
Chris Johnston (cjohnston) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py 2010-11-27 03:56:49 +0000
+++ loco_directory/events/models.py 2010-12-23 16:07:48 +0000
@@ -74,6 +74,16 @@
74 def __unicode__(self):74 def __unicode__(self):
75 return "%s %s" % (self.name, self.date_begin or "")75 return "%s %s" % (self.name, self.date_begin or "")
76 76
77 def get_participating(self):
78 attendees = 0
79 for attendee in Attendee.objects.filter(team_event__global_event=self, promise='sure'):
80 attendees += attendee.guests + 1
81 locos = len(Team.objects.filter(teamevent__global_event=self).distinct())
82 countries = len(Country.objects.filter(team__teamevent__global_event=self).distinct())
83 return _('%(attendees)d people from %(locos)d LoCos and %(countries)d countries are participating in this event!' % {'attendees': attendees,
84 'locos': locos,
85 'countries': countries})
86
77 @models.permalink87 @models.permalink
78 def get_absolute_url(self):88 def get_absolute_url(self):
79 return ('global-event-detail', [str(self.id)])89 return ('global-event-detail', [str(self.id)])
8090
=== modified file 'loco_directory/templates/events/global_event_detail_basic.inc.html'
--- loco_directory/templates/events/global_event_detail_basic.inc.html 2010-11-19 04:28:14 +0000
+++ loco_directory/templates/events/global_event_detail_basic.inc.html 2010-12-23 16:07:48 +0000
@@ -51,6 +51,11 @@
51 </td>51 </td>
52 </tr>52 </tr>
53 {% endif %}53 {% endif %}
54
55 <tr>
56 <th class="form-item-label" scope="row"><label>{% trans "Participating:" %}</label></th>
57 <td class="form-item-value">{{ global_event_object.get_participating }}</td>
58 </tr>
5459
55 </table>60 </table>
56{% endif %}61{% endif %}

Subscribers

People subscribed via source and target branches