Add ability to export old survey questions via CSV.

go/apps/surveys/definition.py

@@ -31,8 +31,9 @@ class DownloadUserDataAction(ConversationAction):
     def perform_action(self, action_data):
         # This is Django-only, but the module get imported in vumi-land.
         from go.apps.surveys.tasks import export_vxpolls_data
-        return export_vxpolls_data.delay(self._conv.user_account.key,
-                                         self._conv.key)
+        return export_vxpolls_data.delay(
+            self._conv.user_account.key, self._conv.key,
+            include_old_questions=action_data['include_old_questions'])
 
 
 class ConversationDefinition(ConversationDefinitionBase):

go/apps/surveys/tasks.py

@@ -13,7 +13,7 @@
 
 
 @task(ignore_result=True)
-def export_vxpolls_data(account_key, conversation_key):
+def export_vxpolls_data(account_key, conversation_key, include_old_questions):
     """
     Export the data from a vxpoll and send it as a zipped attachment
     via email.
@@ -25,7 +25,8 @@ def export_vxpolls_data(account_key, conversation_key):
     poll_id = 'poll-%s' % (conversation.key,)
     pm, poll_data = get_poll_config(poll_id)
     poll = pm.get(poll_id)
-    csv_data = pm.export_user_data_as_csv(poll)
+    csv_data = pm.export_user_data_as_csv(
+        poll, include_old_questions=include_old_questions)
     email = EmailMessage(
         'Survey export for: %s' % (conversation.name,),
         'Please find the data for the survey %s attached.\n' % (

go/apps/surveys/view_definition.py

@@ -1,4 +1,4 @@
-from django.forms import Form
+from django.forms import BooleanField, Form
 from django.conf import settings
 from django.contrib import messages
 
@@ -98,12 +98,20 @@ def post(self, request, conversation):
         })
 
 
+class DownloadUserDataForm(Form):
+    include_old_questions = BooleanField(
+        label="Include old questions",
+        help_text=("Whether to include answers to old questions that were"
+                   " once part of the poll but are no longer."),
+        initial=False, required=False)
+
+
 class ConversationViewDefinition(ConversationViewDefinitionBase):
     edit_view = SurveyEditView
 
     action_forms = {
-        # TODO: These are both work-arounds for not being able to directly
-        #       trigger POSTs via conversation action buttons
+        # TODO: The empty send_survey form is a work-around for not being able
+        #       to directly trigger POSTs via conversation action buttons
         'send_survey': Form,
-        'download_user_data': Form,
+        'download_user_data': DownloadUserDataForm,
     }