Modify weelky report and payment search interface

- Add payment balance in weekly report
- Show a message and hide pages when the search results in no results
- Go to page 1 when the search is updated / erased

2 files changed, 3 insertions, 6 deletions

diff --git a/server/src/Job/MonthlyPayment.hs b/server/src/Job/MonthlyPayment.hs
index ca7e007..907be2b 100644
--- a/server/src/Job/MonthlyPayment.hs
+++ b/server/src/Job/MonthlyPayment.hs
@@ -12,7 +12,7 @@ import           Util.Time       (timeToDay)
 
 monthlyPayment :: Maybe UTCTime -> IO UTCTime
 monthlyPayment _ = do
-  monthlyPayments <- Query.run Payment.listMonthly
+  monthlyPayments <- Query.run Payment.listActiveMonthlyOrderedByName
   now <- getCurrentTime
   actualDay <- timeToDay now
   let punctualPayments = map
diff --git a/server/src/Job/WeeklyReport.hs b/server/src/Job/WeeklyReport.hs
index 74180df..38d88b5 100644
--- a/server/src/Job/WeeklyReport.hs
+++ b/server/src/Job/WeeklyReport.hs
@@ -19,10 +19,7 @@ weeklyReport conf mbLastExecution = do
     Nothing -> return ()
     Just lastExecution -> do
       (payments, incomes, users) <- Query.run $
-        (,,) <$>
-          Payment.modifiedDuring lastExecution now <*>
-          Income.modifiedDuring lastExecution now <*>
-          User.list
-      _ <- SendMail.sendMail (WeeklyReport.mail conf users payments incomes lastExecution now)
+        (,,) <$> Payment.listPunctual <*> Income.list <*> User.list
+      _ <- SendMail.sendMail conf (WeeklyReport.mail conf users payments incomes lastExecution now)
       return ()
   return now