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

Fix formatting indicator target values

Browse Source
This commit is contained in:
Filip Graliński 2019-02-22 09:03:43 +01:00
parent ba50789fbe
commit 81167926bf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Handler/Dashboard.hs
View File

@ -189,10 +189,10 @@ prettyIndicatorEntry entry = prettyTestTitle (entityVal $ indicatorEntryTest ent
(entityVal $ indicatorEntryChallenge entry) (entityVal $ indicatorEntryChallenge entry)
formatTargets :: IndicatorEntry -> Text formatTargets :: IndicatorEntry -> Text
formatTargets = T.intercalate ", " . (map formatTarget) . indicatorEntryTargets formatTargets entry = T.intercalate ", " $ (map (formatTarget (testPrecision $ entityVal $ indicatorEntryTest entry))) $ indicatorEntryTargets entry
formatTarget :: Entity Target -> Text formatTarget :: Maybe Int -> Entity Target -> Text
formatTarget (Entity _ target) = (T.pack $ show $ targetValue target) <> " (" <> (T.pack $ formatTime defaultTimeLocale "%Y-%m-%d %H:%M" $ targetDeadline target) ++ ")" formatTarget mPrecision (Entity _ target) = (formatScore mPrecision (targetValue target)) <> " (" <> (T.pack $ formatTime defaultTimeLocale "%Y-%m-%d %H:%M" $ targetDeadline target) ++ ")"
indicatorStatusCell :: Maybe (Entity User) -> Table.Table App IndicatorEntry indicatorStatusCell :: Maybe (Entity User) -> Table.Table App IndicatorEntry
indicatorStatusCell mUser = Table.widget "" (indicatorStatusCellWidget mUser) indicatorStatusCell mUser = Table.widget "" (indicatorStatusCellWidget mUser)

5
Handler/Graph.hs
View File

@ -247,13 +247,13 @@ targetsToLines theNow indicator = object [
"y" .= object [ "y" .= object [
"lines" .= map (\target -> object [ "lines" .= map (\target -> object [
"value" .= (targetValue $ entityVal target), "value" .= (targetValue $ entityVal target),
"text" .= formatTarget target "text" .= formatTarget mPrecision target
]) targets ]) targets
], ],
"x" .= object [ "x" .= object [
"lines" .= ((map (\target -> object [ "lines" .= ((map (\target -> object [
"value" .= (formatTimestamp $ targetDeadline $ entityVal target), "value" .= (formatTimestamp $ targetDeadline $ entityVal target),
"text" .= formatTarget target "text" .= formatTarget mPrecision target
]) targets) ]) targets)
++ [object [ ++ [object [
"value" .= formatTimestamp theNow, "value" .= formatTimestamp theNow,
@ -262,6 +262,7 @@ targetsToLines theNow indicator = object [
] ]
] ]
where targets = indicatorEntryTargets indicator where targets = indicatorEntryTargets indicator
mPrecision = testPrecision $ entityVal $ indicatorEntryTest indicator
getBound :: (a -> a -> Ordering) -> [a] -> [a] -> Maybe a getBound :: (a -> a -> Ordering) -> [a] -> [a] -> Maybe a
getBound _ [] _ = Nothing getBound _ [] _ = Nothing