From 9dbb4e6f7c2f0edc1126626e2ff498144c6b9947 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 3 Nov 2019 11:28:42 +0100
Subject: Show income header

---
 common/src/Common/Model/IncomePage.hs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 common/src/Common/Model/IncomePage.hs

(limited to 'common/src/Common/Model/IncomePage.hs')

diff --git a/common/src/Common/Model/IncomePage.hs b/common/src/Common/Model/IncomePage.hs
new file mode 100644
index 0000000..c3f478e
--- /dev/null
+++ b/common/src/Common/Model/IncomePage.hs
@@ -0,0 +1,18 @@
+module Common.Model.IncomePage
+  ( IncomePage(..)
+  ) where
+
+import           Data.Aeson                (FromJSON, ToJSON)
+import           GHC.Generics              (Generic)
+
+import           Common.Model.Income       (Income)
+import           Common.Model.IncomeHeader (IncomeHeader)
+
+data IncomePage = IncomePage
+  { _incomePage_header     :: IncomeHeader
+  , _incomePage_incomes    :: [Income]
+  , _incomePage_totalCount :: Int
+  } deriving (Show, Generic)
+
+instance FromJSON IncomePage
+instance ToJSON IncomePage
-- 
cgit v1.2.3


From 54628c70cb33de5e4309c35b9f6b57bbe9f7a07b Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Nov 2019 16:19:53 +0100
Subject: Compute cumulative income with a DB query

---
 common/src/Common/Model/IncomePage.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/src/Common/Model/IncomePage.hs')

diff --git a/common/src/Common/Model/IncomePage.hs b/common/src/Common/Model/IncomePage.hs
index c3f478e..0572141 100644
--- a/common/src/Common/Model/IncomePage.hs
+++ b/common/src/Common/Model/IncomePage.hs
@@ -9,7 +9,8 @@ import           Common.Model.Income       (Income)
 import           Common.Model.IncomeHeader (IncomeHeader)
 
 data IncomePage = IncomePage
-  { _incomePage_header     :: IncomeHeader
+  { _incomePage_page       :: Int
+  , _incomePage_header     :: IncomeHeader
   , _incomePage_incomes    :: [Income]
   , _incomePage_totalCount :: Int
   } deriving (Show, Generic)
-- 
cgit v1.2.3


From e622e8fdd2e40b4306b5cc724d8dfb76bf976242 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 25 Nov 2019 08:17:59 +0100
Subject: Remove Loadable2

---
 common/src/Common/Model/IncomePage.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/src/Common/Model/IncomePage.hs')

diff --git a/common/src/Common/Model/IncomePage.hs b/common/src/Common/Model/IncomePage.hs
index 0572141..977b0ea 100644
--- a/common/src/Common/Model/IncomePage.hs
+++ b/common/src/Common/Model/IncomePage.hs
@@ -13,7 +13,7 @@ data IncomePage = IncomePage
   , _incomePage_header     :: IncomeHeader
   , _incomePage_incomes    :: [Income]
   , _incomePage_totalCount :: Int
-  } deriving (Show, Generic)
+  } deriving (Eq, Show, Generic)
 
 instance FromJSON IncomePage
 instance ToJSON IncomePage
-- 
cgit v1.2.3