Changeset 47bb508

Timestamp:

Mar 27, 2010, 6:53:57 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

18149fd

Parents:

2542022

git-author:

Alex Dehnert <adehnert@…> (03/27/10 18:53:57)

git-committer:

Alex Dehnert <adehnert@…> (03/27/10 18:53:57)

Message:

Clarify code slightly

File:

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

remit/finance_core/views.py

@@ -14 +14 @@
 
 def reporting(request):
-    line_items = finance_core.models.LineItem.objects.all()
     compute_method = 'default'
     if 'compute_method' in request.REQUEST:
         compute_method = request.REQUEST['compute_method']
 
+    ###############################
+    # Retrieve the various limits #
+    ###############################
+    line_items = finance_core.models.LineItem.objects.all()
     # Main limit to lineitems, relative to primary axis
     main_lineitem_limits_primary = []
+
+    # Term
     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'])
@@ -29 +34 @@
         term_obj = None
         term_name = 'All'
+
+    # Area
     if 'area' in request.REQUEST:
         base_area_obj = get_object_or_404(finance_core.models.BudgetArea, pk=request.REQUEST['area'])
@@ -36 +43 @@
     line_items = line_items.filter(budget_area__in=all_relevant_areas)
     main_lineitem_limits_primary.append(Q(lineitem__budget_area__in=all_relevant_areas))
+
+    # Layer
     if 'layer' in request.REQUEST and request.REQUEST['layer'] != 'all':
         try:
@@ -48 +57 @@
     main_lineitem_limit_primary = Q(*main_lineitem_limits_primary)
 
-    # Initialize the axis
+    #######################
+    # Initialize the axis #
+    #######################
     # Primary
     if 'primary' in request.REQUEST:
@@ -75 +86 @@
     secondary_labels = [ secondary[1] for secondary in secondary_axis ]
 
-    # Do the computation
+    ######################
+    # Do the computation #
+    ######################
     compute_methods = {
         'default':   finance_core.reporting.build_table,
@@ -94 +107 @@
         print "Table size:\t%dx%d" % (len(primary_labels), len(secondary_labels), )
 
+    ##########
+    # Render #
+    ##########
     term_options = finance_core.models.BudgetTerm.objects.all()
     area_options = finance_core.models.BudgetArea.objects.filter(always=True)