From 83ef285f8f103d4a71d480a4bd5904251f263557 Mon Sep 17 00:00:00 2001 From: Michael Hall Date: Wed, 16 May 2018 21:30:32 -0400 Subject: [PATCH] Add ability for an event host to view and contact attendees. Add ability for an event host to mark if an attendee actually attended or not after the event is over. Fixes #71 --- events/forms.py | 4 + .../0030_add_attendee_actual_status.py | 23 ++++ events/models/events.py | 11 +- .../get_together/emails/attendee_contact.html | 13 ++ .../get_together/emails/attendee_contact.txt | 11 ++ .../get_together/events/manage_attendees.html | 130 ++++++++++++++++++ .../get_together/events/show_event.html | 7 +- get_together/urls.py | 2 + get_together/views/events.py | 129 +++++++++++++++++ 9 files changed, 327 insertions(+), 3 deletions(-) create mode 100644 events/migrations/0030_add_attendee_actual_status.py create mode 100644 get_together/templates/get_together/emails/attendee_contact.html create mode 100644 get_together/templates/get_together/emails/attendee_contact.txt create mode 100644 get_together/templates/get_together/events/manage_attendees.html diff --git a/events/forms.py b/events/forms.py index 52bb0d2..9fb7def 100644 --- a/events/forms.py +++ b/events/forms.py @@ -265,6 +265,10 @@ class EventInviteMemberForm(forms.Form): class EventInviteEmailForm(forms.Form): emails = MultiEmailField(label=_(""), widget=forms.widgets.Textarea) +class EventContactForm(forms.Form): + to = forms.ChoiceField(label=_("")) + body = forms.CharField(label=_(""), widget=forms.widgets.Textarea) + class EventSeriesForm(forms.ModelForm): class Meta: model = EventSeries diff --git a/events/migrations/0030_add_attendee_actual_status.py b/events/migrations/0030_add_attendee_actual_status.py new file mode 100644 index 0000000..1793bf9 --- /dev/null +++ b/events/migrations/0030_add_attendee_actual_status.py @@ -0,0 +1,23 @@ +# Generated by Django 2.0 on 2018-05-17 00:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0029_add_team_premium_fields'), + ] + + operations = [ + migrations.AddField( + model_name='attendee', + name='actual', + field=models.SmallIntegerField(choices=[(-1, 'No'), (0, 'Maybe'), (1, 'Yes')], db_index=True, default=0, verbose_name='Attended'), + ), + migrations.AlterField( + model_name='attendee', + name='status', + field=models.SmallIntegerField(choices=[(-1, 'No'), (0, 'Maybe'), (1, 'Yes')], db_index=True, default=1, verbose_name='Attending'), + ), + ] diff --git a/events/models/events.py b/events/models/events.py index 2115cea..3f2ff13 100644 --- a/events/models/events.py +++ b/events/models/events.py @@ -77,6 +77,10 @@ class Event(models.Model): attendees = models.ManyToManyField(UserProfile, through='Attendee', related_name="attending", blank=True) + @property + def is_over(self): + return self.end_time <= timezone.now() + @property def tz(self): if self.place is not None: @@ -210,7 +214,8 @@ class Attendee(models.Model): event = models.ForeignKey(Event, on_delete=models.CASCADE) user = models.ForeignKey(UserProfile, on_delete=models.CASCADE) role = models.SmallIntegerField(_("Role"), choices=ROLES, default=NORMAL, db_index=True) - status = models.SmallIntegerField(_("Attending?"), choices=STATUSES, default=YES, db_index=True) + status = models.SmallIntegerField(_("Attending"), choices=STATUSES, default=YES, db_index=True) + actual = models.SmallIntegerField(_("Attended"), choices=STATUSES, default=MAYBE, db_index=True) joined_date = models.DateTimeField(default=timezone.now) last_reminded = models.DateTimeField(null=True, blank=True) @@ -222,6 +227,10 @@ class Attendee(models.Model): def status_name(self): return Attendee.STATUSES[self.status+1][1] + @property + def actual_name(self): + return Attendee.STATUSES[self.actual+1][1] + def __str__(self): return "%s at %s" % (self.user, self.event) diff --git a/get_together/templates/get_together/emails/attendee_contact.html b/get_together/templates/get_together/emails/attendee_contact.html new file mode 100644 index 0000000..d74e7ea --- /dev/null +++ b/get_together/templates/get_together/emails/attendee_contact.html @@ -0,0 +1,13 @@ +{% extends "get_together/emails/base.html" %} + +{% block content %} +

Message about {{event.name|striptags}}

+ +

Sender: {{ sender|striptags }}

+ +

{{body|striptags}}

+ +
+Go to the event page. +

+{% endblock %} diff --git a/get_together/templates/get_together/emails/attendee_contact.txt b/get_together/templates/get_together/emails/attendee_contact.txt new file mode 100644 index 0000000..827eb40 --- /dev/null +++ b/get_together/templates/get_together/emails/attendee_contact.txt @@ -0,0 +1,11 @@ +{% extends 'get_together/emails/base.txt' %} +{% block content %} +== Message about {{event.name}} == + +Sender: {{ sender }} + +{{ body|striptags }} + +Event page: {{event.get_full_url}} + +{% endblock %} diff --git a/get_together/templates/get_together/events/manage_attendees.html b/get_together/templates/get_together/events/manage_attendees.html new file mode 100644 index 0000000..a1fc9fa --- /dev/null +++ b/get_together/templates/get_together/events/manage_attendees.html @@ -0,0 +1,130 @@ +{% extends "get_together/base.html" %} +{% load static markup tz %} + +{% block add_to_title %} | {{team.name}}{% endblock %} + +{% block styles %} + + +{% endblock %} + +{% block content %} +
+
+
+

{{attendees.count}} Attendees for {{ event.name }} +

+

Invite Attendees

+ +
+
+ {% for attendee in attendees %} +
+
+
+ + + + {% if event.is_over and attendee.actual != attendee.MAYBE %} + {% if attendee.actual == attendee.YES %} + {{ attendee.actual_name }} + {% elif attendee.actual == attendee.NO %} + {{ attendee.actual_name }} + {% endif %} + {% else %} + {% if attendee.status == attendee.YES %} + {{ attendee.status_name }} + {% elif attendee.status == attendee.NO %} + {{ attendee.status_name }} + {% elif attendee.status == attendee.MAYBE %} + {{ attendee.status_name }} + {% endif %} + {% endif %} +
+
+
+ {{attendee.user}} + {% if attendee.user.user.account.is_email_confirmed %} + + {% endif %} +
+ {% if event.is_over %} +
+ Attended:
+
+ Yes + No +
+
+ {% endif %} +
+
+
+ {% endfor %} +
+
+
+ +
+ +
+
+

Contact

