This commit is contained in:
nek0 2017-01-21 20:38:38 +01:00
parent 1a20a2b846
commit 13e2b4b2bd
1 changed files with 2 additions and 2 deletions

View File

@ -18,7 +18,7 @@ module Handler.Statistics where
import Import import Import
import Handler.Common import Handler.Common
import Data.List hiding (length) import Data.List hiding (length)
import Data.Maybe (fromJust) import Data.Maybe (fromMaybe)
import Data.Time.Calendar (addDays) import Data.Time.Calendar (addDays)
getStatisticsR :: Handler RepJson getStatisticsR :: Handler RepJson
@ -59,7 +59,7 @@ getStatisticsR = do
archdevils <- runDB $ selectList [UserBalance <. -5000] [] archdevils <- runDB $ selectList [UserBalance <. -5000] []
bevs <- runDB $ selectList [] [Asc BeverageId] bevs <- runDB $ selectList [] [Asc BeverageId]
totalLossPrime <- return $ foldl (\acc (Entity _ bev) -> totalLossPrime <- return $ foldl (\acc (Entity _ bev) ->
let primePrice = if not (isNothing (beveragePricePerCrate bev) && not (isNothing (beveragePerCrate bev))) then (fromIntegral $ fromJust (beveragePricePerCrate bev)) / (fromIntegral $ fromJust (beveragePerCrate bev)) else 0.0 let primePrice = if not (isNothing (beveragePricePerCrate bev) && not (isNothing (beveragePerCrate bev))) then (fromIntegral $ fromMaybe 0 (beveragePricePerCrate bev)) / (fromIntegral $ fromMaybe 0 (beveragePerCrate bev)) else 0.0
in acc + (((fromIntegral $ beverageCorrectedAmount bev) * primePrice) / 100) in acc + (((fromIntegral $ beverageCorrectedAmount bev) * primePrice) / 100)
) 0 bevs ) 0 bevs
totalLossRetail <- return $ foldl (\acc (Entity _ bev) -> totalLossRetail <- return $ foldl (\acc (Entity _ bev) ->