From 0cba27cba2b44756389d50bc113f23a2be87e978 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 3 Jan 2016 00:19:55 +0100 Subject: Prevent to send multiple payments if the server is not answering --- src/client/elm/Model/Action.elm | 2 +- src/client/elm/Model/Action/AddPaymentAction.elm | 1 + src/client/elm/Model/Action/LoggedInAction.elm | 3 ++- src/client/elm/Model/Action/SignInAction.elm | 2 +- src/client/elm/Model/View/LoggedIn/AddPayment.elm | 2 ++ src/client/elm/Model/View/SignInView.elm | 4 ++-- 6 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/client/elm/Model') diff --git a/src/client/elm/Model/Action.elm b/src/client/elm/Model/Action.elm index d0fe597..033467d 100644 --- a/src/client/elm/Model/Action.elm +++ b/src/client/elm/Model/Action.elm @@ -17,7 +17,7 @@ type Action = | ServerCommunication Communication | SignIn String | UpdateTime Time - | GoSignInView | GoLoggedInView Users UserId Payments Payments Int Payers | UpdateSignIn SignInAction | UpdateLoggedIn LoggedInAction + | GoSignInView diff --git a/src/client/elm/Model/Action/AddPaymentAction.elm b/src/client/elm/Model/Action/AddPaymentAction.elm index 172f35f..a109a49 100644 --- a/src/client/elm/Model/Action/AddPaymentAction.elm +++ b/src/client/elm/Model/Action/AddPaymentAction.elm @@ -7,3 +7,4 @@ type AddPaymentAction = | UpdateCost String | AddError (Maybe String) (Maybe String) | ToggleFrequency + | WaitingServer diff --git a/src/client/elm/Model/Action/LoggedInAction.elm b/src/client/elm/Model/Action/LoggedInAction.elm index aaf3c7f..18d2224 100644 --- a/src/client/elm/Model/Action/LoggedInAction.elm +++ b/src/client/elm/Model/Action/LoggedInAction.elm @@ -10,7 +10,8 @@ import Model.Action.AddPaymentAction exposing (AddPaymentAction) type LoggedInAction = UpdateAdd AddPaymentAction | UpdatePayments Payments - | AddPayment PaymentId String Int PaymentFrequency + | AddPayment String Int PaymentFrequency + | ValidateAddPayment PaymentId String Int PaymentFrequency | DeletePayment Payment PaymentFrequency | ToggleEdit PaymentId | UpdatePage Int diff --git a/src/client/elm/Model/Action/SignInAction.elm b/src/client/elm/Model/Action/SignInAction.elm index ed64c1d..eaa9f8b 100644 --- a/src/client/elm/Model/Action/SignInAction.elm +++ b/src/client/elm/Model/Action/SignInAction.elm @@ -3,5 +3,5 @@ module Model.Action.SignInAction ) where type SignInAction = - Connecting + WaitingServer | ErrorLogin String diff --git a/src/client/elm/Model/View/LoggedIn/AddPayment.elm b/src/client/elm/Model/View/LoggedIn/AddPayment.elm index fc4d3a0..3a14b00 100644 --- a/src/client/elm/Model/View/LoggedIn/AddPayment.elm +++ b/src/client/elm/Model/View/LoggedIn/AddPayment.elm @@ -18,6 +18,7 @@ type alias AddPayment = , cost : String , costError : Maybe String , frequency : PaymentFrequency + , waitingServer : Bool } initAddPayment : PaymentFrequency -> AddPayment @@ -27,6 +28,7 @@ initAddPayment frequency = , cost = "" , costError = Nothing , frequency = frequency + , waitingServer = False } validateName : String -> Translations -> Result String String diff --git a/src/client/elm/Model/View/SignInView.elm b/src/client/elm/Model/View/SignInView.elm index cf7e6b2..a950867 100644 --- a/src/client/elm/Model/View/SignInView.elm +++ b/src/client/elm/Model/View/SignInView.elm @@ -4,12 +4,12 @@ module Model.View.SignInView ) where type alias SignInView = - { connecting : Bool + { waitingServer : Bool , error : Maybe String } initSignInView : SignInView initSignInView = - { connecting = False + { waitingServer = False , error = Nothing } -- cgit v1.2.3