aboutsummaryrefslogtreecommitdiff
path: root/src/client/elm/LoggedIn
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/elm/LoggedIn')
-rw-r--r--src/client/elm/LoggedIn/Home/Header/View.elm17
-rw-r--r--src/client/elm/LoggedIn/Home/View/Expand.elm2
-rw-r--r--src/client/elm/LoggedIn/Home/View/Table.elm2
-rw-r--r--src/client/elm/LoggedIn/Income/View.elm14
4 files changed, 19 insertions, 16 deletions
diff --git a/src/client/elm/LoggedIn/Home/Header/View.elm b/src/client/elm/LoggedIn/Home/Header/View.elm
index f9fbb6a..67ff1f4 100644
--- a/src/client/elm/LoggedIn/Home/Header/View.elm
+++ b/src/client/elm/LoggedIn/Home/Header/View.elm
@@ -11,6 +11,7 @@ import Dict
import Form exposing (Form)
import View.Form as Form
+import View.Events exposing (onSubmitPrevDefault)
import Msg exposing (Msg)
import LoggedIn.Msg as LoggedInMsg
@@ -50,14 +51,14 @@ searchLine loggedData search frequency =
searchForm : LoggedData -> Form String Home.Search -> Html Msg
searchForm loggedData search =
- let htmlMap = Html.map (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.SearchMsg)
- in Html.form
- []
- [ Form.textInput loggedData.translations search htmlMap "search" "name"
- , if List.isEmpty (Payment.monthly loggedData.payments)
- then text ""
- else Form.radioInputs loggedData.translations search htmlMap "search" "frequency" [ toString Punctual, toString Monthly ]
- ]
+ Html.map (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.SearchMsg) <|
+ Html.form
+ [ onSubmitPrevDefault Form.NoOp ]
+ [ Form.textInput loggedData.translations search "search" "name"
+ , if List.isEmpty (Payment.monthly loggedData.payments)
+ then text ""
+ else Form.radioInputs loggedData.translations search "search" "frequency" [ toString Punctual, toString Monthly ]
+ ]
infos : LoggedData -> Payments -> Html Msg
infos loggedData payments =
diff --git a/src/client/elm/LoggedIn/Home/View/Expand.elm b/src/client/elm/LoggedIn/Home/View/Expand.elm
index e0c13a3..2bcfec1 100644
--- a/src/client/elm/LoggedIn/Home/View/Expand.elm
+++ b/src/client/elm/LoggedIn/Home/View/Expand.elm
@@ -3,7 +3,7 @@ module LoggedIn.Home.View.Expand exposing
, ExpandType(..)
)
-import Color exposing (Color)
+import View.Color as Color
import FontAwesome
diff --git a/src/client/elm/LoggedIn/Home/View/Table.elm b/src/client/elm/LoggedIn/Home/View/Table.elm
index 9cd43a7..323a45d 100644
--- a/src/client/elm/LoggedIn/Home/View/Table.elm
+++ b/src/client/elm/LoggedIn/Home/View/Table.elm
@@ -5,9 +5,9 @@ module LoggedIn.Home.View.Table exposing
import Dict exposing (..)
import Date exposing (Date)
import String exposing (append)
-import Color
import FontAwesome
+import View.Color as Color
import Html exposing (..)
import Html.Attributes exposing (..)
diff --git a/src/client/elm/LoggedIn/Income/View.elm b/src/client/elm/LoggedIn/Income/View.elm
index be15c6b..3019fea 100644
--- a/src/client/elm/LoggedIn/Income/View.elm
+++ b/src/client/elm/LoggedIn/Income/View.elm
@@ -5,7 +5,6 @@ module LoggedIn.Income.View exposing
import Dict
import Date
import Time exposing (Time)
-import Color
import Task
import FontAwesome
@@ -14,7 +13,11 @@ import Html exposing (..)
import Html.Events exposing (..)
import Html.Attributes exposing (..)
import Html.App as Html
+
import Form exposing (Form)
+import View.Form as Form
+import View.Events exposing (onSubmitPrevDefault)
+
import Dialog
import Msg exposing (Msg)
@@ -35,8 +38,6 @@ import LoggedIn.View.Date exposing (renderShortDate)
import LoggedIn.View.Format as Format
import LoggedIn.View.Date exposing (renderLongDate)
-import View.Events exposing (onSubmitPrevDefault)
-import View.Form as Form
import View.Color as Color
view : LoggedData -> IncomeModel.Model -> Html Msg
@@ -80,10 +81,11 @@ addIncomeView loggedData addIncome =
let htmlMap = Html.map (Msg.UpdateLoggedIn << LoggedInMsg.IncomeMsg << IncomeMsg.AddIncomeMsg)
in Html.form
[ onSubmitPrevDefault Msg.NoOp ]
- [ Form.textInput loggedData.translations addIncome htmlMap "income" "creation"
- , Form.textInput loggedData.translations addIncome htmlMap "income" "amount"
+ [ htmlMap <| Form.textInput loggedData.translations addIncome "income" "creation"
+ , htmlMap <| Form.textInput loggedData.translations addIncome "income" "amount"
, button
- [ case Form.getOutput addIncome of
+ [ class "add"
+ , case Form.getOutput addIncome of
Just data ->
onClick (Msg.UpdateLoggedIn <| LoggedInMsg.AddIncome data.time data.amount)
Nothing ->