Merge lp:~rorymcc/loco-team-portal/bug-600134 into lp:loco-team-portal

[Rory McCann]

[lp:~rorymcc/loco-team-portal/bug-600134]

264. By Michael Hall on 2010-08-28

Add User Profiles, merge from Daniel Holbach

265. By Michael Hall on 2010-08-28

Redesign of Global Events to match Team Event redesign, merge from Chris Johnston

267. By Rory McCann on 2010-08-28

Allow one to update the number of guests one is bringing

268. By Rory McCann on 2010-08-28

Changes for user profile

269. By Rory McCann on 2010-08-28

more fixes for supporting user profiles

270. By Rory McCann on 2010-08-28

changes to fix for profiles

[Michael Hall (mhall119)]

Traceback:
File "/usr/lib/pymodules/python2.6/django/core/handlers/base.py" in get_response
  92. response = callback(request, *callback_args, **callback_kwargs)
File "/home/mhall/projects/LD/loco-directory/loco_directory/events/views.py" in team_event_detail
  123. 'user_has_rsvped': team_event_object.has_rsvped(request.user),
File "/home/mhall/projects/LD/loco-directory/loco_directory/events/models.py" in has_rsvped
  153. return self.attendee_set.filter(attendee=user).count() > 0
File "/usr/lib/pymodules/python2.6/django/db/models/manager.py" in filter
  129. return self.get_query_set().filter(*args, **kwargs)
File "/usr/lib/pymodules/python2.6/django/db/models/query.py" in filter
  498. return self._filter_or_exclude(False, *args, **kwargs)
File "/usr/lib/pymodules/python2.6/django/db/models/query.py" in _filter_or_exclude
  516. clone.query.add_q(Q(*args, **kwargs))
File "/usr/lib/pymodules/python2.6/django/db/models/sql/query.py" in add_q
  1675. can_reuse=used_aliases)
File "/usr/lib/pymodules/python2.6/django/db/models/sql/query.py" in add_filter
  1569. negate=negate, process_extras=process_extras)
File "/usr/lib/pymodules/python2.6/django/db/models/sql/query.py" in setup_joins
  1737. "Choices are: %s" % (name, ", ".join(names)))

Exception Type: FieldError at /events/team/13/detail/
Exception Value: Cannot resolve keyword 'attendee' into field. Choices are: attendee_profile, guests, id, promise, team_event

review: Needs Fixing

[Chris Johnston (cjohnston)]

Rejecting due to how old code is.

review: Disapprove

Unmerged revisions

270. By Rory McCann on 2010-08-28

changes to fix for profiles

269. By Rory McCann on 2010-08-28

more fixes for supporting user profiles

268. By Rory McCann on 2010-08-28

Changes for user profile

267. By Rory McCann on 2010-08-28

Allow one to update the number of guests one is bringing

266. By Rory McCann on 2010-08-28

Added simple way to mark if you are coming to an event or not

=== modified file 'INSTALL'
--- INSTALL	2010-07-01 06:27:09 +0000
+++ INSTALL	2010-08-28 16:20:56 +0000
@@ -1,4 +1,4 @@
-For Postgresql:
+    For Postgresql:
  - sudo apt-get install postgresql-8.3 python-psycopg2 
 # not sure if necessary
 # - sudo passwd postgres

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-08-24 15:24:24 +0000
+++ loco_directory/events/models.py	2010-08-28 16:20:56 +0000
@@ -124,6 +124,46 @@
         else:
             return False
 
+    def has_rsvped(self, user):
+        """
+        Has this user 'RSVPed'? i.e. has this user given us an answer if they
+        will or will not be coming?
+        """
+        if user.is_authenticated():
+            return self.attendee_set.filter(attendee_profile__user=user).count() > 0
+        else:
+            return False
+
+    def attendee(self, user):
+        """
+        The attendee for this user for this event. If they are not logged in,
+        or they have not RSVPed, then None is returned
+        """
+        if user.is_authenticated() and self.has_rsvped(user):
+            return self.attendee_set.get(attendee_profile__user=user)
+        else:
+            return None
+
+    def has_rsvped(self, user):
+        """
+        Has this user 'RSVPed'? i.e. has this user given us an answer if they
+        will or will not be coming?
+        """
+        if user.is_authenticated():
+            return self.attendee_set.filter(attendee=user).count() > 0
+        else:
+            return False
+
+    def attendee(self, user):
+        """
+        The attendee for this user for this event. If they are not logged in,
+        or they have not RSVPed, then None is returned
+        """
+        if user.is_authenticated() and self.has_rsvped(user):
+            return self.attendee_set.get(attendee=user)
+        else:
+            return None
+
     def total_attending(self):
         total_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="sure"))
         total_attending_registered = queryset_count('attendee', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="sure"))
@@ -169,3 +209,4 @@
         return self.attendee_profile.user.username
 
 
