Changeset beb46fb

Timestamp:

Nov 28, 2013, 11:48:36 PM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

08b7660

Parents:

5560f6d

git-author:

Alex Dehnert <adehnert@…> (11/28/13 23:48:36)

git-committer:

Alex Dehnert <adehnert@…> (11/28/13 23:48:36)

Message:

Make issues.csv cycle-aware (ASA-#191)

Location:

asadb

Files:

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

asadb/forms/views.py

@@ -498 +498 @@
 
 
+class View_GroupConfirmationCyclesList(ListView):
+    context_object_name = "cycle_list"
+    template_name = "membership/admin.html"
+    model = forms.models.GroupConfirmationCycle
+
+    def get_context_data(self, **kwargs):
+        context = super(View_GroupConfirmationCyclesList, self).get_context_data(**kwargs)
+        context['pagename'] = 'groups'
+        return context
+
+
 @permission_required('groups.view_group_private_info')
-def group_confirmation_issues(request, ):
+def group_confirmation_issues(request, slug, ):
     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()
+    group_updates = forms.models.GroupMembershipUpdate.objects.filter(cycle__slug=slug, )
     people_confirmations = forms.models.PersonMembershipUpdate.objects.filter(
         deleted__isnull=True,
         valid__gt=0,
+        cycle__slug=slug,
     )
 

asadb/template/membership/admin.html

@@ -6 +6 @@
 <h2>Membership confirmations &mdash; ASA Exec pages</h2>
 
-<p>Exec members can check the <a href='{% url membership-issues %}'>list of groups with issues</a> (or a version <a href='{% url membership-issues %}?accounts=1'>with account numbers</a>)</p>
+<p>Exec members can check the issues:</p>
+
+<table class='pretty-table'>
+<tr>
+    <th>Name</th>
+    <th>Create date</th>
+    <th>Issues</th>
+    <th>(with accounts)</th>
+</tr>
+{% for cycle in cycle_list %}
+<tr>
+    <th>{{cycle.name}}</th>
+    <td>{{cycle.create_date}}</td>
+    <td><a href='{% url membership-issues cycle.slug %}'>Issues</a></td>
+    <td><a href='{% url membership-issues cycle.slug %}?accounts=1'>(with accounts)</a></td>
+</tr>
+{% endfor %}
+</table>
 
 <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 (ever &mdash; see ASA-#191)</dd>
-    <dt>confirmations</dt><dd>groups that have submitted an update (ever) but had less than five members confirm membership (again, ever &mdash; ASA-#191)</dd>
-    <dt>50%</dt><dd>groups that (ever) submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>
+    <dt>unsubmitted</dt><dd>active groups ("group status" is "Active") 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>
 </dl>
 

asadb/urls.py

@@ -65 +65 @@
     ),
     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', ),
+    url(r'^membership/admin/$', forms.views.View_GroupConfirmationCyclesList.as_view(), name='membership-admin', ),
+    url(r'^membership/admin/issues/(?P<slug>[\w-]+).csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
 
     # Midway