Changeset d66942f for asadb

Timestamp:

Dec 3, 2013, 12:21:44 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

ed7ddec

Parents:

88a856b

git-author:

Alex Dehnert <adehnert@…> (12/02/13 23:56:40)

git-committer:

Alex Dehnert <adehnert@…> (12/03/13 00:21:44)

Message:

People lookup: make the UI more reasonable

Location:

asadb

Files:

• forms/models.py (modified) (5 diffs)
• forms/views.py (modified) (2 diffs)
• template/membership/people-lookup.html (modified) (2 diffs)

asadb/forms/models.py

@@ -243 +243 @@
             'affiliate': other,
         }
-        descriptions = {
-            'undergrads': 'Undergraduate students',
-            'grads': 'Graduate students',
-            'staff': 'MIT Staff (including faculty)',
-            'secret': 'People with directory information suppressed. These people have Athena accounts, but they could have any MIT affiliation, including just being a student group member.',
-            'affiliate': 'This includes some alumni, group members with Athena accounts sponsored through SAO, and many others.',
-        }
         for result in results:
             username = result[1]['uid'][0]
@@ -257 +250 @@
                 year = result[1].get('mitDirStudentYear', [None])[0]
                 if year == 'G':
-                    grads.append(username)
+                    grads.append((username, None))
                 elif year.isdigit():
                     undergrads.append((username, year))
@@ -263 +256 @@
                     other.append((username, year))
             else:
-                info[affiliation].append(username)
-        info['unknown'] = left
-        descriptions['unknown'] = "While this looks like an Athena account, we couldn't find it. This could be a deactivated account, or it might never have existed."
-        return descriptions, info
+                info[affiliation].append((username, None, ))
+        info['unknown'] = [(u, None) for u in left]
+        return info
 
     def classify_people(self, people):
         mit_usernames = set()
-        alum_addresses = set()
-        other_mit_addresses = set()
-        nonmit_addresses = set()
+        alum_addresses = []
+        other_mit_addresses = []
+        nonmit_addresses = []
 
         for name in people:
@@ -279 +271 @@
                 mit_usernames.add(local)
             elif domain.lower() == 'alum.mit.edu':
-                alum_addresses.add(name)
+                alum_addresses.append((name, None))
             elif domain.endswith('.mit.edu'):
-                other_mit_addresses.add(name)
+                other_mit_addresses.append((name, None))
             else:
-                nonmit_addresses.add(name)
-
-        descriptions, results = self.ldap_classify(mit_usernames)
-        descriptions['alum'] = "Alumni Association addresses"
-        descriptions['other-mit'] = ".mit.edu addresses that aren't @mit.edu or @alum.mit.edu."
-        descriptions['non-mit'] = "Non-MIT addresses, including outside addresses of MIT students."
+                nonmit_addresses.append((name, None))
+
+        results = self.ldap_classify(mit_usernames)
         results['alum'] = alum_addresses
         results['other-mit'] = other_mit_addresses
         results['non-mit'] = nonmit_addresses
-
-        sorted_results = {}
-        for k, v in results.items():
-            sorted_results[k] = {
-                'description': descriptions[k],
-                'people': sorted(v),
-            }
-        return sorted_results
+        return results
 
     def update_classified_people(self):
-        people = [p.strip() for p in self.people.split('\n')]
-        print people
+        people = [p for p in [p.strip() for p in self.people.split('\n')] if p]
         self._classified_people = self.classify_people(people)
         self.classified_people_json = json.dumps(self._classified_people)
@@ -314 +295 @@
         return self._classified_people
 
