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

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

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

diff --git a/client/src/View/Income/Income.hs b/client/src/View/Income/Income.hs
index d82ab4d..fa2585d 100644
--- a/client/src/View/Income/Income.hs
+++ b/client/src/View/Income/Income.hs
@@ -19,6 +19,7 @@ import           Loadable            (Loadable (..))
 import qualified Loadable
 import qualified Util.Ajax           as AjaxUtil
 import qualified Util.Reflex         as ReflexUtil
+import qualified Util.Reflex         as ReflexUtil
 import qualified View.Income.Header  as Header
 import           View.Income.Init    (Init (..))
 import qualified View.Income.Reducer as Reducer
@@ -33,9 +34,8 @@ data In t = In
 view :: forall t m. MonadWidget t m => In t -> m ()
 view input = do
   rec
-    incomes <- Reducer.reducer $ Reducer.In
-      { Reducer._in_newPage      = newPage
-      , Reducer._in_currentPage  = currentPage
+    incomePage <- Reducer.reducer $ Reducer.In
+      { Reducer._in_page         = page
       , Reducer._in_addIncome    = R.leftmost [headerAddIncome, tableAddIncome]
       , Reducer._in_editIncome   = editIncome
       , Reducer._in_deleteIncome = deleteIncome
@@ -44,15 +44,14 @@ view input = do
     let eventFromResult :: forall a. ((Header.Out t, Table.Out t, Pages.Out t) -> Event t a) -> m (Event t a)
         eventFromResult op = ReflexUtil.flatten . fmap (Maybe.fromMaybe R.never . fmap op) $ result
 
-    newPage <- eventFromResult $ Pages._out_newPage . (\(_, _, c) -> c)
-    currentPage <- R.holdDyn 1 newPage
+    page <- eventFromResult $ Pages._out_newPage . (\(_, _, c) -> c)
     headerAddIncome <- eventFromResult $ Header._out_add . (\(a, _, _) -> a)
     tableAddIncome <- eventFromResult $ Table._out_add . (\(_, b, _) -> b)
     editIncome <- eventFromResult $ Table._out_edit . (\(_, b, _) -> b)
     deleteIncome <- eventFromResult $ Table._out_delete . (\(_, b, _) -> b)
 
-    result <- R.dyn . R.ffor ((,) <$> incomes <*> currentPage) $ \(is, p) ->
-      flip Loadable.view is $ \(IncomePage header incomes count) -> do
+    result <- Loadable.view2 incomePage $
+      \(IncomePage page header incomes count) -> do
         header <- Header.view $ Header.In
           { Header._in_users = _in_users input
           , Header._in_header = header
@@ -69,7 +68,7 @@ view input = do
         pages <- Pages.view $ Pages.In
           { Pages._in_total = R.constDyn count
           , Pages._in_perPage = Reducer.perPage
-          , Pages._in_page = p
+          , Pages._in_page = page
           }
 
         return (header, table, pages)
-- 
cgit v1.2.3