Merge lp:~mhall119/loco-team-portal/event-attendee-registration into lp:loco-team-portal

[Michael Hall]

[Michael Hall (mhall119)]

Added elements to allow users to login and register for an event

[Thomas Bechtold (toabctl)]

some ideas:

- what does RSVP mean?
- ATTENDEE_PROMISE_CHOICES: for me, "not coming" makes no sense because if you will not come, you just do nothing.
- for rsvp in self.attendee_set.all(): <- do this with a filter. sql iss faster than python.
- form.is_valid(): ... a simple form.save() should work instead of attendee_object.save() and the other stuff.
- would be cool if the translation file will be updated in an extra merge request because it's a more difficult to check the merge request with all the translation stuff inside.

[Michael Hall (mhall119)]

RSVP is an acronym for a French term meaning "Please Reply" or something to that effect. I changed all user-visible instances to use "Register for Event" instead.

Meetup.com had the ability to register as not coming to an event, which is why I included it. Moreover, once you've registered "Coming" or "Maybe", if your plans change you would have to de-register without a "Not Coming" option.

I will make the change to use a filter on TeamEvent.is_attending.

The problem with form.save() is that it would require having the attendee and team_event be passed as hidden form parameters or they will be None in the Attendee instance and I would have to manually set them and call attendee_object.save() again anyway.

I agree that something different should be done with the translations file, should we talk to dholbach about that?

[lp:~mhall119/loco-team-portal/event-attendee-registration]

33. By Michael Hall on 2010-01-10

Modification from merge comments. Replaced RSVP with Registration, use only form.save, and use SQL filtering for TeamEvent.is_attending

[Michael Hall (mhall119)]

Nevermind my reply about form.save, you were right it does work in this case. My new merge propose has that fix in it too.

Unmerged revisions

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2010-01-05 14:40:39 +0000
+++ loco_directory/events/forms.py	2010-01-10 14:16:15 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django import forms
-from models import BaseEvent, GlobalEvent, TeamEvent
+from models import BaseEvent, GlobalEvent, TeamEvent, Attendee
 
 
 
@@ -49,5 +49,11 @@
 #        exclude = ('date_created')
 
 
-
+class AttendeeRegistrationForm(forms.ModelForm):
+    """
+    a form to create/update an Attendee object
+    """
+    class Meta:
+        model = Attendee
+        exclude = ('attendee', 'team_event')
 

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-01-08 12:26:31 +0000
+++ loco_directory/events/models.py	2010-01-10 14:16:15 +0000
@@ -2,10 +2,12 @@
 from teams.models import *
 from venues.models import Venue
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth.models import User
 
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('come for sure')),
-    ('maybe', _('come maybe')),
+    ('maybe', _('maybe coming')),
+    ('not', _('not coming')),
 )
 
 import datetime
@@ -111,6 +113,9 @@
     def get_absolute_url(self):
         return ('team-event-detail', [str(self.id)])
 
+    def is_attending(self, user):
+        return self.attendee_set.filter(attendee=user).count() > 0
+
     #add manager
     objects = TeamEventManager()
 
