From 7c5c1553701ed19aeba9b7b168a68ae12f8ef698 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 20 Sep 2016 18:44:23 +1000
Subject: [PATCH 1/2] Shows an email address.

---
 registrasion/reporting/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 0d7b261f..50901821 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -581,13 +581,14 @@ def attendee_data(request, form, user_id=None):
         AttendeeProfile._meta.get_field(field).verbose_name for field in fields
     ]
 
-    headings = ["User ID", "Name", "Product", "Item Status"] + field_names
+    headings = ["User ID", "Name", "Email", "Product", "Item Status"] + field_names
     data = []
     for item in items:
         profile = by_user[item.cart.user]
         line = [
             item.cart.user.id,
             getattr(profile, name_field),
+            profile.attendee.user.email,
             item.product,
             status_display[item.cart.status],
         ] + [

From 94a8c3e3d922da1f0ad5c16b3ab62148c798d888 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 20 Sep 2016 19:18:09 +1000
Subject: [PATCH 2/2] Adds speaker registration data.

Addresses #77
---
 registrasion/reporting/forms.py | 10 +++++++++
 registrasion/reporting/views.py | 39 +++++++++++++++++++++++++++++++++
 registrasion/urls.py            |  5 +++++
 3 files changed, 54 insertions(+)

diff --git a/registrasion/reporting/forms.py b/registrasion/reporting/forms.py
index 2e983491..010a8f24 100644
--- a/registrasion/reporting/forms.py
+++ b/registrasion/reporting/forms.py
@@ -1,6 +1,8 @@
 from registrasion.models import conditions
 from registrasion.models import inventory
 
+from symposion.proposals import models as proposals_models
+
 from django import forms
 
 # Reporting forms.
@@ -31,6 +33,14 @@ class UserIdForm(forms.Form):
     )
 
 
+class ProposalKindForm(forms.Form):
+    kind = forms.ModelMultipleChoiceField(
+        queryset=proposals_models.ProposalKind.objects.all(),
+        required=False,
+    )
+
+
+
 def model_fields_form_factory(model):
     ''' Creates a form for specifying fields from a model to display. '''
 
diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 50901821..3e3f9308 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -5,6 +5,7 @@ import datetime
 
 from django.conf import settings
 from django.contrib.auth.decorators import user_passes_test
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import F, Q
@@ -18,6 +19,8 @@ from registrasion.models import people
 from registrasion import util
 from registrasion import views
 
+from symposion.schedule import models as schedule_models
+
 from reports import get_all_reports
 from reports import Links
 from reports import ListReport
@@ -600,3 +603,39 @@ def attendee_data(request, form, user_id=None):
         "Attendees by item with profile data", headings, data, link_view=attendee
     ))
     return output
+
+
+@report_view(
+    "Speaker Registration Status",
+    form_type=forms.ProposalKindForm,
+)
+def speaker_registrations(request, form):
+    ''' Shows registration status for speakers with a given proposal kind. '''
+
+    kinds = form.cleaned_data["kind"]
+
+    presentations = schedule_models.Presentation.objects.filter(
+        proposal_base__kind=kinds,
+    ).exclude(
+        cancelled=True,
+    )
+
+    users = User.objects.filter(
+        Q(speaker_profile__presentations__in=presentations) |
+        Q(speaker_profile__copresentations__in=presentations)
+    )
+
+    paid_carts = commerce.Cart.objects.filter(status=commerce.Cart.STATUS_PAID)
+
+    paid_carts = Case(When(cart__in=paid_carts, then=Value(1)), default=Value(0), output_field=models.IntegerField())
+    users = users.annotate(paid_carts=Sum(paid_carts))
+    users=users.order_by("paid_carts")
+
+    return QuerysetReport(
+        "Speaker Registration Status",
+        ["id", "speaker_profile__name", "email", "paid_carts",],
+        users,
+        link_view=attendee,
+    )
+
+    return []
diff --git a/registrasion/urls.py b/registrasion/urls.py
index d7e440df..c7f008d0 100644
--- a/registrasion/urls.py
+++ b/registrasion/urls.py
@@ -54,6 +54,11 @@ reports = [
     ),
     url(r"^product_status/?$", rv.product_status, name="product_status"),
     url(r"^reconciliation/?$", rv.reconciliation, name="reconciliation"),
+    url(
+        r"^speaker_registrations/?$",
+        rv.speaker_registrations,
+        name="speaker_registrations",
+    ),
 ]