Changeset d6f8984

Timestamp:

Dec 16, 2012, 6:17:52 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

bb61160

Parents:

cf43bea

git-author:

Alex Dehnert <adehnert@…> (12/16/12 06:14:01)

git-committer:

Alex Dehnert <adehnert@…> (12/16/12 06:17:52)

Message:

Membership: miscellaneous improvements to issues

• Describe what, exactly, causes the various issue names mean (well, more exactly than "50%" supplies...)
• Provide a version of /membership/admin/issues.csv that includes account numbers, for ease-of-fining

Location:

asadb

Files:

• forms/views.py (modified) (6 diffs)
• media/style/style.css (modified) (1 diff)
• template/index.html (modified) (1 diff)
• template/membership/admin.html (added)
• urls.py (modified) (2 diffs)

asadb/forms/views.py

@@ -498 +498 @@
 @permission_required('groups.view_group_private_info')
 def group_confirmation_issues(request, ):
+    account_numbers = ("accounts" in request.GET) and request.GET['accounts'] == "1"
+
     active_groups = groups.models.Group.active_groups
     group_updates = forms.models.GroupMembershipUpdate.objects.all()
@@ -507 +509 @@
     buf = StringIO.StringIO()
     output = csv.writer(buf)
-    output.writerow(['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ])
+    fields = ['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ]
+    if account_numbers: fields.append("main_account")
+    output.writerow(fields)
 
     q_present = Q(id__in=group_updates.values('group'))
@@ -514 +518 @@
     for group in missing_groups:
         num_confirms = len(people_confirmations.filter(groups=group))
-        output.writerow([
+        fields = [
             group.id,
             group.name,
@@ -520 +524 @@
             num_confirms,
             group.officer_email,
-        ])
+        ]
+        if account_numbers: fields.append(group.main_account_id)
+        output.writerow(fields)
 
     for group_update in group_updates:
@@ -536 +542 @@
 
         for problem in problems:
-            output.writerow([
+            fields = [
                 group.id,
                 group.name,
@@ -542 +548 @@
                 num_confirms,
                 group.officer_email,
-            ])
+            ]
+            if account_numbers: fields.append(group.main_account_id)
+            output.writerow(fields)
 
 

asadb/media/style/style.css

@@ -31 +31 @@
 {
     text-align: left;
+}
+
+dl dt
+{
+    font-weight: bold;
 }
 

asadb/template/index.html

@@ -47 +47 @@
         <li><a href='{%url membership-confirm%}'>Individual confirmations</a></li>
         <li><a href='{%url membership-submitted%}'>Groups with submitted updates</a></li>
-        {% if perms.groups.view_group_private_info %}<li><a href='{%url membership-issues%}'>Issues</a> (CSV)</li>{% endif %}
+        {% if perms.groups.view_group_private_info %}<li><a href='{%url membership-admin %}'>Issues with submissions</a></li>{% endif %}
     </ul></li>
     <li>Group recognition<ul>

asadb/urls.py

@@ -51 +51 @@
     url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
 
+    # Membership confirmations
     url(
         regex=r'^membership/update/$',
@@ -65 +66 @@
     ),
     url(r'^membership/submitted/$', forms.views.View_GroupMembershipList.as_view(), name='membership-submitted', ),
+    url(
+        r'^membership/admin/$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'membership/admin.html', 'extra_context': { 'pagename':'groups' }, },
+        name='membership-admin',
+    ),
     url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),