From fb5629d7f705b7e80dcf1852da58d2864c2b0d25 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jun 2016 01:00:53 +0200
Subject: Show payment count and sum right after search

---
 src/client/elm/LoggedIn/Home/View.elm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/client/elm/LoggedIn/Home/View.elm')

diff --git a/src/client/elm/LoggedIn/Home/View.elm b/src/client/elm/LoggedIn/Home/View.elm
index 5ed54b9..82ec8a3 100644
--- a/src/client/elm/LoggedIn/Home/View.elm
+++ b/src/client/elm/LoggedIn/Home/View.elm
@@ -7,6 +7,7 @@ import Html.Attributes exposing (..)
 import Date
 
 import Form
+import Utils.Form as Form
 
 import Msg exposing (Msg)
 
@@ -14,30 +15,21 @@ import LoggedData exposing (LoggedData)
 import Model.Payment as Payment
 
 import LoggedIn.Home.Model as LoggedInModel
-import LoggedIn.Home.Account.View as AccountView
+import LoggedIn.Home.Search.View as SearchView
 import LoggedIn.Home.AddPayment.View as AddPaymentView
 import LoggedIn.Home.View.Monthly as MonthlyView
 
-import LoggedIn.Home.View.Search exposing (paymentsSearch)
 import LoggedIn.Home.View.Table exposing (paymentsTable)
 import LoggedIn.Home.View.Paging exposing (paymentsPaging)
 
 view : LoggedData -> LoggedInModel.Model -> Html Msg
 view loggedData loggedIn =
-  let searchText =
-        Form.getFieldAsString "searchText" loggedIn.search
-          |> .value
-          |> Maybe.withDefault ""
-      punctualPayments = Payment.sortedFiltredPunctual searchText loggedData.payments
+  let punctualPayments = Payment.sortedFiltredPunctual (Form.fieldAsText loggedIn.search "searchText") loggedData.payments
   in  div
         [ class "home" ]
         [ AddPaymentView.view loggedData loggedIn
-        , div
-            [ class "expandables" ]
-            [ AccountView.view loggedData loggedIn
-            , MonthlyView.view loggedData loggedIn
-            ]
-        , paymentsSearch loggedData loggedIn
+        , MonthlyView.view loggedData loggedIn
+        , SearchView.view loggedData loggedIn punctualPayments
         , paymentsTable loggedData loggedIn punctualPayments
-        , paymentsPaging punctualPayments loggedIn
+        , paymentsPaging loggedIn punctualPayments
         ]
-- 
cgit v1.2.3