From 8c24464a4bd0a486cd0ddf846d3b5a323a7aaa9a Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 4 Oct 2015 20:48:32 +0200 Subject: Using incomes to compute a fair computation to designate the payer --- src/client/View/LoggedIn/Account.elm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/client/View/LoggedIn/Account.elm') diff --git a/src/client/View/LoggedIn/Account.elm b/src/client/View/LoggedIn/Account.elm index 7e383f3..706f7cc 100644 --- a/src/client/View/LoggedIn/Account.elm +++ b/src/client/View/LoggedIn/Account.elm @@ -16,7 +16,7 @@ import Update.LoggedIn.Account exposing (..) import Model exposing (Model) import Model.User exposing (getUserName) -import Model.Payers exposing (..) +import Model.Payer exposing (..) import Model.View.LoggedInView exposing (LoggedInView) import Model.Translations exposing (getParamMessage, getMessage) import Model.View.LoggedIn.Account exposing (..) @@ -48,7 +48,7 @@ exceedingPayers model loggedInView = [ class "header" , onClick actions.address (UpdateLoggedIn << UpdateAccount <| ToggleDetail) ] - ( (List.map (exceedingPayer model loggedInView) (getOrderedExceedingPayers loggedInView.account.payers)) + ( (List.map (exceedingPayer model loggedInView) (getOrderedExceedingPayers model.currentTime loggedInView.account.payers)) ++ [ expand ExpandDown loggedInView.account.visibleDetail ] ) @@ -80,7 +80,7 @@ incomeRead : Model -> Account -> Html incomeRead model account = div [ class "income" ] - [ ( case account.income of + [ ( case getCurrentIncome account of Nothing -> text (getMessage "NoIncome" model.translations) Just income -> @@ -94,7 +94,7 @@ incomeEdition model account edition = H.form [ case validateIncome edition.income model.translations of Ok validatedAmount -> - onSubmitPrevDefault serverCommunications.address (SC.SetIncome validatedAmount) + onSubmitPrevDefault serverCommunications.address (SC.SetIncome model.currentTime validatedAmount) Err error -> onSubmitPrevDefault actions.address (UpdateLoggedIn << UpdateAccount << UpdateEditionError <| error) , class "income" -- cgit v1.2.3