diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 33e1de58..94b802c6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,10 @@ This document describes changes between each past release. - **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration! - Changed the recommended gunicorn configuration to use the wsgi module as an entrypoint +### Added + +- Add a statistics tab (#257) +- Add python3.6 support (#259) ### Removed diff --git a/ihatemoney/models.py b/ihatemoney/models.py index 6c71a576..cd896f3c 100644 --- a/ihatemoney/models.py +++ b/ihatemoney/models.py @@ -144,6 +144,16 @@ class Project(db.Model): .order_by(Bill.date.desc())\ .order_by(Bill.id.desc()) + def get_member_bills(self, member_id): + """Return the list of bills related to a specific member""" + return Bill.query.join(Person, Project)\ + .filter(Bill.payer_id == Person.id)\ + .filter(Person.project_id == Project.id)\ + .filter(Person.id == member_id)\ + .filter(Project.id == self.id)\ + .order_by(Bill.date.desc())\ + .order_by(Bill.id.desc()) + def get_pretty_bills(self, export_format="json"): """Return a list of project's bills with pretty formatting""" bills = self.get_bills() diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index 76ae8903..36f01f89 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -40,6 +40,7 @@ {% block navbar %}
  • {{ _("Bills") }}
  • {{ _("Settle") }}
    • +
  • {{ _("Statistics") }}
    • {% endblock %} {% endif %} diff --git a/ihatemoney/templates/statistics.html b/ihatemoney/templates/statistics.html new file mode 100644 index 00000000..061c6299 --- /dev/null +++ b/ihatemoney/templates/statistics.html @@ -0,0 +1,35 @@ +{% extends "sidebar_table_layout.html" %} + +{% block sidebar %} +
    + + {% set balance = g.project.balance %} + {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %} + + + + + {% endfor %} +
    {{ member.name }} + {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} +
    +
    +{% endblock %} + + +{% block content %} + + + + {% for member in members %} + + + + + + + {% endfor %} + +
    {{ _("Who?") }}{{ _("Paid") }}{{ _("Spent") }}{{ _("Balance") }}
    {{ member.name }}{{ "%0.2f"|format(paid[member.id]) }}{{ "%0.2f"|format(spent[member.id]) }}{{ "%0.2f"|format(balance[member.id]) }}
    + +{% endblock %} diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py index 86f11f3e..ac3551c0 100644 --- a/ihatemoney/tests/tests.py +++ b/ihatemoney/tests/tests.py @@ -627,6 +627,68 @@ class BudgetTestCase(IhatemoneyTestCase): response = self.client.get("/dashboard") self.assertEqual(response.status_code, 200) + def test_statistics_page(self): + self.post_project("raclette") + response = self.client.get("/raclette/statistics") + self.assertEqual(response.status_code, 200) + + def test_statistics(self): + self.post_project("raclette") + + # add members + self.client.post("/raclette/members/add", data={'name': 'alexis', 'weight': 2}) + self.client.post("/raclette/members/add", data={'name': 'fred'}) + self.client.post("/raclette/members/add", data={'name': 'tata'}) + # Add a member with a balance=0 : + self.client.post("/raclette/members/add", data={'name': 'toto'}) + + # create bills + self.client.post("/raclette/add", data={ + 'date': '2011-08-10', + 'what': 'fromage à raclette', + 'payer': 1, + 'payed_for': [1, 2, 3], + 'amount': '10.0', + }) + + self.client.post("/raclette/add", data={ + 'date': '2011-08-10', + 'what': 'red wine', + 'payer': 2, + 'payed_for': [1], + 'amount': '20', + }) + + self.client.post("/raclette/add", data={ + 'date': '2011-08-10', + 'what': 'delicatessen', + 'payer': 1, + 'payed_for': [1, 2], + 'amount': '10', + }) + + response = self.client.get("/raclette/statistics") + self.assertIn("alexis\n " + + "20.00\n " + + "31.67\n " + + "-11.67\n", + response.data.decode('utf-8')) + self.assertIn("fred\n " + + "20.00\n " + + "5.83\n " + + "14.17\n", + response.data.decode('utf-8')) + self.assertIn("tata\n " + + "0.00\n " + + "2.50\n " + + "-2.50\n", + response.data.decode('utf-8')) + self.assertIn("toto\n " + + "0.00\n " + + "0.00\n " + + "0.00\n", + response.data.decode('utf-8')) + def test_settle_page(self): self.post_project("raclette") response = self.client.get("/raclette/settle_bills") diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.mo b/ihatemoney/translations/fr/LC_MESSAGES/messages.mo index 2f46b710..d6011d51 100644 Binary files a/ihatemoney/translations/fr/LC_MESSAGES/messages.mo and b/ihatemoney/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po index 65c295de..e8b9793d 100644 --- a/ihatemoney/translations/fr/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/fr/LC_MESSAGES/messages.po @@ -400,6 +400,10 @@ msgstr "Factures" msgid "Settle" msgstr "Remboursements" +#: templates/layout.html:50 +msgid "Statistics" +msgstr "Statistiques" + #: templates/layout.html:53 msgid "options" msgstr "options" @@ -529,3 +533,19 @@ msgstr "Qui doit payer ?" #: templates/settle_bills.html:31 msgid "To whom?" msgstr "Pour qui ?" + +#: templates/statistics.html:22 +msgid "Who?" +msgstr "Qui ?" + +#: templates/statistics.html:22 +msgid "Paid" +msgstr "A payé" + +#: templates/statistics.html:22 +msgid "Spent" +msgstr "A dépensé" + +#: templates/statistics.html:22 +msgid "Balance" +msgstr "Solde" diff --git a/ihatemoney/web.py b/ihatemoney/web.py index cc2eeac6..82e15917 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -507,6 +507,28 @@ def settle_bill(): ) +@main.route("//statistics") +def statistics(): + """Compute what each member has paid and spent and display it""" + members = g.project.active_members + balance = g.project.balance + paid = {} + spent = {} + for member in members: + paid[member.id] = sum([bill.amount + for bill in g.project.get_member_bills(member.id).all()]) + spent[member.id] = sum([bill.pay_each() * member.weight + for bill in g.project.get_bills().all() if member in bill.owers]) + return render_template( + "statistics.html", + members=members, + balance=balance, + paid=paid, + spent=spent, + current_view='statistics', + ) + + @main.route("/dashboard") def dashboard(): return render_template("dashboard.html", projects=Project.query.all())