Changeset a526ed2

Timestamp:

Nov 29, 2013, 12:18:04 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

8a6faa1

Parents:

08b7660

git-author:

Alex Dehnert <adehnert@…> (11/29/13 00:18:04)

git-committer:

Alex Dehnert <adehnert@…> (11/29/13 00:18:04)

Message:

Include suspended groups in issues.csv (ASA-#195)

Location:

asadb

Files:

• forms/views.py (modified) (4 diffs)
• template/membership/admin.html (modified) (1 diff)

asadb/forms/views.py

@@ -513 +513 @@
     account_numbers = ("accounts" in request.GET) and request.GET['accounts'] == "1"
 
-    active_groups = groups.models.Group.active_groups
+    check_groups = groups.models.Group.objects.filter(group_status__slug__in=('active', 'suspended', ))
+    check_groups = check_groups.select_related('group_status__slug')
     group_updates = forms.models.GroupMembershipUpdate.objects.filter(cycle__slug=slug, )
     people_confirmations = forms.models.PersonMembershipUpdate.objects.filter(
@@ -523 +524 @@
     buf = StringIO.StringIO()
     output = csv.writer(buf)
-    fields = ['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ]
+    fields = ['group_id', 'group_name', 'group_status', 'issue', 'num_confirm', 'officer_email', ]
     if account_numbers: fields.append("main_account")
     output.writerow(fields)
@@ -531 +532 @@
             group.id,
             group.name,
+            group.group_status.slug,
             issue,
             num_confirms,
@@ -539 +541 @@
 
     q_present = Q(id__in=group_updates.values('group'))
-    missing_groups = active_groups.filter(~q_present)
+    missing_groups = check_groups.filter(~q_present)
     #print len(list(group_updates))
     for group in missing_groups:

asadb/template/membership/admin.html

@@ -27 +27 @@
 <p>The list includes the following types of issues:</p>
 <dl>
-    <dt>unsubmitted</dt><dd>active groups ("group status" is "Active") who have not submitted an update
+    <dt>unsubmitted</dt><dd>active or suspended groups who have not submitted an update
     <dt>confirmations</dt><dd>groups that have submitted an update but had less than five members confirm membership</dd>
     <dt>50%</dt><dd>groups that submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>