diff --git a/events/views.py b/events/views.py index 43b15c5..13b23bf 100644 --- a/events/views.py +++ b/events/views.py @@ -120,11 +120,20 @@ def attend_event(request, event_id): if request.user.is_anonymous: messages.add_message(request, messages.WARNING, message=_("You must be logged in to say you're attending.")) return redirect(event.get_absolute_url()) - if request.user.profile in event.attendees.all(): - messages.add_message(request, messages.INFO, message=_('You are already attending this event.')) - return redirect(event.get_absolute_url()) - new_attendee = Attendee.objects.create(event=event, user=request.user.profile, role=Attendee.NORMAL, status=Attendee.YES) - messages.add_message(request, messages.SUCCESS, message=_("We'll see you there!")) + + try: + attendee = Attendee.objects.get(event=event, user=request.user.profile) + except: + attendee = Attendee(event=event, user=request.user.profile, role=Attendee.NORMAL) + + attendee.status = Attendee.YES + if request.GET.get('response', None) == 'maybe': + attendee.status = Attendee.MAYBE + if request.GET.get('response', None) == 'no': + attendee.status = Attendee.NO + attendee.save() + if attendee.status == Attendee.YES: + messages.add_message(request, messages.SUCCESS, message=_("We'll see you there!")) return redirect(event.get_absolute_url()) def comment_event(request, event_id): diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html index 090179f..39fb079 100644 --- a/get_together/templates/get_together/events/show_event.html +++ b/get_together/templates/get_together/events/show_event.html @@ -102,33 +102,41 @@

{{ event.name }}

Hosted by {{ team.name }}

- {% if can_edit_team or is_email_confirmed %} - Invite - {% endif %} - {% if settings.SOCIAL_AUTH_TWITTER_KEY %} - Tweet - {% endif %} - {% if settings.SOCIAL_AUTH_FACEBOOK_KEY %} - Share - {% endif %} - {% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} - Share - {% endif %} - {% if not is_attending %} - Attend - {% endif %} - {% if can_edit_event %} -
- -
- Event Details - Manage Talks -
+ {% if can_edit_team or is_email_confirmed %} + Invite + {% endif %} + {% if settings.SOCIAL_AUTH_TWITTER_KEY %} + Tweet + {% endif %} + {% if settings.SOCIAL_AUTH_FACEBOOK_KEY %} + Share + {% endif %} + {% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} + Share + {% endif %} + {% if not is_attending %} +
+ Attend + +
+ Maybe + No +
- {% endif %} -
+ {% endif %} + {% if can_edit_event %} +
+ +
+ Event Details + Manage Talks +
+
+ {% endif %}

{{ event.summary|markdown }}

@@ -232,7 +240,7 @@
-

Attendees ({{attendee_list.count}})

+

Attendees ({{attendee_count}})

{% for attendee in attendee_list %}
@@ -242,7 +250,36 @@
{{attendee.user}} - {{ attendee.status_name }}
+ {% if attendee.user.user == request.user %} + {% if attendee.status == attendee.YES %} + +
+ Maybe + No +
+ {% elif attendee.status == attendee.MAYBE %} + +
+ Yes + No +
+ {% elif attendee.status == attendee.NO %} + +
+ Yes + Maybe +
+ {% endif %} + {% else %} + {% if attendee.status == attendee.YES %} + {{ attendee.status_name }} + {% elif attendee.status == attendee.MAYBE %} + {{ attendee.status_name }} + {% elif attendee.status == attendee.NO %} + {{ attendee.status_name }} + {% endif %} + {% endif %} + {% if attendee.role > 0 %}{{ attendee.role_name }}{% endif %}
diff --git a/get_together/views/events.py b/get_together/views/events.py index e7955e3..79e8963 100644 --- a/get_together/views/events.py +++ b/get_together/views/events.py @@ -69,7 +69,8 @@ def show_event(request, event_id, event_slug): 'event': event, 'comment_form': comment_form, 'is_attending': request.user.profile in event.attendees.all(), - 'attendee_list': Attendee.objects.filter(event=event), + 'attendee_list': Attendee.objects.filter(event=event).order_by('-status'), + 'attendee_count': Attendee.objects.filter(event=event, status=Attendee.YES).count(), 'presentation_list': event.presentations.filter(status=Presentation.ACCEPTED).order_by('start_time'), 'pending_presentations': event.presentations.filter(status=Presentation.PROPOSED).count(), 'can_edit_event': request.user.profile.can_edit_event(event),