Changeset 8a0d18c for remit

Timestamp:

Mar 27, 2010, 3:34:11 PM (15 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

Location:

remit

Files:

• finance_core/reporting.py (modified) (4 diffs)
• finance_core/views.py (modified) (2 diffs)
• remit_templates/finance_core/reporting.html (modified) (1 diff)

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,  ),
 }
 

remit/finance_core/views.py

@@ -21 +21 @@
     if 'compute_method' in request.REQUEST:
         compute_method = request.REQUEST['compute_method']
-    if 'term' in request.REQUEST:
+    if 'term' in request.REQUEST and not request.REQUEST['term'] == 'all':
         term_obj = get_object_or_404(finance_core.models.BudgetTerm, slug=request.REQUEST['term'])
         term_name = term_obj.name
@@ -81 +81 @@
         print "Table size:\t%dx%d" % (len(primary_labels), len(secondary_labels), )
 
+    term_options = finance_core.models.BudgetTerm.objects.all()
     context = {
         'pagename':'reporting',
         'term_name': term_name,
+        'term_options': term_options,
         'area': base_area_obj,
+        'axes': finance_core.reporting.axes,
         'primary_name': primary_name,
         'secondary_name': secondary_name,

remit/remit_templates/finance_core/reporting.html

@@ -9 +9 @@
 <h3>Parameters</h3>
 
+<form>
 <table class='pretty-table'>
 <tr>
     <th>Term</th>
-    <td>{{term_name}}</td>
+    <td><select name='term'>
+    <option {% ifequal term_name "All" %}selected {% endifequal %}value='all'>All</option>
+    {% for term_opt in term_options %}<option {% ifequal term_name term_opt.name %}selected {% endifequal %}value={{term_opt.slug}}>{{term_opt.name}}</option>{% endfor %}
+    </select></td>
 </tr>
 <tr>
     <th>Budget Area</th>
     <td>{{area}}</td>
+</tr>
+<tr>
+    <th>Primary Axis</th>
+    <td><select name='primary'>
+    {% for slug, content in axes.items %}{% if content.2 %}<option {% ifequal primary_name content.0 %}selected {% endifequal %}value='{{slug}}'>{{content.0}}</option>{% endif %}{% endfor %}
+    </select></td>
+</tr>
+<tr>
+    <th>Secondary Axis</th>
+    <td><select name='secondary'>
+    {% for slug, content in axes.items %}{% if content.3 %}<option {% ifequal secondary_name content.0 %}selected {% endifequal %}value='{{slug}}'>{{content.0}}</option>{% endif %}{% endfor %}
+    </select></td>
+</tr>
+<tr>
+    <th colspan='2'><input type='submit' name='submit' value='Submit'></th>
 </tr>
 </table>