From b1a4572e8c72e1d7f49b07aaeb5be0f3603bf0a7 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 3 Feb 2018 18:04:06 +0100
Subject: [PATCH] Change statistics data structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Clearer data structure, and simpler template

This commit has a side effect: sidebar now hides disabled members.

IMHO, the disabled members should either be hidden or shown consistently between
sidebar and central table. Previous status was: shown in sidebar (if balance ≠
0) and hidden in central table.
---
 ihatemoney/templates/statistics.html | 19 +++++++++----------
 ihatemoney/tests/tests.py            | 24 ++++++++++++------------
 ihatemoney/web.py                    | 27 ++++++++++++++-------------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/ihatemoney/templates/statistics.html b/ihatemoney/templates/statistics.html
index ee59cb9f..1b07a33f 100644
--- a/ihatemoney/templates/statistics.html
+++ b/ihatemoney/templates/statistics.html
@@ -3,12 +3,11 @@
 {% block sidebar %}
     <div id="table_overflow">
     <table class="balance table">
-    {% set balance = g.project.balance %}
-    {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %}
+    {% for stat in members_stats| sort(attribute='member.name') %}
     <tr>
-        <td class="balance-name">{{ member.name }}</td>
-        <td class="balance-value {% if balance[member.id]|round(2) > 0 %}positive{% elif balance[member.id]|round(2) < 0 %}negative{% endif %}">
-            {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }}
+        <td class="balance-name">{{ stat.member.name }}</td>
+        <td class="balance-value {% if stat.balance|round(2) > 0 %}positive{% elif stat.balance|round(2) < 0 %}negative{% endif %}">
+            {% if stat.balance|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(stat.balance) }}
         </td>
     </tr>
     {% endfor %}
@@ -21,12 +20,12 @@
     <table id="bill_table" class="split_bills table table-striped">
         <thead><tr><th>{{ _("Who?") }}</th><th>{{ _("Paid") }}</th><th>{{ _("Spent") }}</th><th>{{ _("Balance") }}</th></tr></thead>
     <tbody>
-    {% for member in members %}
+    {% for stat in members_stats %}
     <tr>
-            <td>{{ member.name }}</td>
-            <td>{{ "%0.2f"|format(paid[member.id]) }}</td>
-            <td>{{ "%0.2f"|format(spent[member.id]) }}</td>
-            <td>{{ "%0.2f"|format(balance[member.id]) }}</td>
+        <td>{{ stat.member.name }}</td>
+        <td>{{ "%0.2f"|format(stat.paid) }}</td>
+        <td>{{ "%0.2f"|format(stat.spent) }}</td>
+        <td>{{ "%0.2f"|format(stat.balance) }}</td>
     </tr>
     {% endfor %}
     </tbody>
diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py
index c13131c4..35820325 100644
--- a/ihatemoney/tests/tests.py
+++ b/ihatemoney/tests/tests.py
@@ -750,24 +750,24 @@ class BudgetTestCase(IhatemoneyTestCase):
         })
 
         response = self.client.get("/raclette/statistics")
-        self.assertIn("<td>alexis</td>\n            "
-                      + "<td>20.00</td>\n            "
-                      + "<td>31.67</td>\n            "
+        self.assertIn("<td>alexis</td>\n        "
+                      + "<td>20.00</td>\n        "
+                      + "<td>31.67</td>\n        "
                       + "<td>-11.67</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>fred</td>\n            "
-                      + "<td>20.00</td>\n            "
-                      + "<td>5.83</td>\n            "
+        self.assertIn("<td>fred</td>\n        "
+                      + "<td>20.00</td>\n        "
+                      + "<td>5.83</td>\n        "
                       + "<td>14.17</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>tata</td>\n            "
-                      + "<td>0.00</td>\n            "
-                      + "<td>2.50</td>\n            "
+        self.assertIn("<td>tata</td>\n        "
+                      + "<td>0.00</td>\n        "
+                      + "<td>2.50</td>\n        "
                       + "<td>-2.50</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>toto</td>\n            "
-                      + "<td>0.00</td>\n            "
-                      + "<td>0.00</td>\n            "
+        self.assertIn("<td>toto</td>\n        "
+                      + "<td>0.00</td>\n        "
+                      + "<td>0.00</td>\n        "
                       + "<td>0.00</td>\n",
                       response.data.decode('utf-8'))
 
diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index 6b1b3589..85b02e5b 100644
--- a/ihatemoney/web.py
+++ b/ihatemoney/web.py
@@ -566,21 +566,22 @@ def settle_bill():
 @main.route("/<project_id>/statistics")
 def statistics():
     """Compute what each member has paid and spent and display it"""
-    members = g.project.active_members
-    balance = g.project.balance
-    paid = {}
-    spent = {}
-    for member in members:
-        paid[member.id] = sum([bill.amount
-                               for bill in g.project.get_member_bills(member.id).all()])
-        spent[member.id] = sum([bill.pay_each() * member.weight
-                                for bill in g.project.get_bills().all() if member in bill.owers])
+    members_stats = [{
+            'member': member,
+            'paid': sum([
+                bill.amount
+                for bill in g.project.get_member_bills(member.id).all()
+            ]),
+            'spent': sum([
+                bill.pay_each() * member.weight
+                for bill in g.project.get_bills().all() if member in bill.owers
+            ]),
+            'balance': g.project.balance[member.id]
+        } for member in g.project.active_members]
+
     return render_template(
         "statistics.html",
-        members=members,
-        balance=balance,
-        paid=paid,
-        spent=spent,
+        members_stats=members_stats,
         current_view='statistics',
     )