Make it possible to get additional option counts from tokens

diff --git a/postgresqleu/confreg/backendviews.py b/postgresqleu/confreg/backendviews.py
index a38ed73595b4dce18f042c019cbd38dd5053ce45..19f1cc8a7a838ba1d1eb330f7134736c1c71aa8a 100644 (file)
--- a/postgresqleu/confreg/backendviews.py
+++ b/postgresqleu/confreg/backendviews.py
@@ -639,6 +639,9 @@ def tokendata(request, urlname, token, datatype, dataformat):
                (headers, data) = get_sponsor_dashboard_data(conference)
                writer.columns(headers, True)
                writer.write_rows(data)
+       elif datatype == 'addopts':
+               writer.columns(['Option', 'Confirmed', 'Unconfirmed'])
+               writer.write_query("SELECT ao.name, count(payconfirmedat) AS confirmed, count(r.id) FILTER (WHERE payconfirmedat IS NULL) AS unconfirmed FROM confreg_conferenceadditionaloption ao LEFT JOIN confreg_conferenceregistration_additionaloptions rao ON rao.conferenceadditionaloption_id=ao.id LEFT JOIN confreg_conferenceregistration r ON r.id=rao.conferenceregistration_id WHERE ao.conference_id=%(confid)s GROUP BY ao.id ORDER BY ao.name", {'confid': conference.id})
        else:
                raise Http404()
 

diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py
index d487c29af427f8f543ccd0f408c1632534f616ab..56d5ed2c0f734b13dc4a271d8ad0dae0145e36c9 100644 (file)
--- a/postgresqleu/confreg/models.py
+++ b/postgresqleu/confreg/models.py
@@ -944,6 +944,7 @@ AccessTokenPermissions = (
        ('discounts', 'Discount codes'),
        ('vouchers', 'Voucher codes'),
        ('sponsors', 'Sponsors and counts'),
+       ('addopts', 'Additional options and counts'),
 )
 
 class AccessToken(models.Model):