diff options
| -rw-r--r-- | CHANGELOG.rst | 1 | ||||
| -rw-r--r-- | ihatemoney/templates/statistics.html | 7 | ||||
| -rw-r--r-- | ihatemoney/tests/tests.py | 18 |
3 files changed, 10 insertions, 16 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bc9dacb..f4f4b5a 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 1b07a33..0cfe1f2 100644 --- a/ihatemoney/templates/statistics.html +++ b/ihatemoney/templates/statistics.html @@ -3,6 +3,10 @@ {% block sidebar %} <div id="table_overflow"> <table class="balance table"> + <tr> + <th></th> + <th class="balance-value">{{ _("Balance") }}</th> + </tr> {% for stat in members_stats| sort(attribute='member.name') %} <tr> <td class="balance-name">{{ stat.member.name }}</td> @@ -18,14 +22,13 @@ {% block content %} <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> + <thead><tr><th>{{ _("Who?") }}</th><th>{{ _("Paid") }}</th><th>{{ _("Spent") }}</th></tr></thead> <tbody> {% for stat in members_stats %} <tr> <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 876a153..0c99bca 100644 --- a/ihatemoney/tests/tests.py +++ b/ihatemoney/tests/tests.py @@ -933,29 +933,19 @@ class BudgetTestCase(IhatemoneyTestCase): self.assertIn( "<td>alexis</td>\n " + "<td>20.00</td>\n " - + "<td>31.67</td>\n " - + "<td>-11.67</td>\n", + + "<td>31.67</td>\n", response.data.decode("utf-8"), ) self.assertIn( - "<td>fred</td>\n " - + "<td>20.00</td>\n " - + "<td>5.83</td>\n " - + "<td>14.17</td>\n", + "<td>fred</td>\n " + "<td>20.00</td>\n " + "<td>5.83</td>\n", response.data.decode("utf-8"), ) self.assertIn( - "<td>tata</td>\n " - + "<td>0.00</td>\n " - + "<td>2.50</td>\n " - + "<td>-2.50</td>\n", + "<td>tata</td>\n " + "<td>0.00</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 " - + "<td>0.00</td>\n", + "<td>toto</td>\n " + "<td>0.00</td>\n " + "<td>0.00</td>\n", response.data.decode("utf-8"), ) |