Changeset 18149fd for remit/finance_core/views.py

Timestamp:

Mar 27, 2010, 8:26:01 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

d1692e8

Parents:

47bb508

git-author:

Alex Dehnert <adehnert@…> (03/27/10 20:26:01)

git-committer:

Alex Dehnert <adehnert@…> (03/27/10 20:26:01)

Message:

Add new valannotate method to replace annotate

File:

• remit/finance_core/views.py (modified) (3 diffs)

remit/finance_core/views.py

@@ -66 +66 @@
         primary_slug = 'budget-areas'
     try:
-        primary_name, primary_axis, primary_axis_objs = finance_core.reporting.get_primary_axis(primary_slug, base_area_obj, term_obj, )
+        primary_name, primary_field, 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)
@@ -76 +76 @@
         secondary_slug = 'layers'
     try:
-        secondary_name, secondary_axis, secondary_axis_obj = finance_core.reporting.get_secondary_axis(secondary_slug, base_area_obj, term_obj, )
+        secondary_name, secondary_field, 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)
-    secondary_axis.append((None, 'Total', Q(), Q()))
+    #secondary_axis.append((None, 'Total', Q(), Q()))
 
     primary_labels = [ ]
@@ -94 +94 @@
         'annotate':  finance_core.reporting.build_table_annotate,
     }
-    if compute_method in compute_methods:
-        build_table = compute_methods[compute_method]
+    if compute_method == 'valannotate':
+        table = finance_core.reporting.build_table_valannotate(line_items, primary_field, secondary_field, primary_axis, secondary_axis, )
     else:
-        raise Http404("Unknown compute_method selected")
-    table = build_table(line_items, main_lineitem_limit_primary, primary_axis, primary_axis_objs, secondary_axis, )
+        if compute_method in compute_methods:
+            build_table = compute_methods[compute_method]
+        else:
+            raise Http404("Unknown compute_method selected")
+        table = build_table(line_items, main_lineitem_limit_primary, primary_axis, primary_axis_objs, secondary_axis, )
 
     debug = False