Diff: memap.py

Revision:

30:f12ce67666d0

Parent:

29:1210849dba19

Child:

31:8ea194f6145b

--- a/memap.py	Mon Aug 29 11:18:36 2016 +0100
+++ b/memap.py	Mon Aug 29 11:56:59 2016 +0100
@@ -419,6 +419,13 @@
         for i in sorted(self.modules):
 
             row = []
+            row.append(i)
+
+            for k in self.sections:
+                subtotal[k] += self.modules[i][k]
+
+            for k in self.print_sections:
+                row.append(self.modules[i][k])
 
             json_obj.append({
                 "module":i,
@@ -523,16 +530,6 @@
         for i in list(self.print_sections):
             table.align[i] = 'r'
 
-        for i in sorted(self.modules):
-            row = [i]
-
-            for k in self.sections:
-                subtotal[k] += self.modules[i][k]
-
-            for k in self.print_sections:
-                row.append(self.modules[i][k])
-
-            table.add_row(row)
 
         subtotal_row = ['Subtotals']
         for k in self.print_sections: