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 %}
{{ member.name }} | -- {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} + | {{ stat.member.name }} | ++ {% if stat.balance|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(stat.balance) }} |
{{ _("Who?") }} | {{ _("Paid") }} | {{ _("Spent") }} | {{ _("Balance") }} | ||||
---|---|---|---|---|---|---|---|
{{ member.name }} | -{{ "%0.2f"|format(paid[member.id]) }} | -{{ "%0.2f"|format(spent[member.id]) }} | -{{ "%0.2f"|format(balance[member.id]) }} | +{{ stat.member.name }} | +{{ "%0.2f"|format(stat.paid) }} | +{{ "%0.2f"|format(stat.spent) }} | +{{ "%0.2f"|format(stat.balance) }} | alexis | \n " - + "20.00 | \n " - + "31.67 | \n " + self.assertIn("alexis | \n " + + "20.00 | \n " + + "31.67 | \n " + "-11.67 | \n", response.data.decode('utf-8')) - self.assertIn("fred | \n " - + "20.00 | \n " - + "5.83 | \n " + self.assertIn("fred | \n " + + "20.00 | \n " + + "5.83 | \n " + "14.17 | \n", response.data.decode('utf-8')) - self.assertIn("tata | \n " - + "0.00 | \n " - + "2.50 | \n " + self.assertIn("tata | \n " + + "0.00 | \n " + + "2.50 | \n " + "-2.50 | \n", response.data.decode('utf-8')) - self.assertIn("toto | \n " - + "0.00 | \n " - + "0.00 | \n " + self.assertIn("toto | \n " + + "0.00 | \n " + + "0.00 | \n " + "0.00 | \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("/