From 6e9e34e92a244ab6c38d135d46f9f5bb01391906 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Oct 2019 09:51:52 +0200
Subject: Move income header and income table views into separate components

---
 client/src/View/Income/Table.hs | 63 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 client/src/View/Income/Table.hs

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
new file mode 100644
index 0000000..2e8f4e6
--- /dev/null
+++ b/client/src/View/Income/Table.hs
@@ -0,0 +1,63 @@
+module View.Income.Table
+  ( view
+  , IncomeTableIn(..)
+  ) where
+
+import qualified Data.List          as L
+import qualified Data.Maybe         as Maybe
+import           Data.Text          (Text)
+import           Reflex.Dom         (MonadWidget)
+import qualified Reflex.Dom         as R
+
+import           Common.Model       (Income (..), Init (..), User (..))
+import qualified Common.Model       as CM
+import qualified Common.Msg         as Msg
+import qualified Common.View.Format as Format
+import           Component          (TableIn (..))
+import qualified Component
+
+data IncomeTableIn = IncomeTableIn
+  { _tableIn_init :: Init
+  }
+
+view :: forall t m. MonadWidget t m => IncomeTableIn -> m ()
+view tableIn = do
+
+    Component.table $ TableIn
+      { _tableIn_headerLabel = headerLabel
+      , _tableIn_rows =
+        R.constDyn
+        . reverse
+        . L.sortOn _income_date
+        . _init_incomes
+        . _tableIn_init
+        $ tableIn
+      , _tableIn_cell = cell (_tableIn_init tableIn)
+      , _tableIn_perPage = 7
+      , _tableIn_resetPage = R.never
+      }
+
+    return ()
+
+data Header
+  = UserHeader
+  | AmountHeader
+  | DateHeader
+  deriving (Eq, Show, Bounded, Enum)
+
+headerLabel :: Header -> Text
+headerLabel UserHeader   = Msg.get Msg.Income_Name
+headerLabel DateHeader   = Msg.get Msg.Income_Date
+headerLabel AmountHeader = Msg.get Msg.Income_Amount
+
+cell :: Init -> Header -> Income -> Text
+cell init header income =
+  case header of
+    UserHeader ->
+      Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) (_init_users init)
+
+    DateHeader ->
+      Format.longDay . _income_date $ income
+
+    AmountHeader ->
+      Format.price (_init_currency init) . _income_amount $ income
-- 
cgit v1.2.3


From 7aadcc97f9df0e2daccbe8a8726d8bc6c63d67f4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Oct 2019 12:02:21 +0200
Subject: Add income

---
 client/src/View/Income/Table.hs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 2e8f4e6..5363ca5 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -6,7 +6,7 @@ module View.Income.Table
 import qualified Data.List          as L
 import qualified Data.Maybe         as Maybe
 import           Data.Text          (Text)
-import           Reflex.Dom         (MonadWidget)
+import           Reflex.Dom         (Dynamic, MonadWidget)
 import qualified Reflex.Dom         as R
 
 import           Common.Model       (Income (..), Init (..), User (..))
@@ -16,22 +16,17 @@ import qualified Common.View.Format as Format
 import           Component          (TableIn (..))
 import qualified Component
 
