YunoHost-Apps/ihatemoney_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
Code Issues Activity Actions

Merge pull request #117 from aavenel/fix-rounding

Browse source 
Fix #116 : rounding error in balances
This commit is contained in:
Alexis Metaireau 2014-07-22 20:55:51 +02:00
commit f8161b7872
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
budget/models.py
View file

@ -45,7 +45,7 @@ class Project(db.Model):
for person in self.members: for person in self.members:
balance = should_receive[person] - should_pay[person] balance = should_receive[person] - should_pay[person]
balances[person.id] = round(balance, 2) balances[person.id] = balance
return balances return balances
@ -219,7 +219,7 @@ class Bill(db.Model):
def pay_each(self): def pay_each(self):
"""Compute what each person has to pay""" """Compute what each person has to pay"""
if self.owers: if self.owers:
return round(self.amount / len(self.owers), 2) return self.amount / len(self.owers)
else: else:
return 0 return 0

4
budget/templates/list_bills.html
View file

@ -73,8 +73,8 @@
<form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST"> <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST">
<button type="submit">{{ _("reactivate") }}</button></form></td> <button type="submit">{{ _("reactivate") }}</button></form></td>
{% endif %} {% endif %}
<td class="balance-value {% if balance[member] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}"> <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
{% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }} {% if balance[member.id] > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

2
budget/templates/settle_bills.html
View file

@ -15,7 +15,7 @@
<tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}> <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
<td class="balance-name">{{ member.name }}</td> <td class="balance-name">{{ member.name }}</td>
<td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}"> <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
{% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }} {% if balance[member.id] > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}