Changeset 8a0d18c for remit/finance_core/reporting.py

Timestamp:

Mar 27, 2010, 3:34:11 PM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

ee37f93

Parents:

dd2c3d9

git-author:

Alex Dehnert <adehnert@…> (03/27/10 15:34:11)

git-committer:

Alex Dehnert <adehnert@…> (03/27/10 15:34:11)

Message:

WIP: Add form for selecting parameters

File:

• remit/finance_core/reporting.py (modified) (4 diffs)

remit/finance_core/reporting.py

@@ -46 +46 @@
 
 def get_primary_axis(slug, base_area, term, ):
-    if slug in axes and axes[slug][1]:
-        return axes[slug][0](base_area, term, )
+    if slug in axes and axes[slug][2]:
+        return (axes[slug][0], ) + axes[slug][1](base_area, term, )
     else:
         raise NotImplementedError
 
 def get_secondary_axis(slug, base_area, term, ):
-    if slug in axes and axes[slug][2]:
-        return axes[slug][0](base_area, term, )
+    if slug in axes and axes[slug][3]:
+        return (axes[slug][0], ) + axes[slug][1](base_area, term, )
     else:
         raise NotImplementedError
 
 def get_budget_areas(base_area, term, ):
-    name = 'Budget Areas'
     base_area_depth = base_area.depth
     areas = base_area.get_descendants()
@@ -73 +72 @@
     ]
     axis_objs = areas
-    return name, axis, axis_objs,
+    return axis, axis_objs,
 
 def get_budget_terms(base_area, term, ):
-    name = 'Budget Terms'
     if term:
         terms = finance_core.models.BudgetTerm.objects.filter(pk=term.pk)
@@ -90 +88 @@
         for term in terms
     ]
-    return name, axis, terms
+    return axis, terms
 
 def get_layers(base_area, term, ):
-    name = 'Layers'
     axis = [
         (
@@ -103 +100 @@
         for layer in finance_core.models.layers
     ]
-    return name, axis, None,
+    return axis, None,
 
 axes = {
-    'budget-areas': (get_budget_areas, True,  True,  ),
-    'budget-terms': (get_budget_terms, True,  True,  ),
-    'layers':       (get_layers,       False, True,  ),
+    'budget-areas': ('Budget Areas',  get_budget_areas, True,  True,  ),
+    'budget-terms': ('Budget Terms',  get_budget_terms, True,  True,  ),
+    'layers':       ('Layers',        get_layers,       False, True,  ),
 }