+    def classifications_with_descriptions(self):
+        descriptions = {
+            'undergrads':   'Undergraduate students (class year in parentheses)',
+            'grads':        'Graduate students',
+            'alum':         "Alumni Association addresses",
+            'staff':        'MIT Staff (including faculty)',
+            'affiliate':    'This includes some alumni, group members with Athena accounts sponsored through SAO, and many others.',
+            'secret':       'People with directory information suppressed. These people have Athena accounts, but they could have any MIT affiliation, including just being a student group member.',
+            'unknown':      "While this looks like an Athena account, we couldn't find it. This could be a deactivated account, or it might never have existed.",
+            'other-mit':    ".mit.edu addresses that aren't @mit.edu or @alum.mit.edu.",
+            'non-mit':      "Non-MIT addresses, including outside addresses of MIT students.",
+        }
+
+        names = (
+            ('undergrads', 'Undergrads', ),
+            ('grads', 'Grad students', ),
+            ('alum', 'Alumni', ),
+            ('staff', 'Staff', ),
+            ('affiliate', 'Affiliates', ),
+            ('secret', 'Secret', ),
+            ('unknown', 'Unknown', ),
+            ('other-mit', 'Other MIT addresses', ),
+            ('non-mit', 'Non-MIT addresses', ),
+        )
+
+        classifications = self.classified_people
+        sorted_results = []
+        for k, label in names:
+            sorted_results.append({
+                'label': label,
+                'description': descriptions[k],
+                'people': sorted(classifications[k]),
+            })
+        return sorted_results
+
 
 ##########

asadb/forms/views.py

@@ -572 +572 @@
                 lookup.requestor = request.user
                 lookup.referer = request.META['HTTP_REFERER']
-                results = lookup.update_classified_people()
+                lookup.update_classified_people()
+                results = lookup.classifications_with_descriptions()
                 lookup.save()
         else:
@@ -580 +581 @@
         if request.user.has_perm('forms.view_peoplestatusupdate'):
             lookup = get_object_or_404(forms.models.PeopleStatusLookup, pk=int(pk))
-            results = lookup.classified_people
+            results = lookup.classifications_with_descriptions()
             form = None
         else:

asadb/template/membership/people-lookup.html

@@ -4 +4 @@
 {% block content %}
 
-<h2>People lookup</h2>
+<h1>People lookup</h1>
 
 {% if form %}
-<p>You can specify a list of email addresses and/or MIT usernames below, and we'll try to identify which ones are undergrads, grad students, etc.. This is not definitive (<kbd>joe.mit.student@gmail.com</kbd> will show up as "other", for example, and we can't check the student status of people who chose to suppress MIT directory information), but it may be a good first step in figuring out the breakdown of your membership numbers.</p>
+<p>You can specify a list of email addresses and/or MIT usernames below, and we'll try to identify which ones are undergrads, grad students, and so forth:</p>
 
 <form enctype="multipart/form-data" method="post" action="">
@@ -20 +20 @@
 
 {% if results %}
+<h2>Results</h2>
+
+<p>This information is not definitive (<kbd>joe.mit.student@gmail.com</kbd> will show up as "other", for example, and we can't check the student status of people who chose to suppress MIT directory information), but we hope it can be helpful in figuring out the breakdown of your membership numbers.</p>
+
+<p><em>If you wish to use this for an ASA form, <strong>you</strong> will need to transfer the numbers yourself &ndash; we do not do that automatically.</em></p>
+
 <table class='pretty-table'>
 <tr>
     <th>Type</th>
-    <th>Description</th>
+    <th style='width: 20em;'>Description</th>
     <th>Number</th>
     <th>People</th>
 </tr>
-{% for name,result in results.items %}
+{% for result in results %}
 <tr>
-    <th>{{name}}</th>
+    <th>{{result.label}}</th>
     <td>{{result.description}}</td>
-    <td>{{result.people|length}}</td>
+    <td style='text-align: right; padding: 0.5em;'>{{result.people|length}}</td>
     <td><ul>
         {% for person in result.people %}
-        <li>{{person}}</li>
+        <li>{{person.0}}{% if person.1 %} ({{person.1}}){%endif%}</li>
         {% endfor %}
     </ul></td>