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

Fix sorting tests

Browse Source
This commit is contained in:
Filip Gralinski 2020-01-12 19:27:07 +01:00
parent 9c05633dbe
commit 580c141a8e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Handler/Tables.hs
View File

@ -408,7 +408,7 @@ getScore testId variantId = do
E.&&. (evaluation ^. EvaluationVersion E.==. E.just (submission ^. SubmissionVersion)
E.||. E.isNothing (evaluation ^. EvaluationVersion))
E.&&. evaluation ^. EvaluationTest E.==. E.val testId)
E.orderBy [E.desc (E.isNothing (evaluation ^. EvaluationVersion))]
E.orderBy [E.asc (evaluation ^. EvaluationScore)]
return evaluation
return $ case evaluations of
(e:_) -> evaluationScore $ entityVal e
@ -444,7 +444,7 @@ getEvaluationMap testsMap submissionsMap (rank, (s@(Entity submissionId submissi
let tagEnts = basicSubmissionInfoTagEnts submissionInfo
let version = basicSubmissionInfoVersion submissionInfo
outs <- selectList [OutVariant ==. variantId] []
outs <- selectList [OutVariant ==. variantId] [Asc OutId]
let versionHash = submissionVersion submission
maybeEvaluations <- mapM (\(Entity _ o) -> fetchTheEvaluation o versionHash) outs
let evaluations = catMaybes maybeEvaluations