diff options
Diffstat (limited to 'ihatemoney/templates')
| -rw-r--r-- | ihatemoney/templates/dashboard.html | 2 | ||||
| -rw-r--r-- | ihatemoney/templates/settle_bills.html | 2 | ||||
| -rw-r--r-- | ihatemoney/templates/statistics.html | 23 |
3 files changed, 13 insertions, 14 deletions
diff --git a/ihatemoney/templates/dashboard.html b/ihatemoney/templates/dashboard.html index b1220bd..807e3e2 100644 --- a/ihatemoney/templates/dashboard.html +++ b/ihatemoney/templates/dashboard.html @@ -4,7 +4,7 @@ <table id="bill_table" class="table table-striped"> <thead><tr><th>{{ _("Project") }}</th><th>{{ _("Number of members") }}</th><th>{{ _("Number of bills") }}</th><th>{{_("Newest bill")}}</th><th>{{_("Oldest bill")}}</th><th>{{_("Actions")}}</th></tr></thead> <tbody>{% for project in projects|sort(attribute='name') %} - <tr class="{{ loop.cycle("odd", "even") }}"> + <tr> <td>{{ project.name }}</td><td>{{ project.members | count }}</td><td>{{ project.get_bills().count() }}</td> {% if project.has_bills() %} <td>{{ project.get_bills().all()[0].date }}</td> diff --git a/ihatemoney/templates/settle_bills.html b/ihatemoney/templates/settle_bills.html index b67a9b8..7ec5e29 100644 --- a/ihatemoney/templates/settle_bills.html +++ b/ihatemoney/templates/settle_bills.html @@ -22,7 +22,7 @@ <thead><tr><th>{{ _("Who pays?") }}</th><th>{{ _("To whom?") }}</th><th>{{ _("How much?") }}</th></tr></thead> <tbody> {% for bill in bills %} - <tr class="{{ loop.cycle("odd", "even") }}" receiver={{bill.receiver.id}}> + <tr receiver={{bill.receiver.id}}> <td>{{ bill.ower }}</td> <td>{{ bill.receiver }}</td> <td>{{ "%0.2f"|format(bill.amount) }}</td> diff --git a/ihatemoney/templates/statistics.html b/ihatemoney/templates/statistics.html index 061c629..1b07a33 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 %} - <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}> - <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]) }} + {% for stat in members_stats| sort(attribute='member.name') %} + <tr> + <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 %} - <tr class="{{ loop.cycle("odd", "even") }}"> - <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> + {% 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> |
