s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

refactor timeline

Browse Source
This commit is contained in:
Filip Gralinski 2016-05-03 13:06:47 +02:00
parent 92185a14a9
commit 264f53eaf3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Handler/Discussion.hs
View File

@ -51,13 +51,17 @@ getChallengeDiscussionR name = do
(Entity challengeId challenge) <- runDB $ getBy404 $ UniqueName name (Entity challengeId challenge) <- runDB $ getBy404 $ UniqueName name
maybeUser <- maybeAuth maybeUser <- maybeAuth
(formWidget, formEnctype) <- generateFormPost $ renderBootstrap3 BootstrapBasicForm (commentForm challengeId) (formWidget, formEnctype) <- generateFormPost $ renderBootstrap3 BootstrapBasicForm (commentForm challengeId)
sortedTimelineItems <- getTimelineItems challengeId
challengeLayout True challenge (discussionWidget maybeUser formWidget formEnctype name sortedTimelineItems)
getTimelineItems :: ChallengeId -> Handler [TimelineItem]
getTimelineItems challengeId = do
comments <- runDB $ selectList [CommentChallenge ==. challengeId] [Desc CommentPosted] comments <- runDB $ selectList [CommentChallenge ==. challengeId] [Desc CommentPosted]
submissions <- runDB $ selectList [SubmissionChallenge ==. challengeId] [Desc SubmissionStamp] submissions <- runDB $ selectList [SubmissionChallenge ==. challengeId] [Desc SubmissionStamp]
timelineItems' <- mapM toTimelineItem comments timelineItems' <- mapM toTimelineItem comments
timelineItems'' <- mapM toTimelineItem submissions timelineItems'' <- mapM toTimelineItem submissions
let sortedTimelineItems = sortBy (\item1 item2 -> (getTime item2 `compare` getTime item1)) ( return $ sortBy (\item1 item2 -> (getTime item2 `compare` getTime item1)) (
timelineItems' ++ timelineItems'') timelineItems' ++ timelineItems'')
challengeLayout True challenge (discussionWidget maybeUser formWidget formEnctype name sortedTimelineItems)
discussionWidget maybeUser formWidget formEnctype name sortedTimelineItems = $(widgetFile "challenge-discussion") discussionWidget maybeUser formWidget formEnctype name sortedTimelineItems = $(widgetFile "challenge-discussion")