From 49426740e8e0c59040f4f3721a658f225572582b Mon Sep 17 00:00:00 2001
From: Joris
Date: Tue, 28 Nov 2017 09:11:19 +0100
Subject: Add search for payments

---
 client/src/View/Payment/Pages.hs | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'client/src/View/Payment/Pages.hs')

diff --git a/client/src/View/Payment/Pages.hs b/client/src/View/Payment/Pages.hs
index 81555ab..dfd92c0 100644
--- a/client/src/View/Payment/Pages.hs
+++ b/client/src/View/Payment/Pages.hs
@@ -8,7 +8,7 @@ import qualified Data.Text              as T
 import           Reflex.Dom             (Dynamic, Event, MonadWidget)
 import qualified Reflex.Dom             as R
 
-import           Common.Model           (Frequency (..), Payment (..))
+import           Common.Model           (Payment (..))
 
 import           Component              (ButtonIn (..), ButtonOut (..))
 import qualified Component              as Component
@@ -16,52 +16,57 @@ import qualified Component              as Component
 import qualified Icon
 import qualified View.Payment.Constants as Constants
 
-data PagesIn = PagesIn
-  { _pagesIn_payments :: [Payment]
+data PagesIn t = PagesIn
+  { _pagesIn_payments :: Dynamic t [Payment]
   }
 
 data PagesOut t = PagesOut
   { _pagesOut_currentPage :: Dynamic t Int
   }
 
-widget :: forall t m. MonadWidget t m => PagesIn -> m (PagesOut t)
+widget :: forall t m. MonadWidget t m => PagesIn t -> m (PagesOut t)
 widget pagesIn = do
   R.divClass "pages" $ do
     rec
       currentPage <- R.holdDyn 1 . R.leftmost $ [ firstPageClic, previousPageClic, pageClic, nextPageClic, lastPageClic ]
 
-      firstPageClic <- pageButton (R.constDyn 0) (R.constDyn 1) Icon.doubleLeftBar
+      firstPageClic <- pageButton noCurrentPage (R.constDyn 1) Icon.doubleLeftBar
 
-      previousPageClic <- pageButton (R.constDyn 0) (fmap (\x -> max (x - 1) 1) currentPage) Icon.doubleLeft
+      previousPageClic <- pageButton noCurrentPage (fmap (\x -> max (x - 1) 1) currentPage) Icon.doubleLeft
 
-      pageClic <- pageEvent <$> (R.simpleList (fmap (range maxPage) currentPage) $ \p ->
-        pageButton currentPage p (R.dynText $ fmap (T.pack . show) p))
+      pageClic <- pageEvent <$> (R.simpleList (range <$> currentPage <*> maxPage) $ \p ->
+        pageButton (Just <$> currentPage) p (R.dynText $ fmap (T.pack . show) p))
 
-      nextPageClic <- pageButton (R.constDyn 0) (fmap (\x -> min (x + 1) maxPage) currentPage) Icon.doubleRight
+      nextPageClic <- pageButton noCurrentPage ((\c m -> min (c + 1) m) <$> currentPage <*> maxPage) Icon.doubleRight
 
-      lastPageClic <- pageButton (R.constDyn 0) (R.constDyn maxPage) Icon.doubleRightBar
+      lastPageClic <- pageButton noCurrentPage maxPage Icon.doubleRightBar
 
     return $ PagesOut
       { _pagesOut_currentPage = currentPage
       }
 
-    where paymentCount = length . filter ((==) Punctual . _payment_frequency) . _pagesIn_payments $ pagesIn
-          maxPage = ceiling $ toRational paymentCount / toRational Constants.paymentsPerPage
+    where maxPage =
+            R.ffor (_pagesIn_payments pagesIn) (\payments ->
+              ceiling $ toRational (length payments) / toRational Constants.paymentsPerPage
+            )
+
           pageEvent = R.switchPromptlyDyn . fmap R.leftmost
 
+          noCurrentPage = R.constDyn Nothing
+
 range :: Int -> Int -> [Int]
-range maxPage currentPage = [start..end]
+range currentPage maxPage = [start..end]
   where sidePages = 2
-        start = max 1 (currentPage - sidePages)
+        start = max 1 (min (currentPage - sidePages) (maxPage - sidePages * 2))
         end = min maxPage (start + sidePages * 2)
 
-pageButton :: forall t m. MonadWidget t m => Dynamic t Int -> Dynamic t Int -> m () -> m (Event t Int)
+pageButton :: forall t m. MonadWidget t m => Dynamic t (Maybe Int) -> Dynamic t Int -> m () -> m (Event t Int)
 pageButton currentPage page content = do
   clic <- _buttonOut_clic <$> (Component.button $ ButtonIn
     { _buttonIn_class   = do
         cp <- currentPage
         p <- page
-        if cp == p then "page current" else "page"
+        if cp == Just p then "page current" else "page"
     , _buttonIn_content = content
     , _buttonIn_waiting = R.never
     })
-- 
cgit v1.2.3