@@ -121,6 +126,7 @@
     """
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
     date_created = models.DateTimeField(help_text=_('the date and time when the event comment was created'), default=datetime.datetime.now(), db_index=True)
+    comment_by = models.ForeignKey(User) 
     comment = models.TextField(help_text=_('Comment this Event'), db_index=True)
     
     def __unicode__(self):
@@ -132,9 +138,13 @@
     """
     a event attendee
     """
+    class Meta:
+        unique_together = ('team_event', 'attendee')
+        
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
-    attendee = models.CharField(help_text=_('the name of the attendee'), max_length=100)
+    attendee = models.ForeignKey(User, help_text=_('the name of the attendee'))
     promise = models.CharField(help_text=_('how safe do you come'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)
+    guests = models.PositiveSmallIntegerField(help_text=_('the number of guests coming with attendee'))
     
     def __unicode__(self):
         return self.attendee

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2010-01-06 21:30:56 +0000
+++ loco_directory/events/urls.py	2010-01-10 14:16:15 +0000
@@ -6,6 +6,7 @@
     url(r'^history/$', 'events.views.event_history_list', name='event-history-list'),
     #team events
     url(r'^team/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
+    url(r'^team/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
     url(r'^team/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'),
     url(r'^team/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
     url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-01-08 12:26:31 +0000
+++ loco_directory/events/views.py	2010-01-10 14:16:15 +0000
@@ -11,9 +11,11 @@
 from events.models import TeamEvent
 from events.models import GlobalEvent
 from teams.models import Team
+from events.models import Attendee
 
 from forms import TeamEventForm
 from forms import GlobalEventForm
+from forms import AttendeeRegistrationForm
 
 from common import launchpad
 
@@ -74,6 +76,7 @@
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
     context = {
         'team_event_object': team_event_object,
+        'user_is_attending': team_event_object.is_attending(request.user)
     }
     return render_to_response('events/team_event_detail.html', 
                                          context, RequestContext(request))
@@ -143,6 +146,28 @@
         return redirect( team_event_object )
 
 
+def team_event_register(request, team_event_id):
+    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    if team_event_object.is_attending(request.user):
+        attendee_object = team_event_object.attendee_set.get(attendee=request.user)
+    else:
+        attendee_object = Attendee(team_event=team_event_object, attendee=request.user)
+        
+    if request.method == 'POST':        
+        form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
+        if form.is_valid():
+            form.save()
+            request.user.message_set.create(message=_('Your registration has been saved'))
+            return redirect( team_event_object )
+    else:
+        form = AttendeeRegistrationForm(instance=attendee_object)
+    
+    context = {
+           'form': form
+    }
+    
+    return render_to_response('events/team_event_register.html', 
+                                     context, RequestContext(request))
 
 #################################################################
 # Global Events

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-01-05 14:09:50 +0000
+++ loco_directory/locale/loco-directory.pot	2010-01-10 14:16:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 14:09+0000\n"
+"POT-Creation-Date: 2010-01-10 14:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,12 +16,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: events/models.py:7
+#: events/models.py:8
 msgid "come for sure"
 msgstr ""
 
-#: events/models.py:8
-msgid "come maybe"
+#: events/models.py:9
+msgid "maybe coming"
+msgstr ""
+
+#: events/models.py:10
+msgid "not coming"
 msgstr ""
 
 #: events/models.py:19
@@ -56,169 +60,189 @@
 msgid "the date and time when the event was created"
 msgstr ""
 
-#: events/models.py:52
+#: events/models.py:68
 msgid "Hash Tag used for microbloggers to mention this event"
 msgstr ""
 
-#: events/models.py:52
+#: events/models.py:68
 msgid "Microblogging Hash Tag"
 msgstr ""
 
-#: events/models.py:53
+#: events/models.py:69
 msgid "tag used in welb albums like; picasa, flickr, and more"
 msgstr ""
 
-#: events/models.py:53
+#: events/models.py:69
 msgid "Picture Tag"
 msgstr ""
 
-#: events/models.py:86
+#: events/models.py:106
 msgid "teams of this event."
 msgstr ""
 
-#: events/models.py:86
+#: events/models.py:106
 msgid "Teams Participating"
 msgstr ""
 
-#: events/models.py:87
+#: events/models.py:107
 msgid "this team event is part of the selected global event"
 msgstr ""
 
-#: events/models.py:87
+#: events/models.py:107
 msgid "Related Global Event"
 msgstr ""
 
-#: events/models.py:88
+#: events/models.py:108
 msgid "Venue of the Event"
 msgstr ""
 
-#: events/models.py:100 events/models.py:110
+#: events/models.py:127 events/models.py:144
 msgid "the Team Event"
 msgstr ""
 
-#: events/models.py:101
+#: events/models.py:128
 msgid "the date and time when the event comment was created"
 msgstr ""
 
-#: events/models.py:102
+#: events/models.py:130
 msgid "Comment this Event"
 msgstr ""
 
-#: events/models.py:111
+#: events/models.py:145
 msgid "the name of the attendee"
 msgstr ""
 
-#: events/models.py:112
+#: events/models.py:146
 msgid "how safe do you come"
 msgstr ""
 
-#: events/views.py:76
+#: events/models.py:147
+msgid "the number of guests coming with attendee"
+msgstr ""
+
+#: events/views.py:101
 msgid "New event created"
 msgstr ""
 
-#: events/views.py:88
+#: events/views.py:113
 msgid "You can not add a new event for this team."
 msgstr ""
 
-#: events/views.py:102
+#: events/views.py:134
 msgid "Team Event updated"
 msgstr ""
 
-#: events/views.py:144
+#: events/views.py:145
+msgid "You can not update this team event."
+msgstr ""
+
+#: events/views.py:160
+msgid "Your registration has been saved"
+msgstr ""
+
+#: events/views.py:198
 msgid "New Global Event created"
 msgstr ""
 
-#: events/views.py:155
+#: events/views.py:209
 msgid "You can not add a new global event."
 msgstr ""
 
-#: events/views.py:169
+#: events/views.py:225
 msgid "Global Event updated"
 msgstr ""
 
-#: teams/models.py:8
+#: events/views.py:236
+msgid "You can not update this global event."
+msgstr ""
+
+#: teams/forms.py:22 templates/teams/team_list.html:19
+msgid "Search"
+msgstr ""
+
+#: teams/models.py:9
 msgid "Launchpad ID"
 msgstr ""
 
-#: teams/models.py:13
+#: teams/models.py:14
 msgid "Launchpad Team ID"
 msgstr ""
 
-#: teams/models.py:14
+#: teams/models.py:15
 msgid "Team Name"
 msgstr ""
 
-#: teams/models.py:15
+#: teams/models.py:16
 msgid "Country"
 msgstr ""
 
-#: teams/models.py:16
+#: teams/models.py:17
 msgid "State/Province/Region"
 msgstr ""
 
-#: teams/models.py:17 templates/venues/venue_detail.html:19
+#: teams/models.py:18 templates/venues/venue_detail.html:19
 msgid "City"
 msgstr ""
 
-#: teams/models.py:18
+#: teams/models.py:19
 msgid "Ubuntu Wiki Page"
 msgstr ""
 
-#: teams/models.py:19
+#: teams/models.py:20
 msgid "Website"
 msgstr ""
 
-#: teams/models.py:20
+#: teams/models.py:21
 msgid "Mailing List URL"
 msgstr ""
 
-#: teams/models.py:21
+#: teams/models.py:22
 msgid "Forums URL"
 msgstr ""
 
-#: teams/models.py:22 templates/teams/team_detail.html:80
+#: teams/models.py:23 templates/teams/team_detail.html:79
 msgid "Email Address"
 msgstr ""
 
-#: teams/models.py:23 templates/teams/team_detail.html:74
+#: teams/models.py:24 templates/teams/team_detail.html:73
 msgid "IRC Channel"
 msgstr ""
 
-#: teams/models.py:25
+#: teams/models.py:26
 msgid ""
 "IRC Channel name that is hosted on the freenode IRC network. Ex. #ubuntu-"
 "chicago"
 msgstr ""
 
-#: teams/models.py:27
+#: teams/models.py:28
 msgid "Provides local support"
 msgstr ""
 
-#: teams/models.py:29
+#: teams/models.py:30
 msgid "Approved Team"
 msgstr ""
 
-#: teams/models.py:30
+#: teams/models.py:31
 msgid "Date Approved"
 msgstr ""
 
-#: teams/models.py:31
+#: teams/models.py:32
 msgid "Date Expires"
 msgstr ""
 
-#: teams/models.py:32
+#: teams/models.py:33
 msgid "Launchpad Team Owner"
 msgstr ""
 
-#: teams/models.py:34
+#: teams/models.py:35
 msgid "URL of mugshot"
 msgstr ""
 
-#: teams/views.py:88
+#: teams/views.py:97
 msgid "Team details updated"
 msgstr ""
 
-#: teams/views.py:91
+#: teams/views.py:100
 msgid "Team details could not be saved."
 msgstr ""
 
@@ -456,6 +480,14 @@
 msgstr ""
 
 #: templates/events/event_list.html:32
+msgid "Get the team events in ical Calendar format"
+msgstr ""
+
+#: templates/events/event_list.html:32
+msgid "Calendar ical"
+msgstr ""
+
+#: templates/events/event_list.html:36
 msgid "There are currently no  LoCo Team Events :("
 msgstr ""
 
@@ -485,7 +517,6 @@
 
 #: templates/events/global_event_detail.html:22
 #: templates/events/global_event_detail.html:46
-#: templates/events/team_event_detail.html:22
 #: templates/events/team_event_detail.html:46
 msgid "Comment:"
 msgstr ""
@@ -556,10 +587,35 @@
 msgid "Edit team event details."
 msgstr ""
 
-#: templates/events/team_event_detail.html:50
+#: templates/events/team_event_detail.html:22
+msgid "Description:"
+msgstr ""
+
+#: templates/events/team_event_detail.html:52
+msgid "Change your Registration Status"
+msgstr ""
+
+#: templates/events/team_event_detail.html:54
+msgid "Register for this Event"
+msgstr ""
+
+#: templates/events/team_event_detail.html:57
+msgid ""
+"You must <a href=\"/openid/login\">log in</a> to register for this event."
+msgstr ""
+
+#: templates/events/team_event_detail.html:62
 msgid "Event Attendees"
 msgstr ""
 
+#: templates/events/team_event_detail.html:62
+msgid "Registration Status"
+msgstr ""
+
+#: templates/events/team_event_detail.html:62
+msgid "Guests"
+msgstr ""
+
 #: templates/events/team_event_new.html:4
 msgid "New Team Event"
 msgstr ""
@@ -568,6 +624,14 @@
 msgid "Add new Team Event"
 msgstr ""
 
+#: templates/events/team_event_register.html:4
+msgid "Team Event Registration"
+msgstr ""
+
+#: templates/events/team_event_register.html:12
+msgid "Register for event "
+msgstr ""
+
 #: templates/events/team_event_update.html:4
 #: templates/events/team_event_update.html:12
 msgid "Update Team Event"
@@ -581,63 +645,63 @@
 msgid "Edit team details."
 msgstr ""
 
-#: templates/teams/team_detail.html:24
+#: templates/teams/team_detail.html:23
 msgid "Add new Event."
 msgstr ""
 
-#: templates/teams/team_detail.html:34
+#: templates/teams/team_detail.html:33
 msgid "Location:"
 msgstr ""
 
-#: templates/teams/team_detail.html:38 templates/teams/team_detail.html:100
+#: templates/teams/team_detail.html:37 templates/teams/team_detail.html:100
 msgid "None Specified"
 msgstr ""
 
-#: templates/teams/team_detail.html:43
+#: templates/teams/team_detail.html:42
 msgid "Team Owner:"
 msgstr ""
 
-#: templates/teams/team_detail.html:49
+#: templates/teams/team_detail.html:48
 msgid "Approval Date:"
 msgstr ""
 
-#: templates/teams/team_detail.html:55
+#: templates/teams/team_detail.html:54
 msgid "Expires Date:"
 msgstr ""
 
-#: templates/teams/team_detail.html:61
+#: templates/teams/team_detail.html:60
 msgid "Admins:"
 msgstr ""
 
-#: templates/teams/team_detail.html:68
+#: templates/teams/team_detail.html:67
 msgid "Resources:"
 msgstr ""
 
-#: templates/teams/team_detail.html:71
+#: templates/teams/team_detail.html:70
 msgid "Team Wiki"
 msgstr ""
 
-#: templates/teams/team_detail.html:77
+#: templates/teams/team_detail.html:76
 msgid "Team Mailing List"
 msgstr ""
 
-#: templates/teams/team_detail.html:83
+#: templates/teams/team_detail.html:82
 msgid "Team Forums"
 msgstr ""
 
-#: templates/teams/team_detail.html:86
+#: templates/teams/team_detail.html:85
 msgid "Team Website"
 msgstr ""
 
-#: templates/teams/team_detail.html:89
+#: templates/teams/team_detail.html:88
 msgid "Provides Support"
 msgstr ""
 
-#: templates/teams/team_detail.html:95
+#: templates/teams/team_detail.html:94
 msgid "Upcoming Events:"
 msgstr ""
 
-#: templates/teams/team_detail.html:99
+#: templates/teams/team_detail.html:98
 #, python-format
 msgid "%(start_date)s in %(city)s"
 msgstr ""
@@ -665,15 +729,15 @@
 msgid "Ubuntu LoCo Teams List"
 msgstr ""
 
-#: templates/teams/team_list.html:9
+#: templates/teams/team_list.html:12
 msgid "Ubuntu LoCo Teams"
 msgstr ""
 
-#: templates/teams/team_list.html:13
+#: templates/teams/team_list.html:16
 msgid "Select a team below to see more information about it:"
 msgstr ""
 
-#: templates/teams/team_list.html:27
+#: templates/teams/team_list.html:34
 msgid "There are currently no teams in the Ubuntu LoCo Directory. :("
 msgstr ""
 

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2009-12-21 20:45:43 +0000
+++ loco_directory/templates/events/team_event_detail.html	2010-01-10 14:16:15 +0000
@@ -10,7 +10,7 @@
 		<p><b><a href="{% url team-event-update team_event_object.id %}">{% trans "Edit team event details." %}</a></b></p>
 		{% endif %}
 <h2>{{team_event_object.name}}</h2>
-<table cellpadding="0" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <tr><th colspan="2">{% trans "Event Information" %}</th></tr>
 {% if team_event_object.date_begin %}
 <tr><td width="35%"><strong>{% trans "Date begin:" %}</strong></td><td>{% trans team_event_object.date_begin %}</td></tr>
@@ -18,8 +18,8 @@
 {% if team_event_object.date_end %}
 <tr><td width="35%"><strong>{% trans "Date end:" %}</strong></td><td>{% trans team_event_object.date_end %}</td></tr>
 {% endif %}
-{% if team_event_object.comment %}
-<tr><td width="35%"><strong>{% trans "Comment:" %}</strong></td><td>{% trans team_event_object.comment %}</td></tr>
+{% if team_event_object.description %}
+<tr><td width="35%"><strong>{% trans "Description:" %}</strong></td><td>{% trans team_event_object.description %}</td></tr>
 {% endif %}
 
 <tr><th colspan="2">{% trans "Location Information" %}</th></tr>
@@ -46,10 +46,22 @@
 <tr><td width="35%"><strong>{% trans "Comment:" %}</strong></td><td>{% trans team_event_object.venue.comment %}</td></tr>
 {% endif %}
 
-{% if team_event_object.attendee.all %}
-<tr><th colspan="2">{% trans "Event Attendees" %}</th></tr>
-{% for attendee in team_event_object.attendee.all %}
-{{attendee.name}}
+<tr><td colspan="2">
+{% if user.is_authenticated %}
+{% if user_is_attending %}
+<a href="{% url team-event-register team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
+{% else %}
+<a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
+{% endif %}
+{% else %}
+{% blocktrans %}You must <a href="/openid/login">log in</a> to register for this event.{% endblocktrans %}
+{% endif %}
+</td></tr>
+
+{% if team_event_object.attendee_set.all %}
+<tr><th>{% trans "Event Attendees" %}</th><th>{% trans "Registration Status" %}</th><th>{% trans "Guests" %}</th></tr>
+{% for registration in team_event_object.attendee_set.all %}
+<tr><td>{{registration.attendee.username}}</td><td align="center">{{registration.get_promise_display}}</td><td align="center">{{registration.guests}}</td></tr>
 {% endfor %}
 {% endif %}
 

=== added file 'loco_directory/templates/events/team_event_register.html'
--- loco_directory/templates/events/team_event_register.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_register.html	2010-01-10 14:16:15 +0000
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% load i18n admin_modify adminmedia %}
+
+{% block title %}{% trans "Team Event Registration" %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+{{form.media}}
+{% endblock %}
+
+{% block content %}
+
+<h1>{% trans "Register for event " %}</h1>
+<form action="." method="post">
+    	<table>
+        	{{ form.as_table }}
+    	</table>
+    	<p><input type="submit" value="Submit" /></p>
+</form>
+
+
+{% endblock %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-01-06 19:14:12 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-01-10 14:16:15 +0000
@@ -95,8 +95,9 @@
 		  <td>{% if team.teamevent_set.next_5_events %}
 				  {% for team_event in team.teamevent_set.next_5_events %}
 				  {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
-				  <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>{% if not forloop.last %},{% endif %} (<a href="{% url team-event-list team.lp_name %}">{% trans "Show detailed Event List" %}</a>)
-				  {% endfor %}{% else %}{% trans "None Specified" %}{% endif %}</td>
+				  <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>{% if not forloop.last %},{% endif %} 
+				  {% endfor %} (<a href="{% url team-event-list team.lp_name %}">{% trans "Show detailed Event List" %}</a>)
+				  {% else %}{% trans "None Specified" %}{% endif %}</td>
         </tr>
 
       </table>