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
1=== modified file 'loco_directory/events/models.py'
2--- loco_directory/events/models.py 2010-11-27 03:56:49 +0000
3+++ loco_directory/events/models.py 2010-12-23 16:07:48 +0000
4@@ -74,6 +74,16 @@
5 def __unicode__(self):
6 return "%s %s" % (self.name, self.date_begin or "")
7
8+ def get_participating(self):
9+ attendees = 0
10+ for attendee in Attendee.objects.filter(team_event__global_event=self, promise='sure'):
11+ attendees += attendee.guests + 1
12+ locos = len(Team.objects.filter(teamevent__global_event=self).distinct())
13+ countries = len(Country.objects.filter(team__teamevent__global_event=self).distinct())
14+ return _('%(attendees)d people from %(locos)d LoCos and %(countries)d countries are participating in this event!' % {'attendees': attendees,
15+ 'locos': locos,
16+ 'countries': countries})
17+
18 @models.permalink
19 def get_absolute_url(self):
20 return ('global-event-detail', [str(self.id)])
21
22=== modified file 'loco_directory/templates/events/global_event_detail_basic.inc.html'
23--- loco_directory/templates/events/global_event_detail_basic.inc.html 2010-11-19 04:28:14 +0000
24+++ loco_directory/templates/events/global_event_detail_basic.inc.html 2010-12-23 16:07:48 +0000
25@@ -51,6 +51,11 @@
26 </td>
27 </tr>
28 {% endif %}
29+
30+ <tr>
31+ <th class="form-item-label" scope="row"><label>{% trans "Participating:" %}</label></th>
32+ <td class="form-item-value">{{ global_event_object.get_participating }}</td>
33+ </tr>
34
35 </table>
36 {% endif %}

Subscribers

People subscribed via source and target branches