From bb316286b0859b5648c61f44c88399f4c1aad9cd Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 2 Jan 2016 19:07:19 +0100 Subject: Use start-app for elm --- src/client/elm/Update/LoggedIn.elm | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'src/client/elm/Update/LoggedIn.elm') diff --git a/src/client/elm/Update/LoggedIn.elm b/src/client/elm/Update/LoggedIn.elm index 38901b2..1553141 100644 --- a/src/client/elm/Update/LoggedIn.elm +++ b/src/client/elm/Update/LoggedIn.elm @@ -1,6 +1,5 @@ module Update.LoggedIn - ( LoggedAction(..) - , updateLoggedIn + ( updateLoggedIn ) where import Date @@ -9,25 +8,17 @@ import Dict import Model exposing (Model) import Model.User exposing (UserId) import Model.Payment exposing (..) +import Model.Action.LoggedInAction exposing (..) +import Model.Action.AccountAction exposing (..) +import Model.Action.MonthlyAction as Monthly import Model.View.LoggedInView exposing (..) -import Model.View.LoggedIn.Add exposing (..) +import Model.View.LoggedIn.AddPayment exposing (..) -import Update.LoggedIn.Add exposing (..) -import Update.LoggedIn.Monthly as UM -import Update.LoggedIn.Account as UA +import Update.LoggedIn.AddPayment exposing (updateAddPayment) +import Update.LoggedIn.Monthly exposing (updateMonthly) +import Update.LoggedIn.Account exposing (updateAccount) -type LoggedAction = - UpdateAdd AddPaymentAction - | UpdatePayments Payments - | AddPayment PaymentId String Int - | AddMonthlyPayment PaymentId String Int - | ToggleEdit PaymentId - | DeletePayment Payment - | UpdatePage Int - | UpdateMonthly UM.MonthlyAction - | UpdateAccount UA.AccountAction - -updateLoggedIn : Model -> LoggedAction -> LoggedInView -> LoggedInView +updateLoggedIn : Model -> LoggedInAction -> LoggedInView -> LoggedInView updateLoggedIn model action loggedInView = case action of UpdateAdd addPaymentAction -> @@ -39,7 +30,7 @@ updateLoggedIn model action loggedInView = in { loggedInView | currentPage = 1 , add = initAddPayment Punctual - , account = UA.updateAccount (UA.UpdatePayer loggedInView.account.me model.currentTime cost) loggedInView.account + , account = updateAccount (UpdatePayer loggedInView.account.me model.currentTime cost) loggedInView.account , payments = newPayment :: loggedInView.payments , paymentsCount = loggedInView.paymentsCount + 1 } @@ -48,13 +39,13 @@ updateLoggedIn model action loggedInView = | add = initAddPayment Monthly , monthly = let payment = Payment id (Date.fromTime model.currentTime) name cost loggedInView.account.me - in UM.updateMonthly (UM.AddPayment payment) loggedInView.monthly + in updateMonthly (Monthly.AddPayment payment) loggedInView.monthly } ToggleEdit id -> { loggedInView | paymentEdition = if loggedInView.paymentEdition == Just id then Nothing else Just id } DeletePayment payment -> { loggedInView - | account = UA.updateAccount (UA.UpdatePayer payment.userId (Date.toTime payment.creation) -payment.cost) loggedInView.account + | account = updateAccount (UpdatePayer payment.userId (Date.toTime payment.creation) -payment.cost) loggedInView.account , payments = deletePayment payment.id loggedInView.payments , paymentsCount = loggedInView.paymentsCount - 1 } @@ -63,6 +54,6 @@ updateLoggedIn model action loggedInView = | currentPage = page } UpdateMonthly monthlyAction -> - { loggedInView | monthly = UM.updateMonthly monthlyAction loggedInView.monthly } + { loggedInView | monthly = updateMonthly monthlyAction loggedInView.monthly } UpdateAccount accountAction -> - { loggedInView | account = UA.updateAccount accountAction loggedInView.account } + { loggedInView | account = updateAccount accountAction loggedInView.account } -- cgit v1.2.3