Changeset 9ea4909

Timestamp:

Aug 24, 2011, 10:44:20 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

6a646ce

Parents:

7b57a9b

git-author:

Alex Dehnert <adehnert@…> (08/24/11 22:34:43)

git-committer:

Alex Dehnert <adehnert@…> (08/24/11 22:44:20)

Message:

Allow filtering the groups for the signatory list

Location:

asadb

Files:

• groups/views.py (modified) (3 diffs)
• template/groups/groups_signatories.html (modified) (1 diff)

asadb/groups/views.py

@@ -392 +392 @@
     # TODO:
     # * limit which columns (roles) get displayed
-    # * limit which rows get displayed (maybe) by category or something
     # This might want to wait for the generic reporting infrastructure, since
     # I'd imagine some of it can be reused.
 
+    the_groups = groups.models.Group.objects.all()
+    groups_filterset = GroupFilter(request.GET, the_groups)
+    the_groups = groups_filterset.qs
     officers = groups.models.OfficeHolder.objects.filter(start_time__lte=datetime.datetime.now(), end_time__gte=datetime.datetime.now())
+    officers = officers.filter(group__in=the_groups)
     officers = officers.select_related(depth=1)
-    all_groups = groups.models.Group.objects.all()
     roles = groups.models.OfficerRole.objects.all()
     officers_map = collections.defaultdict(lambda: collections.defaultdict(set))
@@ -404 +406 @@
         officers_map[officer.group][officer.role].add(officer.person)
     officers_data = []
-    for group in all_groups:
+    for group in the_groups:
         role_list = []
         for role in roles:
@@ -413 +415 @@
         'roles': roles,
         'officers': officers_data,
+        'filter': groups_filterset,
     }
     return render_to_response('groups/groups_signatories.html', context, context_instance=RequestContext(request), )

asadb/template/groups/groups_signatories.html

@@ -5 +5 @@
 
 <h1>Signatory list</h1>
+
+<h2>Search</h2>
+
+<form action="" method="get">
+    <table class='pretty-table'>
+    {{ filter.form.as_table }}
+    </table>
+    <input type="submit" value="Search" />
+</form>
+
+<h2>The Groups</h2>
 
 {% if changes %}