Changeset 18149fd for remit

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

Location:

remit/finance_core

Files:

• reporting.py (modified) (3 diffs)
• reporting_tests.sh (modified) (1 diff)
• views.py (modified) (3 diffs)

remit/finance_core/reporting.py

@@ -25 +25 @@
     return table
 
+def build_table_valannotate(line_items, primary_field, secondary_field, primary_axis, secondary_axis, ):
+    # Setup
+    arcprimary = {}
+    arcsecondary = {}
+    table = []
+    zero = Decimal('0.00')
+    for num, (pk, label, qobj, objrel_qobj) in enumerate(primary_axis):
+        arcprimary[pk] = num
+        table.append([zero]*len(secondary_axis))
+    for num, (pk, label, qobj, objrel_qobj) in enumerate(secondary_axis):
+        arcsecondary[pk] = num
+
+    def lineitem_total(obj):
+        if obj['amount__sum'] is None: return zero
+        else: return obj['amount__sum']
+
+    # Do the real work
+    results = line_items.values(primary_field, secondary_field,).annotate(Sum('amount'))
+    for result in results:
+        print result
+        table[arcprimary[result[primary_field]]][arcsecondary[result[secondary_field]]] = lineitem_total(result)
+    #for num, (pk, label, qobj_lineitem, qobj_primary) in enumerate(secondary_axis):
+    #    secondary_results = (primary_axis_objs.filter(main_lineitem_limit_primary, qobj_primary, ).annotate(Sum('lineitem__amount')))
+    #    for cell in secondary_results:
+    #        #print cell, cell.pk, arcprimary[cell.pk], num, table[arcprimary[cell.pk]]
+    #        table[arcprimary[cell.pk]][num] = lineitem_total(cell)
+
+    return table
+
 def build_table_aggregate(line_items, main_lineitem_limit_primary, primary_axis, primary_axis_objs, secondary_axis):
     # This uses a simpler but probably slower method
@@ -43 +72 @@
 
 build_table = build_table_annotate
+build_table = build_table_aggregate
 
 
 def get_primary_axis(slug, base_area, term, ):
-    if slug in axes and axes[slug][2]:
-        return (axes[slug][0], ) + axes[slug][1](base_area, term, )
+    if slug in axes and axes[slug][3]:
+        return axes[slug][0:2] + axes[slug][2](base_area, term, )
     else:
         raise NotImplementedError
 
 def get_secondary_axis(slug, base_area, term, ):
-    if slug in axes and axes[slug][3]:
-        return (axes[slug][0], ) + axes[slug][1](base_area, term, )
+    if slug in axes and axes[slug][4]:
+        return axes[slug][0:2] + axes[slug][2](base_area, term, )
     else:
         raise NotImplementedError
@@ -103 +133 @@
 
 axes = {
-    'budget-areas': ('Budget Areas',  get_budget_areas, True,  True,  ),
-    'budget-terms': ('Budget Terms',  get_budget_terms, True,  True,  ),
-    'layers':       ('Layers',        get_layers,       False, True,  ),
+    'budget-areas': ('Budget Areas', 'budget_area', get_budget_areas, True,  True,  ),
+    'budget-terms': ('Budget Terms', 'budget_term', get_budget_terms, True,  True,  ),
+    'layers':       ('Layers',       'layer',       get_layers,       False, True,  ),
 }
 

remit/finance_core/reporting_tests.sh

@@ -1 +1 @@
 #!/bin/bash
 
-methods="annotate aggregate"
+methods="annotate aggregate valannotate"
 baseurl=${1:-http://localhost:8001/finance_core/reporting/?a=b}
 baseurls="$baseurl&term=2010-spring $baseurl&area=13 $baseurl&layer=30"

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