mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-04-29 09:52:36 +02:00
Statistics view #323
Remove header and table column of 'Balance' in statistics view
This commit is contained in:
parent
9aa7e62d0f
commit
1f62f18154
3 changed files with 10 additions and 16 deletions
|
@ -8,6 +8,7 @@ This document describes changes between each past release.
|
||||||
|
|
||||||
- Add support for espanol latino america (es_419)
|
- Add support for espanol latino america (es_419)
|
||||||
- Use the external debts lib to solve settlements (#476)
|
- Use the external debts lib to solve settlements (#476)
|
||||||
|
- Remove balance column in statistics view (#323)
|
||||||
|
|
||||||
|
|
||||||
4.1.3 (2019-09-18)
|
4.1.3 (2019-09-18)
|
||||||
|
|
|
@ -3,6 +3,10 @@
|
||||||
{% block sidebar %}
|
{% block sidebar %}
|
||||||
<div id="table_overflow">
|
<div id="table_overflow">
|
||||||
<table class="balance table">
|
<table class="balance table">
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th class="balance-value">{{ _("Balance") }}</th>
|
||||||
|
</tr>
|
||||||
{% for stat in members_stats| sort(attribute='member.name') %}
|
{% for stat in members_stats| sort(attribute='member.name') %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="balance-name">{{ stat.member.name }}</td>
|
<td class="balance-name">{{ stat.member.name }}</td>
|
||||||
|
@ -18,14 +22,13 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<table id="bill_table" class="split_bills table table-striped">
|
<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>
|
<tbody>
|
||||||
{% for stat in members_stats %}
|
{% for stat in members_stats %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ stat.member.name }}</td>
|
<td>{{ stat.member.name }}</td>
|
||||||
<td>{{ "%0.2f"|format(stat.paid) }}</td>
|
<td>{{ "%0.2f"|format(stat.paid) }}</td>
|
||||||
<td>{{ "%0.2f"|format(stat.spent) }}</td>
|
<td>{{ "%0.2f"|format(stat.spent) }}</td>
|
||||||
<td>{{ "%0.2f"|format(stat.balance) }}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -933,29 +933,19 @@ class BudgetTestCase(IhatemoneyTestCase):
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
"<td>alexis</td>\n "
|
"<td>alexis</td>\n "
|
||||||
+ "<td>20.00</td>\n "
|
+ "<td>20.00</td>\n "
|
||||||
+ "<td>31.67</td>\n "
|
+ "<td>31.67</td>\n",
|
||||||
+ "<td>-11.67</td>\n",
|
|
||||||
response.data.decode("utf-8"),
|
response.data.decode("utf-8"),
|
||||||
)
|
)
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
"<td>fred</td>\n "
|
"<td>fred</td>\n " + "<td>20.00</td>\n " + "<td>5.83</td>\n",
|
||||||
+ "<td>20.00</td>\n "
|
|
||||||
+ "<td>5.83</td>\n "
|
|
||||||
+ "<td>14.17</td>\n",
|
|
||||||
response.data.decode("utf-8"),
|
response.data.decode("utf-8"),
|
||||||
)
|
)
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
"<td>tata</td>\n "
|
"<td>tata</td>\n " + "<td>0.00</td>\n " + "<td>2.50</td>\n",
|
||||||
+ "<td>0.00</td>\n "
|
|
||||||
+ "<td>2.50</td>\n "
|
|
||||||
+ "<td>-2.50</td>\n",
|
|
||||||
response.data.decode("utf-8"),
|
response.data.decode("utf-8"),
|
||||||
)
|
)
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
"<td>toto</td>\n "
|
"<td>toto</td>\n " + "<td>0.00</td>\n " + "<td>0.00</td>\n",
|
||||||
+ "<td>0.00</td>\n "
|
|
||||||
+ "<td>0.00</td>\n "
|
|
||||||
+ "<td>0.00</td>\n",
|
|
||||||
response.data.decode("utf-8"),
|
response.data.decode("utf-8"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue