Changeset d7557b8 for asadb/groups/views.py

Timestamp:

Feb 9, 2013, 1:53:21 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

62f73df

Parents:

ea8e8b6

git-author:

Alex Dehnert <adehnert@…> (02/09/13 01:53:21)

git-committer:

Alex Dehnert <adehnert@…> (02/09/13 01:53:21)

Message:

Proof-of-concept reporting filters (ASA-#193)

Add proof-of-concept support for extensible filtering of the reporting page,
beyond just the fields on the Group object. At the moment, this is just a few
space-related filters, but in the future this might include groups missing
membership confirmations, groups whose presidents aren't students, groups who
have filled out the FYSM, etc..

File:

• asadb/groups/views.py (modified) (4 diffs)

asadb/groups/views.py

@@ -1079 +1079 @@
 
 class ReportingForm(form_utils.forms.BetterForm):
+    special_filters = forms.fields.MultipleChoiceField(
+        choices=[],
+        widget=forms.SelectMultiple(attrs={'size': 10}),
+        validators=[groups.models.filter_registry.validate_filter_slug],
+        required=False,
+    )
+
     basic_fields_choices = groups.models.Group.reporting_fields()
     basic_fields_labels = dict(basic_fields_choices) # name -> verbose_name
@@ -1117 +1124 @@
             ('filter', {
                 'legend': 'Filter Groups',
-                'fields': ['name', 'abbreviation', 'activity_category', 'group_class', 'group_status', 'group_funding', ],
+                'fields': [
+                    'name', 'abbreviation',
+                    'activity_category', 'group_class', 'group_status', 'group_funding',
+                    'special_filters',
+                ],
             }),
             ('fields', {
@@ -1128 +1139 @@
             }),
         ]
+
+    def __init__(self, *args, **kwargs):
+        super(ReportingForm, self).__init__(*args, **kwargs)
+
+        registry = groups.models.filter_registry
+        self.fields['special_filters'].choices = registry.get_choices()
 
 class GroupReportingFilter(GroupFilter):
@@ -1190 +1207 @@
         # Set up query
         qs = groups_filterset.qs
+        for fltr_slug in form.cleaned_data['special_filters']:
+            fltr = groups.models.filter_registry.get(fltr_slug)
+            qs = qs.filter(pk__in=fltr.queryset())
+
         # Prefetch foreign keys
         prefetch_fields = groups.models.Group.reporting_prefetch()