aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoris2015-09-06 16:46:59 +0200
committerJoris2015-09-06 16:46:59 +0200
commit3853811450d4fe801da996eb48825049c3541030 (patch)
treeb483c6152f55b6fe87d23108d2d0346a593e51ac /src
parent0b6f0fa29075178b45cb17d2932003ab4b342280 (diff)
downloadbudget-3853811450d4fe801da996eb48825049c3541030.tar.gz
budget-3853811450d4fe801da996eb48825049c3541030.tar.bz2
budget-3853811450d4fe801da996eb48825049c3541030.zip
Renaming PaymentView to LoggedInView
Diffstat (limited to 'src')
-rw-r--r--src/client/Main.elm2
-rw-r--r--src/client/Model/View.elm4
-rw-r--r--src/client/Model/View/LoggedIn/Add.elm (renamed from src/client/Model/View/Payment/Add.elm)2
-rw-r--r--src/client/Model/View/LoggedIn/Edition.elm (renamed from src/client/Model/View/Payment/Edition.elm)2
-rw-r--r--src/client/Model/View/LoggedIn/Monthly.elm (renamed from src/client/Model/View/Payment/Monthly.elm)2
-rw-r--r--src/client/Model/View/LoggedInView.elm (renamed from src/client/Model/View/LoggedView.elm)18
-rw-r--r--src/client/ServerCommunication.elm16
-rw-r--r--src/client/Update.elm18
-rw-r--r--src/client/Update/LoggedIn.elm (renamed from src/client/Update/LoggedView.elm)44
-rw-r--r--src/client/Update/LoggedIn/Add.elm (renamed from src/client/Update/LoggedView/Add.elm)4
-rw-r--r--src/client/Update/LoggedIn/Monthly.elm (renamed from src/client/Update/LoggedView/Monthly.elm)4
-rw-r--r--src/client/View/Header.elm2
-rw-r--r--src/client/View/LoggedIn.elm27
-rw-r--r--src/client/View/LoggedIn/Add.elm (renamed from src/client/View/Payments/Add.elm)34
-rw-r--r--src/client/View/LoggedIn/ExceedingPayer.elm (renamed from src/client/View/Payments/ExceedingPayer.elm)16
-rw-r--r--src/client/View/LoggedIn/Monthly.elm (renamed from src/client/View/Payments/Monthly.elm)34
-rw-r--r--src/client/View/LoggedIn/Paging.elm (renamed from src/client/View/Payments/Paging.elm)42
-rw-r--r--src/client/View/LoggedIn/Table.elm (renamed from src/client/View/Payments/Table.elm)34
-rw-r--r--src/client/View/Page.elm6
-rw-r--r--src/client/View/Payments.elm27
20 files changed, 169 insertions, 169 deletions
diff --git a/src/client/Main.elm b/src/client/Main.elm
index 3174ba6..c2ba408 100644
--- a/src/client/Main.elm
+++ b/src/client/Main.elm
@@ -63,7 +63,7 @@ port initView =
Task.andThen getPayments <| \payments ->
Task.andThen getPaymentsCount <| \paymentsCount ->
Task.andThen getPayers <| \payers ->
- Signal.send actions.address (GoLoggedView users me monthlyPayments payments paymentsCount payers)
+ Signal.send actions.address (GoLoggedInView users me monthlyPayments payments paymentsCount payers)
|> flip Task.onError (\_ -> Signal.send actions.address GoSignInView)
getUsers : Task Http.Error Users
diff --git a/src/client/Model/View.elm b/src/client/Model/View.elm
index 4c5fc6f..90c0e53 100644
--- a/src/client/Model/View.elm
+++ b/src/client/Model/View.elm
@@ -4,9 +4,9 @@ module Model.View
import Model.Payment exposing (Payments)
import Model.View.SignInView exposing (..)
-import Model.View.LoggedView exposing (..)
+import Model.View.LoggedInView exposing (..)
type View =
LoadingView
| SignInView SignInView
- | LoggedView LoggedView
+ | LoggedInView LoggedInView
diff --git a/src/client/Model/View/Payment/Add.elm b/src/client/Model/View/LoggedIn/Add.elm
index dc00e86..abd8a4d 100644
--- a/src/client/Model/View/Payment/Add.elm
+++ b/src/client/Model/View/LoggedIn/Add.elm
@@ -1,4 +1,4 @@
-module Model.View.Payment.Add
+module Model.View.LoggedIn.Add
( AddPayment
, Frequency(..)
, initAddPayment
diff --git a/src/client/Model/View/Payment/Edition.elm b/src/client/Model/View/LoggedIn/Edition.elm
index f58ce43..da6d7b0 100644
--- a/src/client/Model/View/Payment/Edition.elm
+++ b/src/client/Model/View/LoggedIn/Edition.elm
@@ -1,4 +1,4 @@
-module Model.View.Payment.Edition
+module Model.View.LoggedIn.Edition
( Edition
) where
diff --git a/src/client/Model/View/Payment/Monthly.elm b/src/client/Model/View/LoggedIn/Monthly.elm
index 15a5f2e..3c6f66a 100644
--- a/src/client/Model/View/Payment/Monthly.elm
+++ b/src/client/Model/View/LoggedIn/Monthly.elm
@@ -1,4 +1,4 @@
-module Model.View.Payment.Monthly
+module Model.View.LoggedIn.Monthly
( Monthly
, initMonthly
) where
diff --git a/src/client/Model/View/LoggedView.elm b/src/client/Model/View/LoggedInView.elm
index 264fdf5..cf7f552 100644
--- a/src/client/Model/View/LoggedView.elm
+++ b/src/client/Model/View/LoggedInView.elm
@@ -1,16 +1,16 @@
-module Model.View.LoggedView
- ( LoggedView
- , initLoggedView
+module Model.View.LoggedInView
+ ( LoggedInView
+ , initLoggedInView
) where
import Model.User exposing (Users, UserId)
import Model.Payment exposing (Payments)
import Model.Payers exposing (Payers)
-import Model.View.Payment.Add exposing (..)
-import Model.View.Payment.Edition exposing (..)
-import Model.View.Payment.Monthly exposing (..)
+import Model.View.LoggedIn.Add exposing (..)
+import Model.View.LoggedIn.Edition exposing (..)
+import Model.View.LoggedIn.Monthly exposing (..)
-type alias LoggedView =
+type alias LoggedInView =
{ users : Users
, me : UserId
, add : AddPayment
@@ -22,8 +22,8 @@ type alias LoggedView =
, currentPage : Int
}
-initLoggedView : Users -> UserId -> Payments -> Payments -> Int -> Payers -> LoggedView
-initLoggedView users me monthlyPayments payments paymentsCount payers =
+initLoggedInView : Users -> UserId -> Payments -> Payments -> Int -> Payers -> LoggedInView
+initLoggedInView users me monthlyPayments payments paymentsCount payers =
{ users = users
, me = me
, add = initAddPayment Punctual
diff --git a/src/client/ServerCommunication.elm b/src/client/ServerCommunication.elm
index 20e2b14..6d65552 100644
--- a/src/client/ServerCommunication.elm
+++ b/src/client/ServerCommunication.elm
@@ -13,12 +13,12 @@ import Date
import Model.Message exposing (messageDecoder)
import Model.User exposing (UserId)
import Model.Payment exposing (..)
-import Model.View.Payment.Add exposing (Frequency(..))
+import Model.View.LoggedIn.Add exposing (Frequency(..))
import Update as U
import Update.SignIn exposing (..)
-import Update.LoggedView as UL
-import Update.LoggedView.Monthly as UM
+import Update.LoggedIn as UL
+import Update.LoggedIn.Monthly as UM
type Communication =
NoCommunication
@@ -86,24 +86,24 @@ serverResult communication response =
AddPayment userId name cost ->
Http.send Http.defaultSettings (updatePageRequest 1)
|> flip Task.andThen (decodeOkResponse paymentsDecoder (\payments ->
- Task.succeed <| U.UpdateLoggedView (UL.AddPayment userId name cost payments)
+ Task.succeed <| U.UpdateLoggedIn (UL.AddPayment userId name cost payments)
))
AddMonthlyPayment name cost ->
decodeOkResponse
("id" := paymentIdDecoder)
- (\id -> Task.succeed <| U.UpdateLoggedView (UL.AddMonthlyPayment id name cost))
+ (\id -> Task.succeed <| U.UpdateLoggedIn (UL.AddMonthlyPayment id name cost))
response
DeletePayment id userId cost currentPage ->
Http.send Http.defaultSettings (updatePageRequest currentPage)
|> flip Task.andThen (decodeOkResponse paymentsDecoder (\payments ->
- Task.succeed <| U.UpdateLoggedView (UL.DeletePayment userId cost payments)
+ Task.succeed <| U.UpdateLoggedIn (UL.DeletePayment userId cost payments)
))
DeleteMonthlyPayment id ->
- Task.succeed <| U.UpdateLoggedView (UL.UpdateMonthly (UM.DeletePayment id))
+ Task.succeed <| U.UpdateLoggedIn (UL.UpdateMonthly (UM.DeletePayment id))
UpdatePage page ->
decodeOkResponse
paymentsDecoder
- (\payments -> Task.succeed <| U.UpdateLoggedView (UL.UpdatePage page payments))
+ (\payments -> Task.succeed <| U.UpdateLoggedIn (UL.UpdatePage page payments))
response
SignOut ->
Task.succeed (U.GoSignInView)
diff --git a/src/client/Update.elm b/src/client/Update.elm
index 6ee5ab6..23e5c84 100644
--- a/src/client/Update.elm
+++ b/src/client/Update.elm
@@ -12,10 +12,10 @@ import Model.Payment exposing (Payments)
import Model.Payers exposing (Payers)
import Model.View as V
import Model.View.SignInView exposing (..)
-import Model.View.LoggedView exposing (..)
+import Model.View.LoggedInView exposing (..)
import Update.SignIn exposing (..)
-import Update.LoggedView exposing (..)
+import Update.LoggedIn exposing (..)
type Action =
NoOp
@@ -23,8 +23,8 @@ type Action =
| GoSignInView
| SignInError String
| UpdateSignIn SignInAction
- | GoLoggedView Users UserId Payments Payments Int Payers
- | UpdateLoggedView LoggedAction
+ | GoLoggedInView Users UserId Payments Payments Int Payers
+ | UpdateLoggedIn LoggedAction
actions : Signal.Mailbox Action
actions = Signal.mailbox NoOp
@@ -38,8 +38,8 @@ updateModel action model =
{ model | currentTime <- time }
GoSignInView ->
{ model | view <- V.SignInView initSignInView }
- GoLoggedView users me monthlyPayments payments paymentsCount payers ->
- { model | view <- V.LoggedView (initLoggedView users me monthlyPayments payments paymentsCount payers) }
+ GoLoggedInView users me monthlyPayments payments paymentsCount payers ->
+ { model | view <- V.LoggedInView (initLoggedInView users me monthlyPayments payments paymentsCount payers) }
SignInError msg ->
let signInView = { initSignInView | result <- Just (Err msg) }
in { model | view <- V.SignInView signInView }
@@ -49,9 +49,9 @@ updateModel action model =
{ model | view <- V.SignInView (updateSignIn signInAction signInView) }
_ ->
model
- UpdateLoggedView loggedAction ->
+ UpdateLoggedIn loggedAction ->
case model.view of
- V.LoggedView loggedView ->
- { model | view <- V.LoggedView (updateLoggedView model loggedAction loggedView) }
+ V.LoggedInView loggedInView ->
+ { model | view <- V.LoggedInView (updateLoggedIn model loggedAction loggedInView) }
_ ->
model
diff --git a/src/client/Update/LoggedView.elm b/src/client/Update/LoggedIn.elm
index cf6bcb2..03eb137 100644
--- a/src/client/Update/LoggedView.elm
+++ b/src/client/Update/LoggedIn.elm
@@ -1,6 +1,6 @@
-module Update.LoggedView
+module Update.LoggedIn
( LoggedAction(..)
- , updateLoggedView
+ , updateLoggedIn
) where
import Date
@@ -10,11 +10,11 @@ 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 Model.View.LoggedInView exposing (..)
+import Model.View.LoggedIn.Add exposing (..)
-import Update.LoggedView.Add exposing (..)
-import Update.LoggedView.Monthly as UM
+import Update.LoggedIn.Add exposing (..)
+import Update.LoggedIn.Monthly as UM
type LoggedAction =
UpdateAdd AddPaymentAction
@@ -26,40 +26,40 @@ type LoggedAction =
| UpdatePage Int Payments
| UpdateMonthly UM.MonthlyAction
-updateLoggedView : Model -> LoggedAction -> LoggedView -> LoggedView
-updateLoggedView model action loggedView =
+updateLoggedIn : Model -> LoggedAction -> LoggedInView -> LoggedInView
+updateLoggedIn model action loggedInView =
case action of
UpdateAdd addPaymentAction ->
- { loggedView | add <- updateAddPayment addPaymentAction loggedView.add }
+ { loggedInView | add <- updateAddPayment addPaymentAction loggedInView.add }
UpdatePayments payments ->
- { loggedView | payments <- payments }
+ { loggedInView | payments <- payments }
AddPayment userId name cost payments ->
- { loggedView
+ { loggedInView
| payments <- payments
, currentPage <- 1
, add <- initAddPayment Punctual
- , payers <- updatePayers loggedView.payers userId cost
- , paymentsCount <- loggedView.paymentsCount + 1
+ , payers <- updatePayers loggedInView.payers userId cost
+ , paymentsCount <- loggedInView.paymentsCount + 1
}
AddMonthlyPayment id name cost ->
- { loggedView
+ { loggedInView
| add <- initAddPayment Monthly
, monthly <-
- let payment = Payment id (Date.fromTime model.currentTime) name cost loggedView.me
- in UM.updateMonthly (UM.AddPayment payment) loggedView.monthly
+ let payment = Payment id (Date.fromTime model.currentTime) name cost loggedInView.me
+ in UM.updateMonthly (UM.AddPayment payment) loggedInView.monthly
}
ToggleEdit id ->
- { loggedView | paymentEdition <- if loggedView.paymentEdition == Just id then Nothing else Just id }
+ { loggedInView | paymentEdition <- if loggedInView.paymentEdition == Just id then Nothing else Just id }
DeletePayment userId cost payments ->
- { loggedView
+ { loggedInView
| payments <- payments
- , payers <- updatePayers loggedView.payers userId -cost
- , paymentsCount <- loggedView.paymentsCount - 1
+ , payers <- updatePayers loggedInView.payers userId -cost
+ , paymentsCount <- loggedInView.paymentsCount - 1
}
UpdatePage page payments ->
- { loggedView
+ { loggedInView
| currentPage <- page
, payments <- payments
}
UpdateMonthly monthlyAction ->
- { loggedView | monthly <- UM.updateMonthly monthlyAction loggedView.monthly }
+ { loggedInView | monthly <- UM.updateMonthly monthlyAction loggedInView.monthly }
diff --git a/src/client/Update/LoggedView/Add.elm b/src/client/Update/LoggedIn/Add.elm
index 05c2c30..1f28997 100644
--- a/src/client/Update/LoggedView/Add.elm
+++ b/src/client/Update/LoggedIn/Add.elm
@@ -1,9 +1,9 @@
-module Update.LoggedView.Add
+module Update.LoggedIn.Add
( AddPaymentAction(..)
, updateAddPayment
) where
-import Model.View.Payment.Add exposing (..)
+import Model.View.LoggedIn.Add exposing (..)
type AddPaymentAction =
UpdateName String
diff --git a/src/client/Update/LoggedView/Monthly.elm b/src/client/Update/LoggedIn/Monthly.elm
index 567025f..1379323 100644
--- a/src/client/Update/LoggedView/Monthly.elm
+++ b/src/client/Update/LoggedIn/Monthly.elm
@@ -1,10 +1,10 @@
-module Update.LoggedView.Monthly
+module Update.LoggedIn.Monthly
( MonthlyAction(..)
, updateMonthly
) where
import Model.Payment exposing (Payment, PaymentId)
-import Model.View.Payment.Monthly exposing (..)
+import Model.View.LoggedIn.Monthly exposing (..)
type MonthlyAction =
ToggleDetail
diff --git a/src/client/View/Header.elm b/src/client/View/Header.elm
index 31d8b7c..9d31183 100644
--- a/src/client/View/Header.elm
+++ b/src/client/View/Header.elm
@@ -27,7 +27,7 @@ renderHeader model =
text ""
SignInView _ ->
text ""
- LoggedView _ ->
+ LoggedInView _ ->
button
[ class "signOut"
, onClick serverCommunications.address SC.SignOut
diff --git a/src/client/View/LoggedIn.elm b/src/client/View/LoggedIn.elm
new file mode 100644
index 0000000..57a8eb0
--- /dev/null
+++ b/src/client/View/LoggedIn.elm
@@ -0,0 +1,27 @@
+module View.LoggedIn
+ ( renderLoggedIn
+ ) where
+
+import Html exposing (..)
+import Html.Attributes exposing (..)
+
+import Model exposing (Model)
+import Model.Payment exposing (Payments)
+import Model.View.LoggedInView exposing (LoggedInView)
+
+import View.LoggedIn.ExceedingPayer exposing (exceedingPayers)
+import View.LoggedIn.Add exposing (addPayment)
+import View.LoggedIn.Monthly exposing (monthlyPayments)
+import View.LoggedIn.Table exposing (paymentsTable)
+import View.LoggedIn.Paging exposing (paymentsPaging)
+
+renderLoggedIn : Model -> LoggedInView -> Html
+renderLoggedIn model loggedInView =
+ div
+ [ class "payments" ]
+ [ exceedingPayers model loggedInView
+ , addPayment model loggedInView
+ , monthlyPayments model loggedInView
+ , paymentsTable model loggedInView
+ , paymentsPaging loggedInView
+ ]
diff --git a/src/client/View/Payments/Add.elm b/src/client/View/LoggedIn/Add.elm
index f352f1f..acdda2d 100644
--- a/src/client/View/Payments/Add.elm
+++ b/src/client/View/LoggedIn/Add.elm
@@ -1,4 +1,4 @@
-module View.Payments.Add
+module View.LoggedIn.Add
( addPayment
) where
@@ -11,13 +11,13 @@ import Result exposing (..)
import ServerCommunication as SC exposing (serverCommunications)
import Update exposing (..)
-import Update.LoggedView exposing (..)
-import Update.LoggedView.Add exposing (..)
+import Update.LoggedIn exposing (..)
+import Update.LoggedIn.Add exposing (..)
import Model exposing (Model)
-import Model.View.Payment.Add exposing (..)
+import Model.View.LoggedIn.Add exposing (..)
import Model.Translations exposing (getMessage)
-import Model.View.LoggedView exposing (LoggedView)
+import Model.View.LoggedInView exposing (LoggedInView)
import View.Events exposing (onSubmitPrevDefault)
import View.Icon exposing (renderIcon)
@@ -25,22 +25,22 @@ import View.Icon exposing (renderIcon)
import Utils.Maybe exposing (isJust)
import Utils.Either exposing (toMaybeError)
-addPayment : Model -> LoggedView -> Html
-addPayment model loggedView =
+addPayment : Model -> LoggedInView -> Html
+addPayment model loggedInView =
H.form
- [ case (validateName loggedView.add.name model.translations, validateCost loggedView.add.cost model.translations) of
+ [ case (validateName loggedInView.add.name model.translations, validateCost loggedInView.add.cost model.translations) of
(Ok name, Ok cost) ->
let action =
- case loggedView.add.frequency of
- Punctual -> SC.AddPayment loggedView.me name cost
+ case loggedInView.add.frequency of
+ Punctual -> SC.AddPayment loggedInView.me name cost
Monthly -> SC.AddMonthlyPayment name cost
in onSubmitPrevDefault serverCommunications.address action
(resName, resCost) ->
- onSubmitPrevDefault actions.address (UpdateLoggedView <| UpdateAdd <| AddError (toMaybeError resName) (toMaybeError resCost))
+ onSubmitPrevDefault actions.address (UpdateLoggedIn <| UpdateAdd <| AddError (toMaybeError resName) (toMaybeError resCost))
]
- [ addPaymentName loggedView.add
- , addPaymentCost model loggedView.add
- , paymentFrequency model loggedView.add
+ [ addPaymentName loggedInView.add
+ , addPaymentCost model loggedInView.add
+ , paymentFrequency model loggedInView.add
, button
[ type' "submit"
, class "add" ]
@@ -54,7 +54,7 @@ addPaymentName addPayment =
[ input
[ id "nameInput"
, value addPayment.name
- , on "input" targetValue (Signal.message actions.address << UpdateLoggedView << UpdateAdd << UpdateName)
+ , on "input" targetValue (Signal.message actions.address << UpdateLoggedIn << UpdateAdd << UpdateName)
, maxlength 20
]
[]
@@ -75,7 +75,7 @@ addPaymentCost model addPayment =
[ input
[ id "costInput"
, value addPayment.cost
- , on "input" targetValue (Signal.message actions.address << UpdateLoggedView << UpdateAdd << UpdateCost)
+ , on "input" targetValue (Signal.message actions.address << UpdateLoggedIn << UpdateAdd << UpdateCost)
, maxlength 7
]
[]
@@ -94,7 +94,7 @@ paymentFrequency model addPayment =
button
[ type' "button"
, class "frequency"
- , onClick actions.address (UpdateLoggedView << UpdateAdd <| ToggleFrequency)
+ , onClick actions.address (UpdateLoggedIn << UpdateAdd <| ToggleFrequency)
]
[ div
[ class ("punctual" ++ if addPayment.frequency == Punctual then " selected" else "") ]
diff --git a/src/client/View/Payments/ExceedingPayer.elm b/src/client/View/LoggedIn/ExceedingPayer.elm
index 88b3a72..ea848b6 100644
--- a/src/client/View/Payments/ExceedingPayer.elm
+++ b/src/client/View/LoggedIn/ExceedingPayer.elm
@@ -1,4 +1,4 @@
-module View.Payments.ExceedingPayer
+module View.LoggedIn.ExceedingPayer
( exceedingPayers
) where
@@ -9,23 +9,23 @@ import List
import Model exposing (Model)
import Model.User exposing (getUserName)
import Model.Payers exposing (..)
-import Model.View.LoggedView exposing (LoggedView)
+import Model.View.LoggedInView exposing (LoggedInView)
import Model.Translations exposing (getMessage)
-exceedingPayers : Model -> LoggedView -> Html
-exceedingPayers model loggedView =
+exceedingPayers : Model -> LoggedInView -> Html
+exceedingPayers model loggedInView =
div
[ class "exceedingPayers" ]
- (List.map (exceedingPayer model loggedView) (getOrderedExceedingPayers loggedView.payers))
+ (List.map (exceedingPayer model loggedInView) (getOrderedExceedingPayers loggedInView.payers))
-exceedingPayer : Model -> LoggedView -> ExceedingPayer -> Html
-exceedingPayer model loggedView payer =
+exceedingPayer : Model -> LoggedInView -> ExceedingPayer -> Html
+exceedingPayer model loggedInView payer =
div
[ class "exceedingPayer" ]
[ span
[ class "userName" ]
[ payer.userId
- |> getUserName loggedView.users
+ |> getUserName loggedInView.users
|> Maybe.withDefault "−"
|> text
]
diff --git a/src/client/View/Payments/Monthly.elm b/src/client/View/LoggedIn/Monthly.elm
index 944314c..14c3de7 100644
--- a/src/client/View/Payments/Monthly.elm
+++ b/src/client/View/LoggedIn/Monthly.elm
@@ -1,4 +1,4 @@
-module View.Payments.Monthly
+module View.LoggedIn.Monthly
( monthlyPayments
) where
@@ -7,22 +7,22 @@ import Html.Attributes exposing (..)
import Html.Events exposing (..)
import Update exposing (..)
-import Update.LoggedView exposing (..)
-import Update.LoggedView.Monthly exposing (..)
+import Update.LoggedIn exposing (..)
+import Update.LoggedIn.Monthly exposing (..)
import Model exposing (Model)
-import Model.View.Payment.Monthly exposing (Monthly)
+import Model.View.LoggedIn.Monthly exposing (Monthly)
import Model.Payment exposing (Payments, Payment)
-import Model.View.LoggedView exposing (LoggedView)
+import Model.View.LoggedInView exposing (LoggedInView)
import Model.Translations exposing (getMessage, getParamMessage)
import ServerCommunication as SC exposing (serverCommunications)
import View.Icon exposing (renderIcon)
-monthlyPayments : Model -> LoggedView -> Html
-monthlyPayments model loggedView =
- let monthly = loggedView.monthly
+monthlyPayments : Model -> LoggedInView -> Html
+monthlyPayments model loggedInView =
+ let monthly = loggedInView.monthly
in if List.isEmpty monthly.payments
then
text ""
@@ -30,7 +30,7 @@ monthlyPayments model loggedView =
div
[ class ("monthlyPayments" ++ if monthly.visibleDetail then " detail" else "") ]
[ monthlyCount model monthly
- , if monthly.visibleDetail then paymentsTable model loggedView monthly else text ""
+ , if monthly.visibleDetail then paymentsTable model loggedInView monthly else text ""
]
monthlyCount : Model -> Monthly -> Html
@@ -39,7 +39,7 @@ monthlyCount model monthly =
key = if count > 1 then "PluralMonthlyCount" else "SingularMonthlyCount"
in button
[ class "count"
- , onClick actions.address (UpdateLoggedView << UpdateMonthly <| ToggleDetail)
+ , onClick actions.address (UpdateLoggedIn << UpdateMonthly <| ToggleDetail)
]
[ text (getParamMessage [toString count] key model.translations)
, div
@@ -50,17 +50,17 @@ monthlyCount model monthly =
]
]
-paymentsTable : Model -> LoggedView -> Monthly -> Html
-paymentsTable model loggedView monthly =
+paymentsTable : Model -> LoggedInView -> Monthly -> Html
+paymentsTable model loggedInView monthly =
div
[ class "table" ]
- ( List.map (paymentLine model loggedView) monthly.payments )
+ ( List.map (paymentLine model loggedInView) monthly.payments )
-paymentLine : Model -> LoggedView -> Payment -> Html
-paymentLine model loggedView payment =
+paymentLine : Model -> LoggedInView -> Payment -> Html
+paymentLine model loggedInView payment =
a
- [ class ("row" ++ (if loggedView.paymentEdition == Just payment.id then " edition" else ""))
- , onClick actions.address (UpdateLoggedView (ToggleEdit payment.id))
+ [ class ("row" ++ (if loggedInView.paymentEdition == Just payment.id then " edition" else ""))
+ , onClick actions.address (UpdateLoggedIn (ToggleEdit payment.id))
]
[ div [ class "cell" ] [ text (payment.name) ]
, div [ class "cell" ] [ text (toString payment.cost ++ " " ++ getMessage "MoneySymbol" model.translations) ]
diff --git a/src/client/View/Payments/Paging.elm b/src/client/View/LoggedIn/Paging.elm
index b9a0109..5d5f2db 100644
--- a/src/client/View/Payments/Paging.elm
+++ b/src/client/View/LoggedIn/Paging.elm
@@ -1,4 +1,4 @@
-module View.Payments.Paging
+module View.LoggedIn.Paging
( paymentsPaging
) where
@@ -6,36 +6,36 @@ import Html exposing (..)
import Html.Attributes exposing (..)
import Html.Events exposing (..)
-import Model.View.LoggedView exposing (..)
+import Model.View.LoggedInView exposing (..)
import Model.Payment exposing (perPage)
import ServerCommunication as SC exposing (serverCommunications)
import Update exposing (..)
-import Update.LoggedView exposing (..)
+import Update.LoggedIn exposing (..)
import View.Icon exposing (renderIcon)
showedPages : Int
showedPages = 5
-paymentsPaging : LoggedView -> Html
-paymentsPaging loggedView =
- let maxPage = ceiling (toFloat loggedView.paymentsCount / toFloat perPage)
- pages = truncatePages loggedView.currentPage [1..maxPage]
+paymentsPaging : LoggedInView -> Html
+paymentsPaging loggedInView =
+ let maxPage = ceiling (toFloat loggedInView.paymentsCount / toFloat perPage)
+ pages = truncatePages loggedInView.currentPage [1..maxPage]
in if maxPage == 1
then
text ""
else
div
[ class "pages" ]
- ( ( if loggedView.currentPage > 1
- then [ firstPage, previousPage loggedView ]
+ ( ( if loggedInView.currentPage > 1
+ then [ firstPage, previousPage loggedInView ]
else []
)
- ++ ( List.map (paymentsPage loggedView) pages)
- ++ ( if loggedView.currentPage < maxPage
- then [ nextPage loggedView, lastPage maxPage ]
+ ++ ( List.map (paymentsPage loggedInView) pages)
+ ++ ( if loggedInView.currentPage < maxPage
+ then [ nextPage loggedInView, lastPage maxPage ]
else []
)
)
@@ -62,19 +62,19 @@ firstPage =
]
[ renderIcon "fast-backward" ]
-previousPage : LoggedView -> Html
-previousPage loggedView =
+previousPage : LoggedInView -> Html
+previousPage loggedInView =
button
[ class "page"
- , onClick serverCommunications.address (SC.UpdatePage (loggedView.currentPage - 1))
+ , onClick serverCommunications.address (SC.UpdatePage (loggedInView.currentPage - 1))
]
[ renderIcon "backward" ]
-nextPage : LoggedView -> Html
-nextPage loggedView =
+nextPage : LoggedInView -> Html
+nextPage loggedInView =
button
[ class "page"
- , onClick serverCommunications.address (SC.UpdatePage (loggedView.currentPage + 1))
+ , onClick serverCommunications.address (SC.UpdatePage (loggedInView.currentPage + 1))
]
[ renderIcon "forward" ]
@@ -86,9 +86,9 @@ lastPage maxPage =
]
[ renderIcon "fast-forward" ]
-paymentsPage : LoggedView -> Int -> Html
-paymentsPage loggedView page =
- let onCurrentPage = page == loggedView.currentPage
+paymentsPage : LoggedInView -> Int -> Html
+paymentsPage loggedInView page =
+ let onCurrentPage = page == loggedInView.currentPage
in button
[ class ("page" ++ (if onCurrentPage then " current" else ""))
, onClick serverCommunications.address <|
diff --git a/src/client/View/Payments/Table.elm b/src/client/View/LoggedIn/Table.elm
index 1646186..6342369 100644
--- a/src/client/View/Payments/Table.elm
+++ b/src/client/View/LoggedIn/Table.elm
@@ -1,4 +1,4 @@
-module View.Payments.Table
+module View.LoggedIn.Table
( paymentsTable
) where
@@ -15,22 +15,22 @@ import String exposing (append)
import Model exposing (Model)
import Model.User exposing (getUserName)
import Model.Payment exposing (..)
-import Model.View.LoggedView exposing (LoggedView)
+import Model.View.LoggedInView exposing (LoggedInView)
import Model.Translations exposing (getMessage)
import ServerCommunication as SC exposing (serverCommunications)
import Update exposing (..)
-import Update.LoggedView exposing (..)
+import Update.LoggedIn exposing (..)
import View.Icon exposing (renderIcon)
import View.Date exposing (..)
-paymentsTable : Model -> LoggedView -> Html
-paymentsTable model loggedView =
+paymentsTable : Model -> LoggedInView -> Html
+paymentsTable model loggedInView =
div
[ class "table" ]
- ( headerLine model :: paymentLines model loggedView)
+ ( headerLine model :: paymentLines model loggedInView)
headerLine : Model -> Html
headerLine model =
@@ -43,25 +43,25 @@ headerLine model =
, div [ class "cell" ] []
]
-paymentLines : Model -> LoggedView -> List Html
-paymentLines model loggedView =
- loggedView.payments
+paymentLines : Model -> LoggedInView -> List Html
+paymentLines model loggedInView =
+ loggedInView.payments
|> List.sortBy (Date.toTime << .creation)
|> List.reverse
- |> List.map (paymentLine model loggedView)
+ |> List.map (paymentLine model loggedInView)
-paymentLine : Model -> LoggedView -> Payment -> Html
-paymentLine model loggedView payment =
+paymentLine : Model -> LoggedInView -> Payment -> Html
+paymentLine model loggedInView payment =
a
- [ class ("row" ++ (if loggedView.paymentEdition == Just payment.id then " edition" else ""))
- , onClick actions.address (UpdateLoggedView (ToggleEdit payment.id))
+ [ class ("row" ++ (if loggedInView.paymentEdition == Just payment.id then " edition" else ""))
+ , onClick actions.address (UpdateLoggedIn (ToggleEdit payment.id))
]
[ div [ class "cell category" ] [ text payment.name ]
, div [ class "cell cost" ] [ text ((toString payment.cost) ++ " " ++ (getMessage "MoneySymbol" model.translations)) ]
, div
[ class "cell user" ]
[ payment.userId
- |> getUserName loggedView.users
+ |> getUserName loggedInView.users
|> Maybe.withDefault "−"
|> text
]
@@ -74,11 +74,11 @@ paymentLine model loggedView payment =
[ class "longDate" ]
[ text (renderLongDate payment.creation model.translations) ]
]
- , if loggedView.me == payment.userId
+ , if loggedInView.me == payment.userId
then
div
[ class "cell delete"
- , onClick serverCommunications.address (SC.DeletePayment payment.id payment.userId payment.cost loggedView.currentPage)
+ , onClick serverCommunications.address (SC.DeletePayment payment.id payment.userId payment.cost loggedInView.currentPage)
]
[ renderIcon "times" ]
else
diff --git a/src/client/View/Page.elm b/src/client/View/Page.elm
index 199c67f..763734d 100644
--- a/src/client/View/Page.elm
+++ b/src/client/View/Page.elm
@@ -10,7 +10,7 @@ import Model.View exposing (..)
import View.Header exposing (renderHeader)
import View.Loading exposing (renderLoading)
import View.SignIn exposing (renderSignIn)
-import View.Payments exposing (renderPayments)
+import View.LoggedIn exposing (renderLoggedIn)
renderPage : Model -> Html
renderPage model =
@@ -27,5 +27,5 @@ renderMain model =
renderLoading
SignInView signInView ->
renderSignIn model signInView
- LoggedView paymentsView ->
- renderPayments model paymentsView
+ LoggedInView loggedInView ->
+ renderLoggedIn model loggedInView
diff --git a/src/client/View/Payments.elm b/src/client/View/Payments.elm
deleted file mode 100644
index ac19df7..0000000
--- a/src/client/View/Payments.elm
+++ /dev/null
@@ -1,27 +0,0 @@
-module View.Payments
- ( renderPayments
- ) where
-
-import Html exposing (..)
-import Html.Attributes exposing (..)
-
-import Model exposing (Model)
-import Model.Payment exposing (Payments)
-import Model.View.LoggedView exposing (LoggedView)
-
-import View.Payments.ExceedingPayer exposing (exceedingPayers)
-import View.Payments.Add exposing (addPayment)
-import View.Payments.Monthly exposing (monthlyPayments)
-import View.Payments.Table exposing (paymentsTable)
-import View.Payments.Paging exposing (paymentsPaging)
-
-renderPayments : Model -> LoggedView -> Html
-renderPayments model loggedView =
- div
- [ class "payments" ]
- [ exceedingPayers model loggedView
- , addPayment model loggedView
- , monthlyPayments model loggedView
- , paymentsTable model loggedView
- , paymentsPaging loggedView
- ]