Changeset b523fed

Timestamp:

Feb 11, 2014, 2:56:32 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

8442dd7

Parents:

d4f571c

git-author:

Alex Dehnert <adehnert@…> (02/11/14 02:56:32)

git-committer:

Alex Dehnert <adehnert@…> (02/11/14 02:56:32)

Message:

Reporting: Allow different name formats (ASA-#259)

File:

• asadb/groups/views.py (modified) (6 diffs)

asadb/groups/views.py

@@ -1128 +1128 @@
 #######################
 
+name_formats = collections.OrderedDict()
+name_formats['username']    = ('username',                      False,  '%(user)s')
+name_formats['email']       = ('username@mit.edu',              False,  '%(user)s@mit.edu')
+name_formats['name']        = ('First Last',                    True,   '%(first)s %(last)s')
+name_formats['name-email']  = ('First Last <username@mit.edu>', True,   '%(first)s %(last)s <%(user)s@mit.edu>')
+
 class ReportingForm(form_utils.forms.BetterForm):
     special_filters = forms.fields.MultipleChoiceField(
@@ -1149 +1155 @@
         required=False,
     )
-    show_as_emails = forms.BooleanField(
-        help_text='Append "@mit.edu" to each value of people fields to allow use as email addresses?',
-        required=False,
+    name_format = forms.ChoiceField(
+        help_text='How to format the names of the President, Treasurer, etc., if displayed',
+        choices=[(k, v[0]) for k,v in name_formats.items()],
+        initial='username',
+        required=True,
     )
 
@@ -1182 +1190 @@
             ('fields', {
                 'legend': 'Data to display',
-                'fields': ['basic_fields', 'people_fields', 'show_as_emails', 'special_fields', ],
+                'fields': ['basic_fields', 'people_fields', 'name_format', 'special_fields', ],
             }),
             ('final', {
@@ -1276 +1284 @@
         for field in people_fields:
             col_labels.append(field.display_name)
+        # Figure out the format, and if necessary fetch human names
+        nf_slug = form.cleaned_data['name_format']
+        nf_label, nf_need_name, nf_fmt = name_formats[nf_slug]
+        name_map = collections.defaultdict(lambda: ('???', '???'))
+        if nf_need_name:
+            people_usernames = people_data.values('person')
+            name_data = groups.models.AthenaMoiraAccount.objects.filter(username__in=people_usernames)
+            for account in name_data:
+                name_map[account.username] = (account.first_name, account.last_name)
 
         # Set up special fields
@@ -1288 +1305 @@
         else:
             formatters = {}
-        show_as_emails = form.cleaned_data['show_as_emails']
         def fetch_item(group, field):
             val = getattr(group, field)
@@ -1299 +1315 @@
             for field in people_fields:
                 people = people_map[group.pk][field.pk]
-                if show_as_emails: people = ["%s@mit.edu" % p for p in people]
+                if nf_need_name:
+                    def fmt(p):
+                        first, last = name_map[p]
+                        ctx = {'user': p, 'first': first, 'last': last}
+                        return nf_fmt % ctx
+                    people = [fmt(p) for p in people]
+                else:
+                    people = [nf_fmt % {'user': p} for p in people]
                 group_data.append(", ".join(people))