+

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2010-08-17 12:00:55 +0000
+++ loco_directory/events/urls.py	2010-08-28 16:20:56 +0000
@@ -7,7 +7,12 @@
     #team events
     url(r'^team/ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
     url(r'^team/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-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+)/register/attending/(?P<promise>\w+)$', 'events.views.team_event_register_attending_status', name='team-event-register-attending-status'),
+    url(r'^team/(?P<team_event_id>\d+)/register/guests/$', 'events.views.team_event_register_guests', name='team-event-register-guests'),
+
     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+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
     url(r'^team/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-08-24 15:24:24 +0000
+++ loco_directory/events/views.py	2010-08-28 16:20:56 +0000
@@ -8,7 +8,7 @@
 from events.models import TeamEvent
 from events.models import GlobalEvent
 from teams.models import Team, Country, Continent
-from events.models import Attendee
+from events.models import Attendee, ATTENDEE_PROMISE_CHOICES
 
 from forms import TeamEventForm
 from forms import TeamEventCommentForm
@@ -120,6 +120,8 @@
     context = {
         'team_event_object': team_event_object,
         'user_is_attending': team_event_object.is_attending(request.user),
+        'user_has_rsvped': team_event_object.has_rsvped(request.user),
+        'user_attendee': team_event_object.attendee(request.user),
         'user_is_team_member': is_member,
     }
     return render_to_response('events/team_event_detail.html', 
@@ -332,6 +334,56 @@
                                      context, RequestContext(request))
 
 
+@login_required
+def team_event_register_attending_status(request, team_event_id, promise):
+    """
+    Simple one-shot view to change you attending status. 'promise' is the
+    'sure'/'maybe'/'not' which is your status. This can be used to update your
+    existing status
+    You are redirect back to the event page when done.
+    """
+    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    if team_event_object.has_rsvped(request.user):
+        attendee_object = team_event_object.attendee_set.get(attendee_profile__user=request.user)
+    else:
+        from userprofiles.models import create_profile
+        profile = create_profile(request.user.username)
+        attendee_object = Attendee(team_event=team_event_object, attendee_profile=profile, guests=0)
+        
+    if request.method == 'POST':
+        if promise in [x[0] for x in ATTENDEE_PROMISE_CHOICES]:
+            attendee_object.promise = str(promise)
+            attendee_object.save()
+            request.user.message_set.create(message=_('Your registration has been saved.'))
+    
+    return redirect( team_event_object )
+
+@login_required
+def team_event_register_guests(request, team_event_id):
+    """
+    Updates the number of guests that a person is bringing
+    """
+    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    if team_event_object.has_rsvped(request.user):
+        attendee_object = team_event_object.attendee_set.get(attendee_profile__user=request.user)
+    else:
+        from userprofiles.models import create_profile
+        profile = create_profile(request.user.username)
+        attendee_object = Attendee(team_event=team_event_object, attendee_profile=profile, guests=0)
+        
+    if request.method == 'POST':
+        try:
+            guests = int(request.POST['guests'])
+            if 0 <= guests <= 10:
+                attendee_object.guests = guests
+                attendee_object.save()
+                request.user.message_set.create(message=_('Saved your number of guests'))
+        except:
+            pass
+
+    
+    return redirect( team_event_object )
+
 def team_event_comment_new(request, team_event_id):
     """
     create a comment for a team event

=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css	2010-08-27 07:21:09 +0000
+++ loco_directory/media/css/newstyle.css	2010-08-28 16:20:56 +0000
@@ -175,3 +175,7 @@
 	-webkit-box-shadow:          0px 0px 1px #FFE4B6;
 }
 
+form.inline {
+    display: inline;
+}
+

=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-08-24 15:24:24 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-08-28 16:20:56 +0000
@@ -4,10 +4,55 @@
     <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>
+                {% if user_has_rsvped %}
+                    {% ifequal user_attendee.promise 'sure' %}
+                        <p>{% trans 'You are registered to come to this event' %}
+                           <form class="inline" method="POST" action="{% url team-event-register-guests team_event_object.id %}">
+                               {% blocktrans with user_attendee.guests as guests %}I am bringing <input name="guests" type="number" min="0" max="10" width="2" value="{{ guests }}" /> guests.{% endblocktrans %}
+                               <button submit="submit">{% trans 'Update' %}</button>
+                            </form>
+                        </p>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'maybe' %}">
+                            <button submit="submit">{% trans "I might be coming to this event" %}</button>
+                        </form>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'not'%}">
+                            <button submit="submit">{% trans "&#9785; I'm not coming to this event" %}</button>
+                        </form>
+                    {% endifequal %}
+                    {% ifequal user_attendee.promise 'maybe' %}
+                        <p>{% trans 'You have registered that you might come to this event' %}
+                           <form class="inline" method="POST" action="{% url team-event-register-guests team_event_object.id %}">
+                               {% blocktrans with user_attendee.guests as guests %}I am bringing <input name="guests" type="number" min="0" max="10" width="2" value="{{ guests }}" /> guests.{% endblocktrans %}
+                               <button submit="submit">{% trans 'Update' %}</button>
+                            </form>
+                        </p>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'sure' %}">
+                            <button submit="submit">{% trans "&#9786; I'm coming to this event" %}</button>
+                        </form>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'not' %}">
+                            <button submit="submit">{% trans "&#9785; I'm not coming to this event" %}</button>
+                        </form>
+                    {% endifequal %}
+                    {% ifequal user_attendee.promise 'not' %}
+                        <p>{% trans 'You have registered that you will not be coming to this event' %}</p>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'sure' %}">
+                            <button submit="submit">{% trans "&#9786; I'm coming to this event" %}</button>
+                        </form>
+                        <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'maybe' %}">
+                            <button submit="submit">{% trans "I might be coming to this event" %}</button>
+                        </form>
+                    {% endifequal %}
                 {% else %}
-                    <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
+                    <p>{% trans 'Are you coming to this event?' %}</p>
+                    <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'sure' %}">
+                        <button submit="submit">{% trans "&#9786; I'm coming to this event" %}</button>
+                    </form>
+                    <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'maybe' %}">
+                        <button submit="submit">{% trans "I might be coming to this event" %}</button>
+                    </form>
+                    <form class="inline" method="POST" action="{% url team-event-register-attending-status team_event_object.id 'not' %}">
+                        <button submit="submit">{% trans "&#9785; I'm not coming to this event" %}</button>
+                    </form>
                 {% endif %}
             {% endif %}
         </td>