filipg/gonito
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

Show all deadline lines

Browse Source
This commit is contained in:
Filip Graliński 2018-10-25 09:23:05 +02:00
parent 5ee8a20727
commit 7404dd330d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Handler/Graph.hs
View File

@ -170,7 +170,7 @@ getIndicatorGraphDataR indicatorId = do
-- an auxilliary graph -- an auxilliary graph
let (targetEntries, otherEntries) = let (targetEntries, otherEntries) =
partitionEntries (indicatorTargetCondition indicator) filteredEntries partitionEntries (indicatorTargetCondition indicator) filteredEntries
let (scores, timePoints) = addNow theNow $ entriesToPoints (Entity testId test) targetEntries let (scores', timePoints') = addNow theNow $ entriesToPoints (Entity testId test) targetEntries
let (otherScores, otherTimePoints) = addNow theNow $ entriesToPoints (Entity testId test) otherEntries let (otherScores, otherTimePoints) = addNow theNow $ entriesToPoints (Entity testId test) otherEntries
let otherLabel = label <> " (other filtered)" let otherLabel = label <> " (other filtered)"
@ -178,8 +178,15 @@ getIndicatorGraphDataR indicatorId = do
-- that's why we need to enforce y range manually if needed -- that's why we need to enforce y range manually if needed
-- (x range are not modified this way) -- (x range are not modified this way)
let targetValues = map (targetValue . entityVal) $ indicatorEntryTargets indicatorEntry let targetValues = map (targetValue . entityVal) $ indicatorEntryTargets indicatorEntry
let maxRange = getBound compare scores targetValues let maxRange = getBound compare scores' targetValues
let minRange = getBound (flip compare) scores targetValues let minRange = getBound (flip compare) scores' targetValues
-- we need to make sure the deadline line is visible
let targetsInTheFuture =
filter (\target -> targetDeadline target > theNow)
$ map entityVal $ indicatorEntryTargets indicatorEntry
let scores = scores' ++ (map (const (last $ impureNonNull scores')) targetsInTheFuture)
let timePoints = timePoints' ++ (map (formatTimestamp . targetDeadline) targetsInTheFuture)
-- we return a JSON object required by the C3 library -- we return a JSON object required by the C3 library
return $ object [ return $ object [