aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/elm/LoggedIn/Home/Model.elm1
-rw-r--r--src/client/elm/LoggedIn/Home/Search/View.elm50
-rw-r--r--src/client/elm/LoggedIn/Home/Update.elm5
-rw-r--r--src/client/elm/LoggedIn/Home/View.elm20
-rw-r--r--src/client/elm/LoggedIn/Home/View/Monthly.elm2
-rw-r--r--src/client/elm/LoggedIn/Home/View/Paging.elm4
-rw-r--r--src/client/elm/LoggedIn/Home/View/Search.elm26
-rw-r--r--src/client/elm/LoggedIn/Stat/Account/View.elm (renamed from src/client/elm/LoggedIn/Home/Account/View.elm)24
-rw-r--r--src/client/elm/LoggedIn/Stat/View.elm13
-rw-r--r--src/client/elm/Utils/Form.elm11
-rw-r--r--src/client/elm/View/Plural.elm10
11 files changed, 98 insertions, 68 deletions
diff --git a/src/client/elm/LoggedIn/Home/Model.elm b/src/client/elm/LoggedIn/Home/Model.elm
index a653995..6b29d8c 100644
--- a/src/client/elm/LoggedIn/Home/Model.elm
+++ b/src/client/elm/LoggedIn/Home/Model.elm
@@ -1,5 +1,6 @@
module LoggedIn.Home.Model exposing
( Model
+ , Search
, init
)
diff --git a/src/client/elm/LoggedIn/Home/Search/View.elm b/src/client/elm/LoggedIn/Home/Search/View.elm
new file mode 100644
index 0000000..f06377d
--- /dev/null
+++ b/src/client/elm/LoggedIn/Home/Search/View.elm
@@ -0,0 +1,50 @@
+module LoggedIn.Home.Search.View exposing
+ ( view
+ )
+
+import Html exposing (..)
+import Html.Attributes exposing (..)
+import Html.Events exposing (..)
+import Html.App as Html
+
+import Form exposing (Form)
+import View.Form as Form
+
+import Msg exposing (Msg)
+import LoggedIn.Msg as LoggedInMsg
+import LoggedIn.Home.Msg as HomeMsg
+
+import LoggedData exposing (LoggedData)
+import LoggedIn.Home.Model as HomeModel
+import Model.Translations exposing (getParamMessage)
+import Model.Conf exposing (Conf)
+import Model.Payment exposing (Payments)
+
+import LoggedIn.View.Format as Format
+import View.Plural exposing (plural)
+
+view : LoggedData -> HomeModel.Model -> Payments -> Html Msg
+view loggedData { search } payments =
+ Html.div
+ [ class "search" ]
+ [ searchForm loggedData search
+ , paymentsStat loggedData payments
+ ]
+
+searchForm : LoggedData -> Form String HomeModel.Search -> Html Msg
+searchForm loggedData search =
+ let htmlMap = Html.map (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.SearchMsg)
+ in Form.textInput loggedData.translations search htmlMap "searchText"
+
+paymentsStat : LoggedData -> Payments -> Html Msg
+paymentsStat loggedData payments =
+ let count = plural loggedData.translations (List.length payments) "Payment" "Payments"
+ sum = paymentsSum loggedData.conf payments
+ in text <| getParamMessage [ count, sum ] "Worth" loggedData.translations
+
+paymentsSum : Conf -> Payments -> String
+paymentsSum conf payments =
+ payments
+ |> List.map .cost
+ |> List.sum
+ |> Format.price conf
diff --git a/src/client/elm/LoggedIn/Home/Update.elm b/src/client/elm/LoggedIn/Home/Update.elm
index 302509f..078036d 100644
--- a/src/client/elm/LoggedIn/Home/Update.elm
+++ b/src/client/elm/LoggedIn/Home/Update.elm
@@ -45,7 +45,10 @@ update loggedData action homeModel =
HomeMsg.SearchMsg formMsg ->
( { homeModel
| search = Form.update formMsg homeModel.search
- , currentPage = 1
+ , currentPage =
+ case formMsg of
+ Form.Input "searchText" _ -> 1
+ _ -> homeModel.currentPage
}
, Cmd.none
)
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
]
diff --git a/src/client/elm/LoggedIn/Home/View/Monthly.elm b/src/client/elm/LoggedIn/Home/View/Monthly.elm
index 398059c..20dda19 100644
--- a/src/client/elm/LoggedIn/Home/View/Monthly.elm
+++ b/src/client/elm/LoggedIn/Home/View/Monthly.elm
@@ -33,7 +33,7 @@ view loggedData homeModel =
else
div
[ classList
- [ ("monthlyPayments", True)
+ [ ("monthly", True)
, ("detail", homeModel.monthlyDetail)
]
]
diff --git a/src/client/elm/LoggedIn/Home/View/Paging.elm b/src/client/elm/LoggedIn/Home/View/Paging.elm
index fb78810..da69232 100644
--- a/src/client/elm/LoggedIn/Home/View/Paging.elm
+++ b/src/client/elm/LoggedIn/Home/View/Paging.elm
@@ -22,8 +22,8 @@ import Model.Payment as Payment exposing (Payments, perPage)
showedPages : Int
showedPages = 5
-paymentsPaging : Payments -> HomeModel.Model -> Html Msg
-paymentsPaging payments homeModel =
+paymentsPaging : HomeModel.Model -> Payments -> Html Msg
+paymentsPaging homeModel payments =
let maxPage = ceiling (toFloat (List.length payments) / toFloat perPage)
pages = truncatePages homeModel.currentPage [1..maxPage]
in if maxPage == 1
diff --git a/src/client/elm/LoggedIn/Home/View/Search.elm b/src/client/elm/LoggedIn/Home/View/Search.elm
deleted file mode 100644
index 62db1b2..0000000
--- a/src/client/elm/LoggedIn/Home/View/Search.elm
+++ /dev/null
@@ -1,26 +0,0 @@
-module LoggedIn.Home.View.Search exposing
- ( paymentsSearch
- )
-
-import Html exposing (..)
-import Html.Attributes exposing (..)
-import Html.Events exposing (..)
-import Html.App as Html
-
-import Form exposing (Form)
-import View.Form as Form
-
-import Msg exposing (Msg)
-import LoggedIn.Msg as LoggedInMsg
-import LoggedIn.Home.Msg as HomeMsg
-
-import LoggedData exposing (LoggedData)
-import LoggedIn.Home.Model as HomeModel
-import Model.Translations exposing (getMessage)
-
-paymentsSearch : LoggedData -> HomeModel.Model -> Html Msg
-paymentsSearch loggedData { search } =
- let htmlMap = Html.map (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.SearchMsg)
- in Html.div
- [ class "search" ]
- [ Form.textInput loggedData.translations search htmlMap "searchText" ]
diff --git a/src/client/elm/LoggedIn/Home/Account/View.elm b/src/client/elm/LoggedIn/Stat/Account/View.elm
index fdc1941..3eb5ef4 100644
--- a/src/client/elm/LoggedIn/Home/Account/View.elm
+++ b/src/client/elm/LoggedIn/Stat/Account/View.elm
@@ -1,4 +1,4 @@
-module LoggedIn.Home.Account.View exposing
+module LoggedIn.Stat.Account.View exposing
( view
)
@@ -9,26 +9,22 @@ import Msg exposing (Msg)
import LoggedData exposing (LoggedData)
-import LoggedIn.Home.Model as HomeModel
import LoggedIn.View.Format as Format
import Model exposing (Model)
import Model.User exposing (getUserName)
import Model.Payer exposing (..)
-view : LoggedData -> HomeModel.Model -> Html Msg
-view loggedData homeModel =
- div
- [ class "account" ]
- [ div
- [ class "header" ]
- (List.map (exceedingPayer loggedData homeModel) (getOrderedExceedingPayers loggedData.currentTime loggedData.users loggedData.incomes loggedData.payments))
- ]
+view : LoggedData -> Html Msg
+view loggedData =
+ ul
+ [ class "exceedingPayers" ]
+ (List.map (exceedingPayer loggedData) (getOrderedExceedingPayers loggedData.currentTime loggedData.users loggedData.incomes loggedData.payments))
-exceedingPayer : LoggedData -> HomeModel.Model -> ExceedingPayer -> Html Msg
-exceedingPayer loggedData homeModel payer =
- div
- [ class "exceedingPayer" ]
+exceedingPayer : LoggedData -> ExceedingPayer -> Html Msg
+exceedingPayer loggedData payer =
+ li
+ []
[ span
[ class "userName" ]
[ payer.userId
diff --git a/src/client/elm/LoggedIn/Stat/View.elm b/src/client/elm/LoggedIn/Stat/View.elm
index bb1ec84..f99ef0e 100644
--- a/src/client/elm/LoggedIn/Stat/View.elm
+++ b/src/client/elm/LoggedIn/Stat/View.elm
@@ -19,9 +19,9 @@ import Model.Translations exposing (getMessage, getParamMessage)
import LoggedIn.View.Format as Format
import LoggedIn.View.Date as Date
-
import View.Plural exposing (plural)
-import LoggedIn.View.Format as Format
+
+import LoggedIn.Stat.Account.View as AccountView
import Utils.Tuple as Tuple
import Utils.List as List
@@ -30,7 +30,9 @@ view : LoggedData -> Html Msg
view loggedData =
div
[ class "stat" ]
- [ h1 [] [ text (getMessage "Overall" loggedData.translations) ]
+ [ h1 [] [ text (getMessage "Balance" loggedData.translations) ]
+ , AccountView.view loggedData
+ , h1 [] [ text (getMessage "Overall" loggedData.translations) ]
, paymentsDetail loggedData (Payment.punctual loggedData.payments)
, h1 [] [ text (getMessage "ByMonths" loggedData.translations) ]
, monthsDetail loggedData
@@ -42,10 +44,7 @@ paymentsDetail loggedData payments =
[]
[ li
[]
- [ let single = getMessage "Payment" loggedData.translations
- multiple = getMessage "Payments" loggedData.translations
- in text <| plural (List.length payments) single multiple
- ]
+ [ text <| plural loggedData.translations (List.length payments) "Payment" "Payments" ]
, li
[]
[ text (paymentsSum loggedData.conf payments)
diff --git a/src/client/elm/Utils/Form.elm b/src/client/elm/Utils/Form.elm
new file mode 100644
index 0000000..6793222
--- /dev/null
+++ b/src/client/elm/Utils/Form.elm
@@ -0,0 +1,11 @@
+module Utils.Form exposing
+ ( fieldAsText
+ )
+
+import Form exposing (Form)
+
+fieldAsText : Form a b -> String -> String
+fieldAsText form field =
+ Form.getFieldAsString field form
+ |> .value
+ |> Maybe.withDefault ""
diff --git a/src/client/elm/View/Plural.elm b/src/client/elm/View/Plural.elm
index 727189c..ab91f06 100644
--- a/src/client/elm/View/Plural.elm
+++ b/src/client/elm/View/Plural.elm
@@ -2,6 +2,10 @@ module View.Plural exposing
( plural
)
-plural : Int -> String -> String -> String
-plural n single multiple =
- (toString n) ++ " " ++ if n <= 1 then single else multiple
+import Model.Translations exposing (Translations, getMessage)
+
+plural : Translations -> Int -> String -> String -> String
+plural translations n single multiple =
+ let singleMessage = getMessage single translations
+ multipleMessage = getMessage multiple translations
+ in (toString n) ++ " " ++ if n <= 1 then singleMessage else multipleMessage
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:13:41 +0000