1 files changed, 36 insertions, 38 deletions

diff --git a/src/client/elm/LoggedIn/Home/View/Paging.elm b/src/client/elm/LoggedIn/Home/View/Paging.elm
index 5bcb827..dffe061 100644
--- a/src/client/elm/LoggedIn/Home/View/Paging.elm
+++ b/src/client/elm/LoggedIn/Home/View/Paging.elm
@@ -10,31 +10,29 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)
 
-import LoggedIn.Msg as LoggedInMsg
-
-import LoggedIn.Home.Msg as HomeMsg
-import LoggedIn.Home.Model as HomeModel
-
-import Msg exposing (Msg)
 import LoggedData exposing (LoggedData)
 import Model.Payment as Payment exposing (Payments, perPage)
 
 showedPages : Int
 showedPages = 5
 
-view : HomeModel.Model -> Payments -> Html Msg
-view homeModel payments =
-  let maxPage = ceiling (toFloat (List.length payments) / toFloat perPage)
-      pages = truncatePages homeModel.currentPage [1..maxPage]
+view : Int -> Int -> msg -> (Int -> msg) -> Html msg
+view currentPage payments noOp pageMsg =
+  let maxPage = ceiling (toFloat payments / toFloat perPage)
+      pages = truncatePages currentPage (List.range 1 maxPage)
   in  if maxPage <= 1
         then
           text ""
         else
           div
             [ class "pages" ]
-            (  [ firstPage homeModel, previousPage homeModel ]
-            ++ ( List.map (paymentsPage homeModel) pages)
-            ++ [ nextPage homeModel maxPage, lastPage homeModel maxPage ]
+            (  [ firstPage currentPage pageMsg
+               , previousPage currentPage noOp pageMsg
+               ]
+            ++ ( List.map (paymentsPage currentPage noOp pageMsg) pages)
+            ++ [ nextPage currentPage maxPage noOp pageMsg
+               , lastPage currentPage maxPage pageMsg
+               ]
             )
 
 truncatePages : Int -> List Int -> List Int
@@ -44,57 +42,57 @@ truncatePages currentPage pages =
       showedRightPages = floor ((toFloat showedPages - 1) / 2)
       truncatedPages =
         if currentPage <= showedLeftPages then
-          [1..showedPages]
+          (List.range 1 showedPages)
         else if currentPage > totalPages - showedRightPages then
-          [(totalPages - showedPages + 1)..totalPages]
+          (List.range (totalPages - showedPages + 1) totalPages)
         else
-          [(currentPage - showedLeftPages)..(currentPage + showedRightPages)]
+          (List.range (currentPage - showedLeftPages) (currentPage + showedRightPages))
   in  List.filter (flip List.member pages) truncatedPages
 
-firstPage : HomeModel.Model -> Html Msg
-firstPage homeModel =
+firstPage : Int -> (Int -> msg) -> Html msg
+firstPage currentPage pageMsg =
   button
     [ classList
         [ ("page", True)
-        , ("disable", homeModel.currentPage <= 1)
+        , ("disable", currentPage <= 1)
         ]
-    , onClick (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdatePage <| 1)
+    , onClick (pageMsg 1)
     ]
     [ FontAwesome.fast_backward grey 13 ]
 
-previousPage : HomeModel.Model -> Html Msg
-previousPage homeModel =
+previousPage : Int -> msg -> (Int -> msg) -> Html msg
+previousPage currentPage noOp pageMsg =
   button
     [ class "page"
     , onClick <|
-        if homeModel.currentPage > 1
-          then (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdatePage <| homeModel.currentPage - 1)
-          else Msg.NoOp
+        if currentPage > 1
+          then (pageMsg <| currentPage - 1)
+          else noOp
     ]
     [ FontAwesome.backward grey 13 ]
 
-nextPage : HomeModel.Model -> Int -> Html Msg
-nextPage homeModel maxPage =
+nextPage : Int -> Int -> msg -> (Int -> msg) -> Html msg
+nextPage currentPage maxPage noOp pageMsg =
   button
     [ class "page"
     , onClick <|
-        if homeModel.currentPage < maxPage
-          then (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdatePage <| homeModel.currentPage + 1)
-          else Msg.NoOp
+        if currentPage < maxPage
+          then (pageMsg <| currentPage + 1)
+          else noOp
     ]
     [ FontAwesome.forward grey 13 ]
 
-lastPage : HomeModel.Model -> Int -> Html Msg
-lastPage homeModel maxPage =
+lastPage : Int -> Int -> (Int -> msg) -> Html msg
+lastPage currentPage maxPage pageMsg =
   button
     [ class "page"
-    , onClick (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdatePage <| maxPage)
+    , onClick (pageMsg maxPage)
     ]
     [ FontAwesome.fast_forward grey 13 ]
 
-paymentsPage : HomeModel.Model -> Int -> Html Msg
-paymentsPage homeModel page =
-  let onCurrentPage = page == homeModel.currentPage
+paymentsPage : Int -> msg -> (Int -> msg) -> Int -> Html msg
+paymentsPage currentPage noOp pageMsg page =
+  let onCurrentPage = page == currentPage
   in  button
         [ classList
             [ ("page", True)
@@ -102,8 +100,8 @@ paymentsPage homeModel page =
             ]
         , onClick <|
             if onCurrentPage
-              then Msg.NoOp
-              else Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdatePage <| page
+              then noOp
+              else pageMsg page
         ]
         [ text (toString page) ]