diff --git a/Handler/Shared.hs b/Handler/Shared.hs index 992afa2..9aec4d8 100644 --- a/Handler/Shared.hs +++ b/Handler/Shared.hs @@ -499,3 +499,8 @@ runSlackHook hook message = do slackLink :: App -> Text -> Text -> Text slackLink app title addr = "<" ++ slink ++ "|" ++ title ++ ">" where slink = (appRoot $ appSettings app) ++ "/" ++ addr + +formatVersion :: (Int, Int, Int) -> Text +formatVersion (major, minor, patch) = (T.pack $ show major) + <> "." <> (T.pack $ show minor) + <> "." <> (T.pack $ show patch) diff --git a/Handler/ShowChallenge.hs b/Handler/ShowChallenge.hs index bfb3878..f2faa1a 100644 --- a/Handler/ShowChallenge.hs +++ b/Handler/ShowChallenge.hs @@ -749,6 +749,9 @@ challengeLayout :: Bool -> Challenge -> WidgetFor App () -> HandlerFor App Html challengeLayout withHeader challenge widget = do tagsAvailableAsJSON <- runDB $ getAvailableTagsAsJSON version <- runDB $ getBy404 $ UniqueVersionByCommit $ challengeVersion challenge + let versionFormatted = formatVersion ((versionMajor $ entityVal version), + (versionMinor $ entityVal version), + (versionPatch $ entityVal version)) maybeUser <- maybeAuth bc <- widgetToPageContent widget defaultLayout $ do diff --git a/Handler/Tables.hs b/Handler/Tables.hs index 6942b13..b1c5aca 100644 --- a/Handler/Tables.hs +++ b/Handler/Tables.hs @@ -59,9 +59,6 @@ data TableEntry = TableEntry { tableEntryStamp :: TableEntry -> UTCTime tableEntryStamp = submissionStamp . entityVal . tableEntrySubmission -formatVersion :: (Int, Int, Int) -> Text -formatVersion (major, minor, patch) = (Data.Text.pack $ show major) <> "." <> (Data.Text.pack $ show minor) <> "." <> (Data.Text.pack $ show patch) - submissionsTable :: Maybe UserId -> Text -> RepoScheme -> Repo -> [Entity Test] -> Table App TableEntry submissionsTable mauthId challengeName repoScheme challengeRepo tests = mempty ++ Table.int "#" tableEntryRank diff --git a/templates/challenge.hamlet b/templates/challenge.hamlet index dd17252..d975ec2 100644 --- a/templates/challenge.hamlet +++ b/templates/challenge.hamlet @@ -15,7 +15,7 @@
$if withHeader

#{challengeTitle challenge} -

#{challengeDescription challenge} +

#{challengeDescription challenge} [ver. #{versionFormatted}] $maybe deadline <- versionDeadline $ entityVal version

Deadline: #{show deadline} $nothing