From 1f62f18154be9ffab31ce4b8d203bb8e1679e48b Mon Sep 17 00:00:00 2001 From: James Leong Date: Sat, 8 Feb 2020 14:17:02 -0800 Subject: [PATCH] Statistics view #323 Remove header and table column of 'Balance' in statistics view --- CHANGELOG.rst | 1 + ihatemoney/templates/statistics.html | 7 +++++-- ihatemoney/tests/tests.py | 18 ++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bc9dacb3..f4f4b5aa 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,7 @@ This document describes changes between each past release. - Add support for espanol latino america (es_419) - Use the external debts lib to solve settlements (#476) +- Remove balance column in statistics view (#323) 4.1.3 (2019-09-18) diff --git a/ihatemoney/templates/statistics.html b/ihatemoney/templates/statistics.html index 1b07a33f..0cfe1f2f 100644 --- a/ihatemoney/templates/statistics.html +++ b/ihatemoney/templates/statistics.html @@ -3,6 +3,10 @@ {% block sidebar %}
+ + + + {% for stat in members_stats| sort(attribute='member.name') %} @@ -18,14 +22,13 @@ {% block content %}
{{ _("Balance") }}
{{ stat.member.name }}
- + {% for stat in members_stats %} - {% endfor %} diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py index 876a153b..0c99bca8 100644 --- a/ihatemoney/tests/tests.py +++ b/ihatemoney/tests/tests.py @@ -933,29 +933,19 @@ class BudgetTestCase(IhatemoneyTestCase): self.assertIn( "\n " + "\n " - + "\n " - + "\n", + + "\n", response.data.decode("utf-8"), ) self.assertIn( - "\n " - + "\n " - + "\n " - + "\n", + "\n " + "\n " + "\n", response.data.decode("utf-8"), ) self.assertIn( - "\n " - + "\n " - + "\n " - + "\n", + "\n " + "\n " + "\n", response.data.decode("utf-8"), ) self.assertIn( - "\n " - + "\n " - + "\n " - + "\n", + "\n " + "\n " + "\n", response.data.decode("utf-8"), )
{{ _("Who?") }}{{ _("Paid") }}{{ _("Spent") }}{{ _("Balance") }}
{{ _("Who?") }}{{ _("Paid") }}{{ _("Spent") }}
{{ stat.member.name }} {{ "%0.2f"|format(stat.paid) }} {{ "%0.2f"|format(stat.spent) }}{{ "%0.2f"|format(stat.balance) }}
alexis20.0031.67-11.6731.67fred20.005.8314.17fred20.005.83tata0.002.50-2.50tata0.002.50toto0.000.000.00toto0.000.00