Changeset f610262

Timestamp:

Mar 23, 2013, 11:36:03 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

1cfab5a

Parents:

26826c9

git-author:

Alex Dehnert <adehnert@…> (03/23/13 23:36:03)

git-committer:

Alex Dehnert <adehnert@…> (03/23/13 23:36:03)

Message:

Allow sorting and filtering the midway page

Location:

asadb

Files:

• forms/views.py (modified) (3 diffs)
• template/midway/map.html (modified) (3 diffs)

asadb/forms/views.py

@@ -22 +22 @@
 from django.db import connection
 from django.db.models import Q, Count
+
+import django_filters
 
 import forms.models
@@ -564 +566 @@
 
 
+class MidwayAssignmentFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(name='group__name', lookup_type='icontains', label="Name contains")
+    abbreviation = django_filters.CharFilter(name='group__abbreviation', lookup_type='iexact', label="Abbreviation is")
+    activity_category = django_filters.ModelChoiceFilter(
+        label='Activity category',
+        name='group__activity_category',
+        queryset=groups.models.ActivityCategory.objects,
+    )
+
+    class Meta:
+        model = forms.models.MidwayAssignment
+        fields = [
+            'name',
+            'abbreviation',
+            'activity_category',
+        ]
+        order_by = (
+            ('group__name', 'Name', ),
+            ('group__abbreviation', 'Abbreviation', ),
+            ('group__activity_category__name', 'Activity category', ),
+            ('location', 'Location', ),
+        )
 
 class MidwayMapView(DetailView):
@@ -574 +598 @@
         context = super(MidwayMapView, self).get_context_data(**kwargs)
         
-        midway = context['midway']
-        assignments = forms.models.MidwayAssignment.objects.filter(midway=midway)
-        context['assignments'] = assignments
+        filterset = MidwayAssignmentFilter(self.request.GET)
+        context['assignments'] = filterset.qs
+        context['filter'] = filterset
         context['pagename'] = 'midway'
 

asadb/template/midway/map.html

@@ -16 +16 @@
 <tr>
     <th>Group</th>
-    <th>Table</th>
+    <th>Category</th>
+    <th>Location</th>
     <th>Website</th>
 </tr>
@@ -22 +23 @@
 <tr>
     <th>{{assignment.group}}</th>
+    <td>{% if assignment.group.activity_category %}{{assignment.group.activity_category}}{% endif %}</td>
     <td>{{assignment.location}}</td>
     <td>{% if assignment.group.website_url %}<a href='{{assignment.group.website_url}}'>Website</a>{% endif %}</td>
@@ -28 +30 @@
 </table>
 
+<h2>Sort the assignments</h2>
+
+<form action="" method="get">
+    <table class='pretty-table'>
+    {{ filter.form.as_table }}
+    </table>
+    <input type="submit" value="Search" />
+</form>
+
 {% endblock %}