Changeset dd2c3d9 for remit

Timestamp:

Mar 27, 2010, 2:47:54 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

8a0d18c

Parents:

ca03565

git-author:

Alex Dehnert <adehnert@…> (03/27/10 14:47:54)

git-committer:

Alex Dehnert <adehnert@…> (03/27/10 14:47:54)

Message:

Allow filtering by term

Location:

remit/finance_core

Files:

• models.py (modified) (1 diff)
• reporting.py (modified) (3 diffs)
• views.py (modified) (4 diffs)

remit/finance_core/models.py

@@ -12 +12 @@
     # Applicable to every term?
     always = models.BooleanField(blank=True, default=False)
+    budget_term = models.ManyToManyField('BudgetTerm', through='BudgetAreaTerm')
 
     # Contact / ACL information

remit/finance_core/reporting.py

@@ -45 +45 @@
 
 
-def get_primary_axis(slug, base_area):
+def get_primary_axis(slug, base_area, term, ):
     if slug in axes and axes[slug][1]:
-        return axes[slug][0](base_area)
+        return axes[slug][0](base_area, term, )
     else:
         raise NotImplementedError
 
-def get_secondary_axis(slug, base_area):
+def get_secondary_axis(slug, base_area, term, ):
     if slug in axes and axes[slug][2]:
-        return axes[slug][0](base_area)
+        return axes[slug][0](base_area, term, )
     else:
         raise NotImplementedError
 
-def get_budget_areas(base_area):
+def get_budget_areas(base_area, term, ):
     name = 'Budget Areas'
     base_area_depth = base_area.depth
+    areas = base_area.get_descendants()
+    if term:
+        areas = areas.filter(Q(always=True) or Q(budget_term=term))
     axis = [
         (
@@ -67 +70 @@
             Q(lineitem__budget_area=area),
         )
-        for area in base_area.get_descendants()
+        for area in areas
     ]
-    axis_objs = base_area.get_descendants()
+    axis_objs = areas
     return name, axis, axis_objs,
 
-def get_budget_terms(base_area):
+def get_budget_terms(base_area, term, ):
     name = 'Budget Terms'
-    terms = finance_core.models.BudgetTerm.objects.all()
+    if term:
+        terms = finance_core.models.BudgetTerm.objects.filter(pk=term.pk)
+    else:
+        terms = finance_core.models.BudgetTerm.objects.all()
     axis = [
         (
@@ -86 +92 @@
     return name, axis, terms
 
-def get_layers(base_area):
+def get_layers(base_area, term, ):
     name = 'Layers'
     axis = [

remit/finance_core/views.py

@@ -15 +15 @@
 def reporting(request):
     line_items = finance_core.models.LineItem.objects.all()
-    term_name = 'All'
     compute_method = 'default'
 
@@ -27 +26 @@
         line_items = line_items.filter(budget_term=term_obj)
         main_lineitem_limit_primary = Q(lineitem__budget_term=term_obj)
+    else:
+        term_obj = None
+        term_name = 'All'
     if 'area' in request.REQUEST:
         base_area_obj = get_object_or_404(finance_core.models.BudgetArea, pk=request.REQUEST['area'])
@@ -40 +42 @@
         primary_slug = 'budget-areas'
     try:
-        primary_name, primary_axis, primary_axis_objs = finance_core.reporting.get_primary_axis(primary_slug, base_area_obj, )
+        primary_name, primary_axis, primary_axis_objs = finance_core.reporting.get_primary_axis(primary_slug, base_area_obj, term_obj, )
     except NotImplementedError:
         raise Http404("Primary axis %s is not implemented" % primary_slug)
@@ -50 +52 @@
         secondary_slug = 'layers'
     try:
-        secondary_name, secondary_axis, secondary_axis_obj = finance_core.reporting.get_secondary_axis(secondary_slug, base_area_obj, )
+        secondary_name, secondary_axis, secondary_axis_obj = finance_core.reporting.get_secondary_axis(secondary_slug, base_area_obj, term_obj, )
     except NotImplementedError:
         raise Http404("Secondary axis %s is not implemented" % secondary_slug)