From 7c050fe2d2c3e8f190e019e1613d37b9d8ef22b9 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 27 Mar 2016 20:41:59 +0200 Subject: Regroup account modules --- src/client/elm/Model/Action/AccountAction.elm | 17 ------- src/client/elm/Model/View/LoggedIn/Account.elm | 64 -------------------------- 2 files changed, 81 deletions(-) delete mode 100644 src/client/elm/Model/Action/AccountAction.elm delete mode 100644 src/client/elm/Model/View/LoggedIn/Account.elm (limited to 'src/client/elm/Model') diff --git a/src/client/elm/Model/Action/AccountAction.elm b/src/client/elm/Model/Action/AccountAction.elm deleted file mode 100644 index 3e156a5..0000000 --- a/src/client/elm/Model/Action/AccountAction.elm +++ /dev/null @@ -1,17 +0,0 @@ -module Model.Action.AccountAction - ( AccountAction(..) - ) where - -import Time exposing (Time) - -import Model.User exposing (UserId) -import Model.Income exposing (IncomeId) - -type AccountAction = - NoOp - | ToggleDetail - | ToggleIncomeEdition - | UpdateIncomeEdition String - | UpdateEditionError String - | UpdateIncome Time Int - | ValidateUpdateIncome IncomeId Time Int diff --git a/src/client/elm/Model/View/LoggedIn/Account.elm b/src/client/elm/Model/View/LoggedIn/Account.elm deleted file mode 100644 index ec75397..0000000 --- a/src/client/elm/Model/View/LoggedIn/Account.elm +++ /dev/null @@ -1,64 +0,0 @@ -module Model.View.LoggedIn.Account - ( Account - , IncomeEdition - , initAccount - , initIncomeEdition - , getCurrentIncome - , validateIncome - ) where - -import Result as Result exposing (Result(..)) -import Dict -import String - -import Utils.Dict exposing (mapValues) - -import Model.Translations exposing (..) -import Model.Income exposing (..) -import Model.User exposing (UserId) - -type alias Account = - { me : UserId - , incomes : Incomes - , visibleDetail : Bool - , incomeEdition : Maybe IncomeEdition - } - -initAccount : UserId -> Incomes -> Account -initAccount me incomes = - { me = me - , incomes = incomes - , visibleDetail = False - , incomeEdition = Nothing - } - -getCurrentIncome : Account -> Maybe Int -getCurrentIncome account = - account.incomes - |> Dict.filter (\_ income -> income.userId == account.me) - |> Dict.values - |> List.sortBy .creation - |> List.reverse - |> List.head - |> Maybe.map .amount - -type alias IncomeEdition = - { income : String - , error : Maybe String - } - -initIncomeEdition : Int -> IncomeEdition -initIncomeEdition income = - { income = toString income - , error = Nothing - } - -validateIncome : String -> Translations -> Result String Int -validateIncome amount translations = - case String.toInt amount of - Ok number -> - if number > 0 - then Ok number - else Err <| getMessage "IncomeMustBePositiveNumber" translations - Err _ -> - Err <| getMessage "IncomeRequired" translations -- cgit v1.2.3