From 3853811450d4fe801da996eb48825049c3541030 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 6 Sep 2015 16:46:59 +0200 Subject: Renaming PaymentView to LoggedInView --- src/client/Update/LoggedIn.elm | 65 ++++++++++++++++++++++++++++++++ src/client/Update/LoggedIn/Add.elm | 29 ++++++++++++++ src/client/Update/LoggedIn/Monthly.elm | 27 +++++++++++++ src/client/Update/LoggedView.elm | 65 -------------------------------- src/client/Update/LoggedView/Add.elm | 29 -------------- src/client/Update/LoggedView/Monthly.elm | 27 ------------- 6 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 src/client/Update/LoggedIn.elm create mode 100644 src/client/Update/LoggedIn/Add.elm create mode 100644 src/client/Update/LoggedIn/Monthly.elm delete mode 100644 src/client/Update/LoggedView.elm delete mode 100644 src/client/Update/LoggedView/Add.elm delete mode 100644 src/client/Update/LoggedView/Monthly.elm (limited to 'src/client/Update') diff --git a/src/client/Update/LoggedIn.elm b/src/client/Update/LoggedIn.elm new file mode 100644 index 0000000..03eb137 --- /dev/null +++ b/src/client/Update/LoggedIn.elm @@ -0,0 +1,65 @@ +module Update.LoggedIn + ( LoggedAction(..) + , updateLoggedIn + ) where + +import Date +import Dict + +import Model exposing (Model) +import Model.User exposing (UserId) +import Model.Payment exposing (..) +import Model.Payers exposing (..) +import Model.View.LoggedInView exposing (..) +import Model.View.LoggedIn.Add exposing (..) + +import Update.LoggedIn.Add exposing (..) +import Update.LoggedIn.Monthly as UM + +type LoggedAction = + UpdateAdd AddPaymentAction + | UpdatePayments Payments + | AddPayment UserId String Int Payments + | AddMonthlyPayment PaymentId String Int + | ToggleEdit PaymentId + | DeletePayment UserId Int Payments + | UpdatePage Int Payments + | UpdateMonthly UM.MonthlyAction + +updateLoggedIn : Model -> LoggedAction -> LoggedInView -> LoggedInView +updateLoggedIn model action loggedInView = + case action of + UpdateAdd addPaymentAction -> + { loggedInView | add <- updateAddPayment addPaymentAction loggedInView.add } + UpdatePayments payments -> + { loggedInView | payments <- payments } + AddPayment userId name cost payments -> + { loggedInView + | payments <- payments + , currentPage <- 1 + , add <- initAddPayment Punctual + , payers <- updatePayers loggedInView.payers userId cost + , paymentsCount <- loggedInView.paymentsCount + 1 + } + AddMonthlyPayment id name cost -> + { loggedInView + | add <- initAddPayment Monthly + , monthly <- + let payment = Payment id (Date.fromTime model.currentTime) name cost loggedInView.me + in UM.updateMonthly (UM.AddPayment payment) loggedInView.monthly + } + ToggleEdit id -> + { loggedInView | paymentEdition <- if loggedInView.paymentEdition == Just id then Nothing else Just id } + DeletePayment userId cost payments -> + { loggedInView + | payments <- payments + , payers <- updatePayers loggedInView.payers userId -cost + , paymentsCount <- loggedInView.paymentsCount - 1 + } + UpdatePage page payments -> + { loggedInView + | currentPage <- page + , payments <- payments + } + UpdateMonthly monthlyAction -> + { loggedInView | monthly <- UM.updateMonthly monthlyAction loggedInView.monthly } diff --git a/src/client/Update/LoggedIn/Add.elm b/src/client/Update/LoggedIn/Add.elm new file mode 100644 index 0000000..1f28997 --- /dev/null +++ b/src/client/Update/LoggedIn/Add.elm @@ -0,0 +1,29 @@ +module Update.LoggedIn.Add + ( AddPaymentAction(..) + , updateAddPayment + ) where + +import Model.View.LoggedIn.Add exposing (..) + +type AddPaymentAction = + UpdateName String + | UpdateCost String + | AddError (Maybe String) (Maybe String) + | ToggleFrequency + +updateAddPayment : AddPaymentAction -> AddPayment -> AddPayment +updateAddPayment action addPayment = + case action of + UpdateName name -> + { addPayment | name <- name } + UpdateCost cost -> + { addPayment | cost <- cost } + AddError nameError costError -> + { addPayment + | nameError <- nameError + , costError <- costError + } + ToggleFrequency -> + { addPayment + | frequency <- if addPayment.frequency == Punctual then Monthly else Punctual + } diff --git a/src/client/Update/LoggedIn/Monthly.elm b/src/client/Update/LoggedIn/Monthly.elm new file mode 100644 index 0000000..1379323 --- /dev/null +++ b/src/client/Update/LoggedIn/Monthly.elm @@ -0,0 +1,27 @@ +module Update.LoggedIn.Monthly + ( MonthlyAction(..) + , updateMonthly + ) where + +import Model.Payment exposing (Payment, PaymentId) +import Model.View.LoggedIn.Monthly exposing (..) + +type MonthlyAction = + ToggleDetail + | AddPayment Payment + | DeletePayment PaymentId + +updateMonthly : MonthlyAction -> Monthly -> Monthly +updateMonthly action monthly = + case action of + ToggleDetail -> + { monthly | visibleDetail <- not monthly.visibleDetail } + AddPayment payment -> + { monthly + | payments <- payment :: monthly.payments + , visibleDetail <- True + } + DeletePayment id -> + { monthly + | payments <- List.filter (\payment -> payment.id /= id) monthly.payments + } diff --git a/src/client/Update/LoggedView.elm b/src/client/Update/LoggedView.elm deleted file mode 100644 index cf6bcb2..0000000 --- a/src/client/Update/LoggedView.elm +++ /dev/null @@ -1,65 +0,0 @@ -module Update.LoggedView - ( LoggedAction(..) - , updateLoggedView - ) where - -import Date -import Dict - -import Model exposing (Model) -import Model.User exposing (UserId) -import Model.Payment exposing (..) -import Model.Payers exposing (..) -import Model.View.LoggedView exposing (..) -import Model.View.Payment.Add exposing (..) - -import Update.LoggedView.Add exposing (..) -import Update.LoggedView.Monthly as UM - -type LoggedAction = - UpdateAdd AddPaymentAction - | UpdatePayments Payments - | AddPayment UserId String Int Payments - | AddMonthlyPayment PaymentId String Int - | ToggleEdit PaymentId - | DeletePayment UserId Int Payments - | UpdatePage Int Payments - | UpdateMonthly UM.MonthlyAction - -updateLoggedView : Model -> LoggedAction -> LoggedView -> LoggedView -updateLoggedView model action loggedView = - case action of - UpdateAdd addPaymentAction -> - { loggedView | add <- updateAddPayment addPaymentAction loggedView.add } - UpdatePayments payments -> - { loggedView | payments <- payments } - AddPayment userId name cost payments -> - { loggedView - | payments <- payments - , currentPage <- 1 - , add <- initAddPayment Punctual - , payers <- updatePayers loggedView.payers userId cost - , paymentsCount <- loggedView.paymentsCount + 1 - } - AddMonthlyPayment id name cost -> - { loggedView - | add <- initAddPayment Monthly - , monthly <- - let payment = Payment id (Date.fromTime model.currentTime) name cost loggedView.me - in UM.updateMonthly (UM.AddPayment payment) loggedView.monthly - } - ToggleEdit id -> - { loggedView | paymentEdition <- if loggedView.paymentEdition == Just id then Nothing else Just id } - DeletePayment userId cost payments -> - { loggedView - | payments <- payments - , payers <- updatePayers loggedView.payers userId -cost - , paymentsCount <- loggedView.paymentsCount - 1 - } - UpdatePage page payments -> - { loggedView - | currentPage <- page - , payments <- payments - } - UpdateMonthly monthlyAction -> - { loggedView | monthly <- UM.updateMonthly monthlyAction loggedView.monthly } diff --git a/src/client/Update/LoggedView/Add.elm b/src/client/Update/LoggedView/Add.elm deleted file mode 100644 index 05c2c30..0000000 --- a/src/client/Update/LoggedView/Add.elm +++ /dev/null @@ -1,29 +0,0 @@ -module Update.LoggedView.Add - ( AddPaymentAction(..) - , updateAddPayment - ) where - -import Model.View.Payment.Add exposing (..) - -type AddPaymentAction = - UpdateName String - | UpdateCost String - | AddError (Maybe String) (Maybe String) - | ToggleFrequency - -updateAddPayment : AddPaymentAction -> AddPayment -> AddPayment -updateAddPayment action addPayment = - case action of - UpdateName name -> - { addPayment | name <- name } - UpdateCost cost -> - { addPayment | cost <- cost } - AddError nameError costError -> - { addPayment - | nameError <- nameError - , costError <- costError - } - ToggleFrequency -> - { addPayment - | frequency <- if addPayment.frequency == Punctual then Monthly else Punctual - } diff --git a/src/client/Update/LoggedView/Monthly.elm b/src/client/Update/LoggedView/Monthly.elm deleted file mode 100644 index 567025f..0000000 --- a/src/client/Update/LoggedView/Monthly.elm +++ /dev/null @@ -1,27 +0,0 @@ -module Update.LoggedView.Monthly - ( MonthlyAction(..) - , updateMonthly - ) where - -import Model.Payment exposing (Payment, PaymentId) -import Model.View.Payment.Monthly exposing (..) - -type MonthlyAction = - ToggleDetail - | AddPayment Payment - | DeletePayment PaymentId - -updateMonthly : MonthlyAction -> Monthly -> Monthly -updateMonthly action monthly = - case action of - ToggleDetail -> - { monthly | visibleDetail <- not monthly.visibleDetail } - AddPayment payment -> - { monthly - | payments <- payment :: monthly.payments - , visibleDetail <- True - } - DeletePayment id -> - { monthly - | payments <- List.filter (\payment -> payment.id /= id) monthly.payments - } -- cgit v1.2.3