-data IncomeTableIn = IncomeTableIn
-  { _tableIn_init :: Init
+data IncomeTableIn t = IncomeTableIn
+  { _tableIn_init    :: Init
+  , _tableIn_incomes :: Dynamic t [Income]
   }
 
-view :: forall t m. MonadWidget t m => IncomeTableIn -> m ()
+view :: forall t m. MonadWidget t m => IncomeTableIn t -> m ()
 view tableIn = do
 
     Component.table $ TableIn
       { _tableIn_headerLabel = headerLabel
-      , _tableIn_rows =
-        R.constDyn
-        . reverse
-        . L.sortOn _income_date
-        . _init_incomes
-        . _tableIn_init
-        $ tableIn
+      , _tableIn_rows = R.ffor (_tableIn_incomes tableIn) $ reverse . L.sortOn _income_date
       , _tableIn_cell = cell (_tableIn_init tableIn)
       , _tableIn_perPage = 7
       , _tableIn_resetPage = R.never
-- 
cgit v1.2.3


From 602c52acfcfa494b07fec05c20b317b60ea8a6f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Oct 2019 21:31:57 +0200
Subject: Load init data per page with AJAX

---
 client/src/View/Income/Table.hs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 5363ca5..d42848b 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -9,16 +9,19 @@ import           Data.Text          (Text)
 import           Reflex.Dom         (Dynamic, MonadWidget)
 import qualified Reflex.Dom         as R
 
-import           Common.Model       (Income (..), Init (..), User (..))
+import           Common.Model       (Currency, Income (..), User (..))
 import qualified Common.Model       as CM
 import qualified Common.Msg         as Msg
 import qualified Common.View.Format as Format
+
 import           Component          (TableIn (..))
 import qualified Component
+import           View.Income.Init   (Init (..))
 
 data IncomeTableIn t = IncomeTableIn
-  { _tableIn_init    :: Init
-  , _tableIn_incomes :: Dynamic t [Income]
+  { _tableIn_init     :: Init
+  , _tableIn_currency :: Currency
+  , _tableIn_incomes  :: Dynamic t [Income]
   }
 
 view :: forall t m. MonadWidget t m => IncomeTableIn t -> m ()
@@ -27,7 +30,7 @@ view tableIn = do
     Component.table $ TableIn
       { _tableIn_headerLabel = headerLabel
       , _tableIn_rows = R.ffor (_tableIn_incomes tableIn) $ reverse . L.sortOn _income_date
-      , _tableIn_cell = cell (_tableIn_init tableIn)
+      , _tableIn_cell = cell (_tableIn_init tableIn) (_tableIn_currency tableIn)
       , _tableIn_perPage = 7
       , _tableIn_resetPage = R.never
       }
@@ -45,8 +48,8 @@ headerLabel UserHeader   = Msg.get Msg.Income_Name
 headerLabel DateHeader   = Msg.get Msg.Income_Date
 headerLabel AmountHeader = Msg.get Msg.Income_Amount
 
-cell :: Init -> Header -> Income -> Text
-cell init header income =
+cell :: Init -> Currency -> Header -> Income -> Text
+cell init currency header income =
   case header of
     UserHeader ->
       Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) (_init_users init)
@@ -55,4 +58,4 @@ cell init header income =
       Format.longDay . _income_date $ income
 
     AmountHeader ->
-      Format.price (_init_currency init) . _income_amount $ income
+      Format.price currency . _income_amount $ income
-- 
cgit v1.2.3


From 613ffccac4b3ab25c6d4c631fab757da0b35acf6 Mon Sep 17 00:00:00 2001
From: Joris
Date: Tue, 22 Oct 2019 22:26:38 +0200
Subject: Harmonize view component code style

---
 client/src/View/Income/Table.hs | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index d42848b..9cb705f 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -1,6 +1,6 @@
 module View.Income.Table
   ( view
-  , IncomeTableIn(..)
+  , In(..)
   ) where
 
 import qualified Data.List          as L
@@ -14,25 +14,24 @@ import qualified Common.Model       as CM
 import qualified Common.Msg         as Msg
 import qualified Common.View.Format as Format
 
-import           Component          (TableIn (..))
-import qualified Component
+import qualified Component.Table    as Table
 import           View.Income.Init   (Init (..))
 
-data IncomeTableIn t = IncomeTableIn
-  { _tableIn_init     :: Init
-  , _tableIn_currency :: Currency
-  , _tableIn_incomes  :: Dynamic t [Income]
+data In t = In
+  { _in_init     :: Init
+  , _in_currency :: Currency
+  , _in_incomes  :: Dynamic t [Income]
   }
 
-view :: forall t m. MonadWidget t m => IncomeTableIn t -> m ()
-view tableIn = do
+view :: forall t m. MonadWidget t m => In t -> m ()
+view input = do
 
-    Component.table $ TableIn
-      { _tableIn_headerLabel = headerLabel
-      , _tableIn_rows = R.ffor (_tableIn_incomes tableIn) $ reverse . L.sortOn _income_date
-      , _tableIn_cell = cell (_tableIn_init tableIn) (_tableIn_currency tableIn)
-      , _tableIn_perPage = 7
-      , _tableIn_resetPage = R.never
+    Table.view $ Table.In
+      { Table._in_headerLabel = headerLabel
+      , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
+      , Table._in_cell = cell (_in_init input) (_in_currency input)
+      , Table._in_perPage = 7
+      , Table._in_resetPage = R.never
       }
 
     return ()
-- 
cgit v1.2.3


From 61ff1443c42def5a09f624e3df2e2520e97610d0 Mon Sep 17 00:00:00 2001
From: Joris
Date: Tue, 22 Oct 2019 23:25:05 +0200
Subject: Clone incomes

---
 client/src/View/Income/Table.hs | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 9cb705f..358cb17 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -1,12 +1,13 @@
 module View.Income.Table
   ( view
   , In(..)
+  , Out(..)
   ) where
 
 import qualified Data.List          as L
 import qualified Data.Maybe         as Maybe
 import           Data.Text          (Text)
-import           Reflex.Dom         (Dynamic, MonadWidget)
+import           Reflex.Dom         (Dynamic, Event, MonadWidget)
 import qualified Reflex.Dom         as R
 
 import           Common.Model       (Currency, Income (..), User (..))
@@ -15,6 +16,7 @@ import qualified Common.Msg         as Msg
 import qualified Common.View.Format as Format
 
 import qualified Component.Table    as Table
+import qualified View.Income.Add    as Add
 import           View.Income.Init   (Init (..))
 
 data In t = In
@@ -23,18 +25,28 @@ data In t = In
   , _in_incomes  :: Dynamic t [Income]
   }
 
-view :: forall t m. MonadWidget t m => In t -> m ()
+data Out t = Out
+  { _out_addIncome :: Event t Income
+  }
+
+view :: forall t m. MonadWidget t m => In t -> m (Out t)
 view input = do
 
-    Table.view $ Table.In
-      { Table._in_headerLabel = headerLabel
-      , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
-      , Table._in_cell = cell (_in_init input) (_in_currency input)
-      , Table._in_perPage = 7
-      , Table._in_resetPage = R.never
-      }
+  table <- Table.view $ Table.In
+    { Table._in_headerLabel = headerLabel
+    , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
+    , Table._in_cell = cell (_in_init input) (_in_currency input)
+    , Table._in_perPage = 7
+    , Table._in_resetPage = R.never
+    , Table._in_cloneModal = \income ->
+      Add.view $ Add.In
+        { Add._in_income = Just <$> income
+        }
+    }
 
-    return ()
+  return $ Out
+    { _out_addIncome = Table._out_add table
+    }
 
 data Header
   = UserHeader
-- 
cgit v1.2.3


From f968c8ce63e1aec119b1e6f414cf27e2c0294bcb Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 23 Oct 2019 21:09:54 +0200
Subject: Delete income

---
 client/src/View/Income/Table.hs | 54 +++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 18 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 358cb17..16ebf7c 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -4,29 +4,36 @@ module View.Income.Table
   , Out(..)
   ) where
 
-import qualified Data.List          as L
-import qualified Data.Maybe         as Maybe
-import           Data.Text          (Text)
-import           Reflex.Dom         (Dynamic, Event, MonadWidget)
-import qualified Reflex.Dom         as R
+import qualified Data.List               as L
+import qualified Data.Maybe              as Maybe
+import           Data.Text               (Text)
+import qualified Data.Text               as T
+import           Reflex.Dom              (Dynamic, Event, MonadWidget)
+import qualified Reflex.Dom              as R
 
-import           Common.Model       (Currency, Income (..), User (..))
-import qualified Common.Model       as CM
-import qualified Common.Msg         as Msg
-import qualified Common.View.Format as Format
+import           Common.Model            (Currency, Income (..), User (..),
+                                          UserId)
+import qualified Common.Model            as CM
+import qualified Common.Msg              as Msg
+import qualified Common.View.Format      as Format
 
-import qualified Component.Table    as Table
-import qualified View.Income.Add    as Add
-import           View.Income.Init   (Init (..))
+import qualified Component.ConfirmDialog as ConfirmDialog
+import qualified Component.Table         as Table
+import qualified Util.Ajax               as Ajax
+import qualified Util.Either             as EitherUtil
+import qualified View.Income.Add         as Add
+import           View.Income.Init        (Init (..))
 
 data In t = In
-  { _in_init     :: Init
-  , _in_currency :: Currency
-  , _in_incomes  :: Dynamic t [Income]
+  { _in_currentUser :: UserId
+  , _in_init        :: Init
+  , _in_currency    :: Currency
+  , _in_incomes     :: Dynamic t [Income]
   }
 
 data Out t = Out
-  { _out_addIncome :: Event t Income
+  { _out_add    :: Event t Income
+  , _out_delete :: Event t Income
   }
 
 view :: forall t m. MonadWidget t m => In t -> m (Out t)
@@ -40,12 +47,23 @@ view input = do
     , Table._in_resetPage = R.never
     , Table._in_cloneModal = \income ->
       Add.view $ Add.In
-        { Add._in_income = Just <$> income
+        { Add._in_income = Just income
         }
+    , Table._in_deleteModal = \income ->
+      ConfirmDialog.view $ ConfirmDialog.In
+        { ConfirmDialog._in_header  = Msg.get Msg.Income_DeleteConfirm
+        , ConfirmDialog._in_confirm = \e -> do
+          res <- Ajax.delete
+            (R.constDyn $ T.concat ["/api/income/", T.pack . show $ _income_id income])
+            e
+          return $ income <$ R.fmapMaybe EitherUtil.eitherToMaybe res
+        }
+    , Table._in_isOwner = (== (_in_currentUser input)) . _income_userId
     }
 
   return $ Out
-    { _out_addIncome = Table._out_add table
+    { _out_add = Table._out_add table
+    , _out_delete = Table._out_delete table
     }
 
 data Header
-- 
cgit v1.2.3


From e4b32ce15f8c92f3b477d3f3d4d301ba08f9b5e3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 23 Oct 2019 22:35:27 +0200
Subject: Edit an income

---
 client/src/View/Income/Table.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 16ebf7c..f865fd9 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -11,8 +11,9 @@ import qualified Data.Text               as T
 import           Reflex.Dom              (Dynamic, Event, MonadWidget)
 import qualified Reflex.Dom              as R
 
-import           Common.Model            (Currency, Income (..), User (..),
-                                          UserId)
+import           Common.Model            (CreateIncomeForm (..), Currency,
+                                          EditIncomeForm (..), Income (..),
+                                          User (..), UserId)
 import qualified Common.Model            as CM
 import qualified Common.Msg              as Msg
 import qualified Common.View.Format      as Format
@@ -21,7 +22,7 @@ import qualified Component.ConfirmDialog as ConfirmDialog
 import qualified Component.Table         as Table
 import qualified Util.Ajax               as Ajax
 import qualified Util.Either             as EitherUtil
-import qualified View.Income.Add         as Add
+import qualified View.Income.Form        as Form
 import           View.Income.Init        (Init (..))
 
 data In t = In
@@ -33,6 +34,7 @@ data In t = In
 
 data Out t = Out
   { _out_add    :: Event t Income
+  , _out_edit   :: Event t Income
   , _out_delete :: Event t Income
   }
 
@@ -46,8 +48,12 @@ view input = do
     , Table._in_perPage = 7
     , Table._in_resetPage = R.never
     , Table._in_cloneModal = \income ->
-      Add.view $ Add.In
-        { Add._in_income = Just income
+      Form.view $ Form.In
+        { Form._in_operation = Form.Clone CreateIncomeForm income
+        }
+    , Table._in_editModal = \income ->
+      Form.view $ Form.In
+        { Form._in_operation = Form.Edit (EditIncomeForm $ _income_id income) income
         }
     , Table._in_deleteModal = \income ->
       ConfirmDialog.view $ ConfirmDialog.In
@@ -63,6 +69,7 @@ view input = do
 
   return $ Out
     { _out_add = Table._out_add table
+    , _out_edit = Table._out_edit table
     , _out_delete = Table._out_delete table
     }
 
-- 
cgit v1.2.3


From c53198a7dd46f1575a33f823c29fa02126429e8f Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 23 Oct 2019 22:41:51 +0200
Subject: Go to initial page after adding an income

---
 client/src/View/Income/Table.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index f865fd9..c754a77 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -30,6 +30,7 @@ data In t = In
   , _in_init        :: Init
   , _in_currency    :: Currency
   , _in_incomes     :: Dynamic t [Income]
+  , _in_resetPage   :: Event t ()
   }
 
 data Out t = Out
@@ -46,7 +47,7 @@ view input = do
     , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
     , Table._in_cell = cell (_in_init input) (_in_currency input)
     , Table._in_perPage = 7
-    , Table._in_resetPage = R.never
+    , Table._in_resetPage = _in_resetPage input
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
         { Form._in_operation = Form.Clone CreateIncomeForm income
-- 
cgit v1.2.3


From 8ef4d96644bce59bbb736af6359e644743e5610a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 27 Oct 2019 17:02:43 +0100
Subject: Refactor income form component concerning payload creation

---
 client/src/View/Income/Table.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index c754a77..d089d9f 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -11,9 +11,8 @@ import qualified Data.Text               as T
 import           Reflex.Dom              (Dynamic, Event, MonadWidget)
 import qualified Reflex.Dom              as R
 
-import           Common.Model            (CreateIncomeForm (..), Currency,
-                                          EditIncomeForm (..), Income (..),
-                                          User (..), UserId)
+import           Common.Model            (Currency, Income (..), User (..),
+                                          UserId)
 import qualified Common.Model            as CM
 import qualified Common.Msg              as Msg
 import qualified Common.View.Format      as Format
@@ -50,11 +49,11 @@ view input = do
     , Table._in_resetPage = _in_resetPage input
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
-        { Form._in_operation = Form.Clone CreateIncomeForm income
+        { Form._in_operation = Form.Clone income
         }
     , Table._in_editModal = \income ->
       Form.view $ Form.In
-        { Form._in_operation = Form.Edit (EditIncomeForm $ _income_id income) income
+        { Form._in_operation = Form.Edit income
         }
     , Table._in_deleteModal = \income ->
       ConfirmDialog.view $ ConfirmDialog.In
-- 
cgit v1.2.3


From b97ad942495352c3fc1e0c820cfba82a9693ac7a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 27 Oct 2019 20:26:29 +0100
Subject: WIP Set up server side paging for incomes

---
 client/src/View/Income/Table.hs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index d089d9f..6d69c19 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -22,14 +22,11 @@ import qualified Component.Table         as Table
 import qualified Util.Ajax               as Ajax
 import qualified Util.Either             as EitherUtil
 import qualified View.Income.Form        as Form
-import           View.Income.Init        (Init (..))
 
 data In t = In
   { _in_currentUser :: UserId
-  , _in_init        :: Init
   , _in_currency    :: Currency
   , _in_incomes     :: Dynamic t [Income]
-  , _in_resetPage   :: Event t ()
   }
 
 data Out t = Out
@@ -44,9 +41,7 @@ view input = do
   table <- Table.view $ Table.In
     { Table._in_headerLabel = headerLabel
     , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
-    , Table._in_cell = cell (_in_init input) (_in_currency input)
-    , Table._in_perPage = 7
-    , Table._in_resetPage = _in_resetPage input
+    , Table._in_cell = cell [] (_in_currency input)
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
         { Form._in_operation = Form.Clone income
@@ -84,11 +79,11 @@ headerLabel UserHeader   = Msg.get Msg.Income_Name
 headerLabel DateHeader   = Msg.get Msg.Income_Date
 headerLabel AmountHeader = Msg.get Msg.Income_Amount
 
-cell :: Init -> Currency -> Header -> Income -> Text
-cell init currency header income =
+cell :: [User] -> Currency -> Header -> Income -> Text
+cell users currency header income =
   case header of
     UserHeader ->
-      Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) (_init_users init)
+      Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) users
 
     DateHeader ->
       Format.longDay . _income_date $ income
-- 
cgit v1.2.3


From 227dcd4435b775d7dbc5ae5d3d81b589897253cc Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 2 Nov 2019 20:52:27 +0100
Subject: Implement incomes server side paging

---
 client/src/View/Income/Table.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 6d69c19..9b2129f 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -26,7 +26,7 @@ import qualified View.Income.Form        as Form
 data In t = In
   { _in_currentUser :: UserId
   , _in_currency    :: Currency
-  , _in_incomes     :: Dynamic t [Income]
+  , _in_incomes     :: [Income]
   }
 
 data Out t = Out
@@ -40,7 +40,7 @@ view input = do
 
   table <- Table.view $ Table.In
     { Table._in_headerLabel = headerLabel
-    , Table._in_rows = R.ffor (_in_incomes input) $ reverse . L.sortOn _income_date
+    , Table._in_rows = reverse . L.sortOn _income_date $ _in_incomes input
     , Table._in_cell = cell [] (_in_currency input)
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
-- 
cgit v1.2.3


From a267f0bb4566389342c3244d3c082dc2453f4615 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 3 Nov 2019 09:22:12 +0100
Subject: Show users in income table

---
 client/src/View/Income/Table.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 9b2129f..32ab27b 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -27,6 +27,7 @@ data In t = In
   { _in_currentUser :: UserId
   , _in_currency    :: Currency
   , _in_incomes     :: [Income]
+  , _in_users       :: [User]
   }
 
 data Out t = Out
@@ -41,7 +42,7 @@ view input = do
   table <- Table.view $ Table.In
     { Table._in_headerLabel = headerLabel
     , Table._in_rows = reverse . L.sortOn _income_date $ _in_incomes input
-    , Table._in_cell = cell [] (_in_currency input)
+    , Table._in_cell = cell (_in_users input) (_in_currency input)
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
         { Form._in_operation = Form.Clone income
-- 
cgit v1.2.3


From f4f24158a46d8c0975f1b8813bbdbbeebad8c108 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 6 Nov 2019 19:44:15 +0100
Subject: Show the payment table with server side paging

---
 client/src/View/Income/Table.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 32ab27b..c623acb 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -80,14 +80,14 @@ headerLabel UserHeader   = Msg.get Msg.Income_Name
 headerLabel DateHeader   = Msg.get Msg.Income_Date
 headerLabel AmountHeader = Msg.get Msg.Income_Amount
 
-cell :: [User] -> Currency -> Header -> Income -> Text
+cell :: forall t m. MonadWidget t m => [User] -> Currency -> Header -> Income -> m ()
 cell users currency header income =
   case header of
     UserHeader ->
-      Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) users
+      R.text . Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) users
 
     DateHeader ->
-      Format.longDay . _income_date $ income
+      R.text . Format.longDay . _income_date $ income
 
     AmountHeader ->
-      Format.price currency . _income_amount $ income
+      R.text . Format.price currency . _income_amount $ income
-- 
cgit v1.2.3


From 316bda10c6bec8b5ccc9e23f1f677c076205f046 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 8 Dec 2019 11:39:37 +0100
Subject: Add category page

---
 client/src/View/Income/Table.hs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index c623acb..c7f172b 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -4,7 +4,6 @@ module View.Income.Table
   , Out(..)
   ) where
 
-import qualified Data.List               as L
 import qualified Data.Maybe              as Maybe
 import           Data.Text               (Text)
 import qualified Data.Text               as T
@@ -31,9 +30,9 @@ data In t = In
   }
 
 data Out t = Out
-  { _out_add    :: Event t Income
-  , _out_edit   :: Event t Income
-  , _out_delete :: Event t Income
+  { _out_add    :: Event t ()
+  , _out_edit   :: Event t ()
+  , _out_delete :: Event t ()
   }
 
 view :: forall t m. MonadWidget t m => In t -> m (Out t)
@@ -41,7 +40,7 @@ view input = do
 
   table <- Table.view $ Table.In
     { Table._in_headerLabel = headerLabel
-    , Table._in_rows = reverse . L.sortOn _income_date $ _in_incomes input
+    , Table._in_rows = _in_incomes input
     , Table._in_cell = cell (_in_users input) (_in_currency input)
     , Table._in_cloneModal = \income ->
       Form.view $ Form.In
@@ -58,7 +57,7 @@ view input = do
           res <- Ajax.delete
             (R.constDyn $ T.concat ["/api/income/", T.pack . show $ _income_id income])
             e
-          return $ income <$ R.fmapMaybe EitherUtil.eitherToMaybe res
+          return $ () <$ R.fmapMaybe EitherUtil.eitherToMaybe res
         }
     , Table._in_isOwner = (== (_in_currentUser input)) . _income_userId
     }
-- 
cgit v1.2.3


From da2a0c13aa89705c65fdb9df2f496fb4eea29654 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 4 Jan 2020 19:22:45 +0100
Subject: Allow to remove only unused categories

---
 client/src/View/Income/Table.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'client/src/View/Income/Table.hs')

diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index c7f172b..7b7940d 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -59,7 +59,8 @@ view input = do
             e
           return $ () <$ R.fmapMaybe EitherUtil.eitherToMaybe res
         }
-    , Table._in_isOwner = (== (_in_currentUser input)) . _income_userId
+    , Table._in_canEdit = (== (_in_currentUser input)) . _income_userId
+    , Table._in_canDelete = (== (_in_currentUser input)) . _income_userId
     }
 
   return $ Out
-- 
cgit v1.2.3