Remove some more warnings
This commit is contained in:
parent
e0092b300a
commit
0c5a864986
4 changed files with 3 additions and 4 deletions
|
@ -41,7 +41,7 @@ merge [] (c:cs) = (Right $ entityVal c) : merge [] cs
|
||||||
merge (t:ts) [] = (Left $ entityVal t) : merge ts []
|
merge (t:ts) [] = (Left $ entityVal t) : merge ts []
|
||||||
merge (t:ts) (c:cs)
|
merge (t:ts) (c:cs)
|
||||||
| transactionTime (entityVal t) < cashCheckTime (entityVal c) = (Left $ entityVal t) : merge ts (c:cs)
|
| transactionTime (entityVal t) < cashCheckTime (entityVal c) = (Left $ entityVal t) : merge ts (c:cs)
|
||||||
| transactionTime (entityVal t) > cashCheckTime (entityVal c) = (Right $ entityVal c) : merge (t:ts) cs
|
| otherwise = (Right $ entityVal c) : merge (t:ts) cs
|
||||||
|
|
||||||
getJournalPageR :: Int -> Handler Html
|
getJournalPageR :: Int -> Handler Html
|
||||||
getJournalPageR p = do
|
getJournalPageR p = do
|
||||||
|
|
|
@ -110,7 +110,7 @@ getDeleteBeverageR :: BeverageId -> Handler Html
|
||||||
getDeleteBeverageR bId = do
|
getDeleteBeverageR bId = do
|
||||||
mBev <- runDB $ get bId
|
mBev <- runDB $ get bId
|
||||||
case mBev of
|
case mBev of
|
||||||
Just bev -> do
|
Just _ -> do
|
||||||
runDB $ delete bId
|
runDB $ delete bId
|
||||||
setMessageI MsgItemDeleted
|
setMessageI MsgItemDeleted
|
||||||
redirect HomeR
|
redirect HomeR
|
||||||
|
|
|
@ -103,7 +103,6 @@ modifySupplierForm sup = SupConf
|
||||||
<*> aopt (selectField avatars) (bfs MsgSelectAvatar) (Just $ supplierAvatar sup)
|
<*> aopt (selectField avatars) (bfs MsgSelectAvatar) (Just $ supplierAvatar sup)
|
||||||
<* bootstrapSubmit (msgToBSSubmit MsgSubmit)
|
<* bootstrapSubmit (msgToBSSubmit MsgSubmit)
|
||||||
where
|
where
|
||||||
master = getYesod
|
|
||||||
avatars = do
|
avatars = do
|
||||||
ents <- runDB $ selectList [] [Asc AvatarIdent]
|
ents <- runDB $ selectList [] [Asc AvatarIdent]
|
||||||
optionsPairs $ map (\ent -> ((avatarIdent $ entityVal ent), entityKey ent)) ents
|
optionsPairs $ map (\ent -> ((avatarIdent $ entityVal ent), entityKey ent)) ents
|
||||||
|
|
|
@ -90,7 +90,7 @@ library
|
||||||
, aeson >= 0.6 && < 0.11
|
, aeson >= 0.6 && < 0.11
|
||||||
, conduit >= 1.0 && < 2.0
|
, conduit >= 1.0 && < 2.0
|
||||||
, monad-logger >= 0.3 && < 0.4
|
, monad-logger >= 0.3 && < 0.4
|
||||||
, fast-logger >= 2.2 && < 2.3
|
, fast-logger >= 2.2
|
||||||
, wai-logger >= 2.2 && < 2.3
|
, wai-logger >= 2.2 && < 2.3
|
||||||
, file-embed
|
, file-embed
|
||||||
, safe
|
, safe
|
||||||
|
|
Loading…
Reference in a new issue