From 3b2e11ab6369dfa853383840dc28915b60c2d062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Jan 2018 22:06:11 +0100
Subject: Include all .j2 files in the packaged version.

I've also renamed the templates to *.j2 in order to make things clearer
to others. Having extensions with the name of the locale doesn't seem to
be a good practice, and would need us to add the locales in the MANIFEST
file each time we add one.

Fix #305
---
 ihatemoney/web.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ihatemoney/web.py')

diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index e6df385..6b1b358 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 "
-- 
cgit v1.1


From b1a4572e8c72e1d7f49b07aaeb5be0f3603bf0a7 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 3 Feb 2018 18:04:06 +0100
Subject: Change statistics data structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Clearer data structure, and simpler template

This commit has a side effect: sidebar now hides disabled members.

IMHO, the disabled members should either be hidden or shown consistently between
sidebar and central table. Previous status was: shown in sidebar (if balance ≠
0) and hidden in central table.
---
 ihatemoney/web.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'ihatemoney/web.py')

diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index 6b1b358..85b02e5 100644
--- a/ihatemoney/web.py
+++ b/ihatemoney/web.py
@@ -566,21 +566,22 @@ 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])
+    members_stats = [{
+            'member': member,
+            'paid': sum([
+                bill.amount
+                for bill in g.project.get_member_bills(member.id).all()
+            ]),
+            'spent': sum([
+                bill.pay_each() * member.weight
+                for bill in g.project.get_bills().all() if member in bill.owers
+            ]),
+            'balance': g.project.balance[member.id]
+        } for member in g.project.active_members]
+
     return render_template(
         "statistics.html",
-        members=members,
-        balance=balance,
-        paid=paid,
-        spent=spent,
+        members_stats=members_stats,
         current_view='statistics',
     )
 
-- 
cgit v1.1


From 036cd05e5716a694f575b3c65f6541f04a8b48bf Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 3 Feb 2018 18:26:44 +0100
Subject: Move member stats computation to a dedicated method

---
 ihatemoney/web.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'ihatemoney/web.py')

diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index 85b02e5..1e16202 100644
--- a/ihatemoney/web.py
+++ b/ihatemoney/web.py
@@ -566,22 +566,9 @@ def settle_bill():
 @main.route("/<project_id>/statistics")
 def statistics():
     """Compute what each member has paid and spent and display it"""
-    members_stats = [{
-            'member': member,
-            'paid': sum([
-                bill.amount
-                for bill in g.project.get_member_bills(member.id).all()
-            ]),
-            'spent': sum([
-                bill.pay_each() * member.weight
-                for bill in g.project.get_bills().all() if member in bill.owers
-            ]),
-            'balance': g.project.balance[member.id]
-        } for member in g.project.active_members]
-
     return render_template(
         "statistics.html",
-        members_stats=members_stats,
+        members_stats=g.project.members_stats,
         current_view='statistics',
     )
 
-- 
cgit v1.1