+
+
+
+ {% csrf_token %} + {{ contact_form.as_p }} + +
+
+
+
+
+
+
+{% endblock %} + +{% block javascript %} + +{% endblock %} \ No newline at end of file diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html index 12edde8..0e97571 100644 --- a/get_together/templates/get_together/events/show_event.html +++ b/get_together/templates/get_together/events/show_event.html @@ -114,7 +114,7 @@ {% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} Share {% endif %} - {% if not is_attending %} + {% if not event.is_over and not is_attending %}
Attend
{% endif %} @@ -183,7 +184,9 @@ {% for presentation in presentation_list %}
{{presentation.talk.title}} by {{presentation.talk.speaker.user}}, {{presentation.talk.speaker.title}}
{% endfor %} + {% if not event.is_over %} Propose a talk + {% endif %} {% if pending_presentations and can_edit_event %} {{pending_presentations}} proposed talks {% endif %} @@ -250,7 +253,7 @@
{{attendee.user}} - {% if attendee.user.user == request.user %} + {% if attendee.user.user == request.user and not event.is_over %} {% if attendee.status == attendee.YES %}
diff --git a/get_together/urls.py b/get_together/urls.py index d6a95d5..1ddb6a3 100644 --- a/get_together/urls.py +++ b/get_together/urls.py @@ -79,6 +79,8 @@ urlpatterns = [ path('team//+create-event/', views.create_event, name='create-event'), path('events//+edit/', views.edit_event, name='edit-event'), path('events//+attend/', views.attend_event, name='attend-event'), + path('events//+attended/', views.attended_event, name='attended-event'), + path('events//+attendees/', views.manage_attendees, name='manage-attendees'), path('events//+invite/', views.invite_attendees, name='invite-attendees'), path('events//+delete/', views.delete_event, name='delete-event'), path('events//+add_place/', views.add_place_to_event, name='add-place'), diff --git a/get_together/views/events.py b/get_together/views/events.py index 95d7c39..dd5908d 100644 --- a/get_together/views/events.py +++ b/get_together/views/events.py @@ -9,6 +9,7 @@ from django.utils import timezone from django.core.mail import send_mail from django.template.loader import get_template, render_to_string from django.conf import settings +from django.http import JsonResponse from events.models.events import ( Event, @@ -35,6 +36,7 @@ from events.forms import ( NewCommonEventForm, EventInviteEmailForm, EventInviteMemberForm, + EventContactForm, ) from events import location @@ -148,6 +150,80 @@ def create_event(request, team_id): return redirect('home') +@login_required +def manage_attendees(request, event_id): + event = get_object_or_404(Event, id=event_id) + if not request.user.profile.can_edit_event(event): + messages.add_message(request, messages.WARNING, message=_('You can not manage this event\'s attendees.')) + return redirect(event.get_absolute_url()) + attendees = Attendee.objects.filter(event=event).order_by('-actual', '-status', 'user__realname') + + attendee_choices = [(attendee.id, attendee.user) for attendee in attendees if attendee.user.user.account.is_email_confirmed] + default_choices = [('all', 'Everyone (%s)' % len(attendee_choices)), ('hosts', 'Only Hosts')] + if event.is_over: + default_choices.append(('attended', 'Only Attended')) + else: + default_choices.append(('attending', 'Only Attending')) + + if request.method == 'POST': + contact_form = EventContactForm(request.POST) + contact_form.fields['to'].choices = default_choices + attendee_choices + if contact_form.is_valid(): + to = contact_form.cleaned_data['to'] + body = contact_form.cleaned_data['body'] + if to is not 'hosts' and not request.user.profile.can_edit_event(event): + messages.add_message(request, messages.WARNING, message=_('You can not contact this events\'s attendees.')) + return redirect(event.get_absolute_url()) + if to == 'all': + count = 0 + for attendee in Attendee.objects.filter(event=event): + if attendee.user.user.account.is_email_confirmed: + contact_attendee(attendee, body, request.user.profile) + count += 1 + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s attendees' % count)) + elif to == 'hosts': + count = 0 + for attendee in Attendee.objects.filter(event=event, role=Attendee.HOST): + if attendee.user.user.account.is_email_confirmed: + contact_attendee(attendee, body, request.user.profile) + count += 1 + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s attendees' % count)) + elif to == 'attending': + count = 0 + for attendee in Attendee.objects.filter(event=event, status=Attendee.YES): + if attendee.user.user.account.is_email_confirmed: + contact_attendee(attendee, body, request.user.profile) + count += 1 + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s attendees' % count)) + elif to == 'attended': + count = 0 + for attendee in Attendee.objects.filter(event=event, actual=Attendee.YES): + if attendee.user.user.account.is_email_confirmed: + contact_attendee(attendee, body, request.user.profile) + count += 1 + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s attendees' % count)) + else: + try: + attendee = Attendee.objects.get(id=to) + contact_attendee(attendee, body, request.user.profile) + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s' % attendee.user)) + except Member.DoesNotExist: + messages.add_message(request, messages.ERROR, message=_('Error sending message: Unknown user (%s)'%to)) + pass + return redirect('manage-attendees', event.id) + else: + messages.add_message(request, messages.ERROR, message=_('Error sending message: %s' % contact_form.errors)) + else: + contact_form = EventContactForm() + contact_form.fields['to'].choices = default_choices + attendee_choices + context = { + 'event': event, + 'attendees': attendees, + 'contact_form': contact_form, + 'can_edit_event': request.user.profile.can_edit_event(event), + } + return render(request, 'get_together/events/manage_attendees.html', context) + @login_required def invite_attendees(request, event_id): event = get_object_or_404(Event, id=event_id) @@ -242,12 +318,47 @@ def invite_attendee(email, event, sender): ) +def contact_attendee(attendee, body, sender): + context = { + 'sender': sender, + 'event': attendee.event, + 'body': body, + 'site': Site.objects.get(id=1), + } + email_subject = '[GetTogether] Message about %s' % attendee.event.name + email_body_text = render_to_string('get_together/emails/attendee_contact.txt', context) + email_body_html = render_to_string('get_together/emails/attendee_contact.html', context) + email_recipients = [attendee.user.user.email] + email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') + + success = send_mail( + from_email=email_from, + html_message=email_body_html, + message=email_body_text, + recipient_list=email_recipients, + subject=email_subject, + fail_silently=True, + ) + EmailRecord.objects.create( + sender=sender.user, + recipient=attendee.user.user, + email=attendee.user.user.email, + subject=email_subject, + body=email_body_text, + ok=success + ) + + def attend_event(request, event_id): event = Event.objects.get(id=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 event.is_over: + messages.add_message(request, messages.WARNING, message=_("You can not change your status on an event that has ended.")) + return redirect(event.get_absolute_url()) + try: attendee = Attendee.objects.get(event=event, user=request.user.profile) except: @@ -265,6 +376,24 @@ def attend_event(request, event_id): return redirect(event.get_absolute_url()) +def attended_event(request, event_id): + event = get_object_or_404(Event, id=event_id) + attendee = get_object_or_404(Attendee, id=request.GET.get('attendee', None)) + if request.user.is_anonymous: + return JsonResponse({'status': 'ERROR', 'message': _("You must be logged in mark an attendee's actual status.")}) + + if not event.is_over: + return JsonResponse({'status': 'ERROR', 'message': _("You can not set an attendee's actual status until the event is over")}) + + if request.GET.get('response', None) == 'yes': + attendee.actual = Attendee.YES + if request.GET.get('response', None) == 'no': + attendee.actual = Attendee.NO + attendee.save() + + return JsonResponse({'status': 'OK', 'attendee_id': attendee.id, 'actual': attendee.actual_name}) + + def comment_event(request, event_id): event = Event.objects.get(id=event_id) if request.user.is_anonymous: