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/tests/tests.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'ihatemoney/tests/tests.py')

diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py
index c13131c..3582032 100644
--- a/ihatemoney/tests/tests.py
+++ b/ihatemoney/tests/tests.py
@@ -750,24 +750,24 @@ class BudgetTestCase(IhatemoneyTestCase):
         })
 
         response = self.client.get("/raclette/statistics")
-        self.assertIn("<td>alexis</td>\n            "
-                      + "<td>20.00</td>\n            "
-                      + "<td>31.67</td>\n            "
+        self.assertIn("<td>alexis</td>\n        "
+                      + "<td>20.00</td>\n        "
+                      + "<td>31.67</td>\n        "
                       + "<td>-11.67</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>fred</td>\n            "
-                      + "<td>20.00</td>\n            "
-                      + "<td>5.83</td>\n            "
+        self.assertIn("<td>fred</td>\n        "
+                      + "<td>20.00</td>\n        "
+                      + "<td>5.83</td>\n        "
                       + "<td>14.17</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>tata</td>\n            "
-                      + "<td>0.00</td>\n            "
-                      + "<td>2.50</td>\n            "
+        self.assertIn("<td>tata</td>\n        "
+                      + "<td>0.00</td>\n        "
+                      + "<td>2.50</td>\n        "
                       + "<td>-2.50</td>\n",
                       response.data.decode('utf-8'))
-        self.assertIn("<td>toto</td>\n            "
-                      + "<td>0.00</td>\n            "
-                      + "<td>0.00</td>\n            "
+        self.assertIn("<td>toto</td>\n        "
+                      + "<td>0.00</td>\n        "
+                      + "<td>0.00</td>\n        "
                       + "<td>0.00</td>\n",
                       response.data.decode('utf-8'))
 
-- 
cgit v1.1


From b95ea7f4e68a0794a44e68621a8210bb4db43e67 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Sat, 3 Feb 2018 18:52:04 +0100
Subject: Add statistics support to API

---
 ihatemoney/tests/tests.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'ihatemoney/tests/tests.py')

diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py
index 3582032..3797f09 100644
--- a/ihatemoney/tests/tests.py
+++ b/ihatemoney/tests/tests.py
@@ -1325,6 +1325,40 @@ class APITestCase(IhatemoneyTestCase):
                               headers=self.get_auth("raclette"))
         self.assertStatus(404, req)
 
+    def test_statistics(self):
+        # create a project
+        self.api_create("raclette")
+
+        # add members
+        self.api_add_member("raclette", "alexis")
+        self.api_add_member("raclette", "fred")
+
+        # add a bill
+        req = self.client.post("/api/projects/raclette/bills", data={
+            'date': '2011-08-10',
+            'what': 'fromage',
+            'payer': "1",
+            'payed_for': ["1", "2"],
+            'amount': '25',
+        }, headers=self.get_auth("raclette"))
+
+        # get the list of bills (should be empty)
+        req = self.client.get("/api/projects/raclette/statistics",
+                              headers=self.get_auth("raclette"))
+        self.assertStatus(200, req)
+        self.assertEqual([
+            {'balance': 12.5,
+             'member': {'activated': True, 'id': 1,
+                        'name': 'alexis', 'weight': 1.0},
+             'paid': 25.0,
+             'spent': 12.5},
+            {'balance': -12.5,
+             'member': {'activated': True, 'id': 2,
+                        'name': 'fred', 'weight': 1.0},
+             'paid': 0,
+             'spent': 12.5}],
+            json.loads(req.data.decode('utf-8')))
+
     def test_username_xss(self):
         # create a project
         # self.api_create("raclette")
-- 
cgit v1.1