aboutsummaryrefslogtreecommitdiff
path: root/src/server/Model
diff options
context:
space:
mode:
authorJoris2015-09-03 23:32:39 +0200
committerJoris2015-09-03 23:32:39 +0200
commit889df8caf04de5f10a9e623bab3e502e9573159d (patch)
treed8c3dff55ffd38914543213e544c55e346e1f13e /src/server/Model
parentebd304d97b612d0ac4ea276b1c29ba8ecc0b7998 (diff)
Give the payments count to the client
Diffstat (limited to 'src/server/Model')
-rw-r--r--src/server/Model/Json/Number.hs15
-rw-r--r--src/server/Model/Message/Translations.hs2
-rw-r--r--src/server/Model/Payment.hs9
3 files changed, 25 insertions, 1 deletions
diff --git a/src/server/Model/Json/Number.hs b/src/server/Model/Json/Number.hs
new file mode 100644
index 0000000..52c9da8
--- /dev/null
+++ b/src/server/Model/Json/Number.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Model.Json.Number
+ ( Number(..)
+ ) where
+
+import Data.Aeson
+import GHC.Generics
+
+data Number = Number
+ { number :: Int
+ } deriving (Show, Generic)
+
+instance FromJSON Number
+instance ToJSON Number
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index 9b9aafd..6c569fd 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -72,7 +72,7 @@ m l SignInMailTitle =
m l HiMail =
case l of
English -> "Hi {1},"
- French -> "Bonjour {1},"
+ French -> "Salut {1},"
m l SignInLinkMail =
case l of
diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs
index 300f6b8..db1f36f 100644
--- a/src/server/Model/Payment.hs
+++ b/src/server/Model/Payment.hs
@@ -4,6 +4,7 @@ module Model.Payment
, paymentKeyToText
, deleteOwnPayment
, getTotalPayments
+ , getPaymentsCount
) where
import Data.Text (Text)
@@ -82,3 +83,11 @@ getTotalPayment (_, Nothing) = Nothing
unValueTuple :: (Value a, Value b) -> (a, b)
unValueTuple (Value a, Value b) = (a, b)
+
+getPaymentsCount :: Persist Int
+getPaymentsCount =
+ unValue . head <$>
+ (select $
+ from $ \payment -> do
+ where_ (isNothing (payment ^. PaymentDeletedAt))
+ return countRows) :: Persist Int