Merge pull request #1627 from learning-unlimited/user_info_in_customforms

Display user data in custom form responses

Author: benjaminjkraft

esp/esp/customforms/DynamicForm.py

@@ -11,7 +11,7 @@
 from esp.customforms.forms import NameField, AddressField
 from esp.customforms.DynamicModel import DMH
 from esp.utils.forms import DummyField
-from esp.users.models import ContactInfo
+from esp.users.models import ContactInfo, ESPUser
 from esp.cache import cache_function
 from esp.program.models import Program
 
@@ -623,7 +623,10 @@ def getResponseData(self, form):
 
         # Add in the user column if form is not anonymous
         if not form.anonymous:
-            response_data['questions'].append(['user_id', 'User', 'fk'])
+            response_data['questions'].append(['user_id', 'User ID', 'fk'])
+            response_data['questions'].append(['user_display', 'User', 'textField'])
+            response_data['questions'].append(['user_email', 'User e-mail', 'textField'])
+            response_data['questions'].append(['username', 'Username', 'textField'])
 
         # Add in the column for link fields, if any
         if form.link_type != "-1":
@@ -646,14 +649,20 @@ def getResponseData(self, form):
                 # Include this field only if it isn't a dummy field
             elif generic_fields[ftype]['typeMap'] is not DummyField:
                 response_data['questions'].append([qname, field['label'], ftype])
-            
+
+        users = ESPUser.objects.in_bulk(map(lambda response: response['user_id'], responses))
+
         # Now let's set up the responses
         for response in responses:
             link_instances_cache={}
 
             # Add in user if form is not anonymous
             if not form.anonymous:
+                user = users[response['user_id']]
                 response['user_id'] = unicode(response['user_id'])
+                response['user_display'] = user.name()
+                response['user_email'] = user.email
+                response['username'] = user.username
 
             # Add in links
             if only_fkey_model is not None:

esp/esp/customforms/tests.py

@@ -200,8 +200,8 @@ def testForms(self):
         for field_spec in indiv_response:
             self.assertEqual(self.map_form_value(responses_corrected[key]), indiv_response[key])
         self.assertTrue('questions' in response_data)
-        self.assertEqual(len(response_data['questions']), len(responses_initial) + 1)   #   provided fields plus user_id
+        self.assertEqual(len(response_data['questions']), len(responses_initial) + 4)   #   provided fields plus user_id, user_display, user_email, username
         for entry in response_data['questions']:
-            if entry[0] == 'user_id':
+            if entry[0] in ['user_id', 'user_display', 'user_email', 'username']:
                 continue
             self.assertTrue(entry[0] in responses_corrected)