diff options
| author | Alexis Métaireau <alexis@vieuxsinge.com> | 2018-08-05 14:37:50 +0200 |
|---|---|---|
| committer | Alexis Métaireau <alexis@vieuxsinge.com> | 2018-08-05 14:37:50 +0200 |
| commit | 633e3543b24fb241135770afe0ca8bcd8ceae072 (patch) | |
| tree | 33d5183816de8365efb94645b526b5a052d9e28c /ihatemoney/web.py | |
| parent | c3b973b15e888263f6ca8538a72e39280a77ac3e (diff) | |
| parent | 08bcf702b86d520b15cd8e9acee3b8df1fe9d07b (diff) | |
| download | ihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.zip ihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.tar.gz ihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.tar.bz2 | |
Merge branch 'master' into almet/fix-pbkdf2-check
Diffstat (limited to 'ihatemoney/web.py')
| -rw-r--r-- | ihatemoney/web.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ihatemoney/web.py b/ihatemoney/web.py index e6df385..1e16202 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -242,7 +242,7 @@ def create_project(): message_title = _("You have just created '%(project)s' " "to share your expenses", project=g.project.name) - message_body = render_template("reminder_mail.%s" % + message_body = render_template("reminder_mail.%s.j2" % get_locale().language) msg = Message(message_title, @@ -273,7 +273,7 @@ def remind_password(): project = Project.query.get(form.id.data) # send a link to reset the password - password_reminder = "password_reminder.%s" % get_locale().language + password_reminder = "password_reminder.%s.j2" % get_locale().language current_app.mail.send(Message( "password recovery", body=render_template(password_reminder, project=project), @@ -395,7 +395,7 @@ def invite(): if form.validate(): # send the email - message_body = render_template("invitation_mail.%s" % + message_body = render_template("invitation_mail.%s.j2" % get_locale().language) message_title = _("You have been invited to share your " @@ -566,21 +566,9 @@ def settle_bill(): @main.route("/<project_id>/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, + members_stats=g.project.members_stats, current_view='statistics', ) |