better journal summary

This commit is contained in:
nek0 2015-04-10 17:00:50 +02:00
parent 1d19538a83
commit 6e2fef78f8
1 changed files with 6 additions and 4 deletions

View File

@ -7,10 +7,12 @@ import Handler.Common
getJournalR :: Handler Html
getJournalR = do
master <- getYesod
rawEntries <- runDB $ selectList [] [Desc TransactionId, LimitTo 30]
entries <- return $ L.reverse rawEntries
total <- return $ L.sum $ I.map (transactionAmount . entityVal) entries
timeLimit <- return $ transactionTime $ entityVal $ L.head $ entries
rawEntries <- runDB $ selectList [] [Desc TransactionId]
entries <- return $ L.reverse $ L.take 30 rawEntries
total <- return $ L.sum $ I.map (transactionAmount . entityVal) rawEntries
timeLimit <- case L.null entries of
False -> return $ transactionTime $ entityVal $ L.head $ entries
True -> liftIO getCurrentTime
cashChecks <- runDB $ selectList [CashCheckTime >=. timeLimit] [Asc CashCheckId]
list <- return $ merge entries cashChecks
cashBalance <- getCashierBalance