Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments

2 files changed, 24 insertions, 30 deletions

diff --git a/server/src/View/Mail/SignIn.hs b/server/src/View/Mail/SignIn.hs
index d542fd8..22c3cb0 100644
--- a/server/src/View/Mail/SignIn.hs
+++ b/server/src/View/Mail/SignIn.hs
@@ -1,24 +1,21 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module View.Mail.SignIn
   ( mail
   ) where
 
-import           Data.Text          (Text)
+import           Data.Text    (Text)
 
-import qualified Common.Message     as Message
-import qualified Common.Message.Key as Key
-import           Common.Model       (User (..))
+import           Common.Model (User (..))
+import qualified Common.Msg   as Msg
 
-import           Conf               (Conf)
-import qualified Conf               as Conf
-import qualified Model.Mail         as M
+import           Conf         (Conf)
+import qualified Conf         as Conf
+import qualified Model.Mail   as M
 
 mail :: Conf -> User -> Text -> [Text] -> M.Mail
 mail conf user url to =
   M.Mail
     { M.from = Conf.noReplyMail conf
     , M.to = to
-    , M.subject = Message.get Key.SignIn_MailTitle
-    , M.plainBody = Message.get (Key.SignIn_MailBody (_user_name user) url)
+    , M.subject = Msg.get Msg.SignIn_MailTitle
+    , M.plainBody = Msg.get (Msg.SignIn_MailBody (_user_name user) url)
     }
diff --git a/server/src/View/Mail/WeeklyReport.hs b/server/src/View/Mail/WeeklyReport.hs
index c0e89d5..4ad8b77 100644
--- a/server/src/View/Mail/WeeklyReport.hs
+++ b/server/src/View/Mail/WeeklyReport.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module View.Mail.WeeklyReport
   ( mail
   ) where
@@ -13,11 +11,10 @@ import           Data.Text          (Text)
 import qualified Data.Text          as T
 import           Data.Time.Clock    (UTCTime)
 
-import qualified Common.Message     as Message
-import qualified Common.Message.Key as Key
 import           Common.Model       (Income (..), Payment (..), User (..),
                                      UserId)
 import qualified Common.Model       as CM
+import qualified Common.Msg         as Msg
 import qualified Common.View.Format as Format
 
 import           Conf               (Conf)
@@ -34,9 +31,9 @@ mail conf users payments incomes start end =
     { M.from = Conf.noReplyMail conf
     , M.to = map _user_email users
     , M.subject = T.concat
-        [ Message.get Key.App_Title
+        [ Msg.get Msg.App_Title
         , " − "
-        , Message.get Key.WeeklyReport_Title
+        , Msg.get Msg.WeeklyReport_Title
         ]
     , M.plainBody = body conf users (groupByStatus start end payments) (groupByStatus start end incomes)
     }
@@ -45,7 +42,7 @@ body :: Conf -> [User] -> Map Status [Payment] -> Map Status [Income] -> Text
 body conf users paymentsByStatus incomesByStatus =
   if M.null paymentsByStatus && M.null incomesByStatus
     then
-      Message.get Key.WeeklyReport_Empty
+      Msg.get Msg.WeeklyReport_Empty
     else
       T.intercalate "\n" . catMaybes . concat $
         [ map (\s -> paymentSection s conf users <$> M.lookup s paymentsByStatus) statuses
@@ -56,17 +53,17 @@ paymentSection :: Status -> Conf -> [User] -> [Payment] -> Text
 paymentSection status conf users payments =
   section sectionTitle sectionItems
   where count = length payments
-        sectionTitle = Message.get $ case status of
-          Created -> if count > 1 then Key.WeeklyReport_PaymentsCreated count else Key.WeeklyReport_PaymentCreated count
-          Edited -> if count > 1 then Key.WeeklyReport_PaymentsEdited count else Key.WeeklyReport_PaymentEdited count
-          Deleted -> if count > 1 then Key.WeeklyReport_PaymentsDeleted count else Key.WeeklyReport_PaymentDeleted count
+        sectionTitle = Msg.get $ case status of
+          Created -> if count > 1 then Msg.WeeklyReport_PaymentsCreated count else Msg.WeeklyReport_PaymentCreated count
+          Edited -> if count > 1 then Msg.WeeklyReport_PaymentsEdited count else Msg.WeeklyReport_PaymentEdited count
+          Deleted -> if count > 1 then Msg.WeeklyReport_PaymentsDeleted count else Msg.WeeklyReport_PaymentDeleted count
         sectionItems = map (payedFor status conf users) . sortOn _payment_date $ payments
 
 payedFor :: Status -> Conf -> [User] -> Payment -> Text
 payedFor status conf users payment =
   case status of
-    Deleted -> Message.get (Key.WeeklyReport_PayedForNot name amount for at)
-    _       -> Message.get (Key.WeeklyReport_PayedFor name amount for at)
+    Deleted -> Msg.get (Msg.WeeklyReport_PayedForNot name amount for at)
+    _       -> Msg.get (Msg.WeeklyReport_PayedFor name amount for at)
   where name = formatUserName (_payment_user payment) users
         amount = Format.price (Conf.currency conf) . _payment_cost $ payment
         for = _payment_name payment
@@ -76,17 +73,17 @@ incomeSection :: Status -> Conf -> [User] -> [Income] -> Text
 incomeSection status conf users incomes =
   section sectionTitle sectionItems
   where count = length incomes
-        sectionTitle = Message.get $ case status of
-          Created -> if count > 1 then Key.WeeklyReport_IncomesCreated count else Key.WeeklyReport_IncomeCreated count
-          Edited -> if count > 1 then Key.WeeklyReport_IncomesEdited count else Key.WeeklyReport_IncomeEdited count
-          Deleted -> if count > 1 then Key.WeeklyReport_IncomesDeleted count else Key.WeeklyReport_IncomeDeleted count
+        sectionTitle = Msg.get $ case status of
+          Created -> if count > 1 then Msg.WeeklyReport_IncomesCreated count else Msg.WeeklyReport_IncomeCreated count
+          Edited -> if count > 1 then Msg.WeeklyReport_IncomesEdited count else Msg.WeeklyReport_IncomeEdited count
+          Deleted -> if count > 1 then Msg.WeeklyReport_IncomesDeleted count else Msg.WeeklyReport_IncomeDeleted count
         sectionItems = map (isPayedFrom status conf users) . sortOn _income_date $ incomes
 
 isPayedFrom :: Status -> Conf -> [User] -> Income -> Text
 isPayedFrom status conf users income =
   case status of
-    Deleted -> Message.get (Key.WeeklyReport_PayedFromNot name amount for)
-    _       -> Message.get (Key.WeeklyReport_PayedFrom name amount for)
+    Deleted -> Msg.get (Msg.WeeklyReport_PayedFromNot name amount for)
+    _       -> Msg.get (Msg.WeeklyReport_PayedFrom name amount for)
   where name = formatUserName (_income_userId income) users
         amount = Format.price (Conf.currency conf) . _income_amount $ income
         for = Format.longDay $ _income_date income