From 580c141a8e4a4ea914bfe9b744ae4a2a30c67052 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sun, 12 Jan 2020 19:27:07 +0100 Subject: [PATCH] Fix sorting tests --- Handler/Tables.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Handler/Tables.hs b/Handler/Tables.hs index f07cbea..9974861 100644 --- a/Handler/Tables.hs +++ b/Handler/Tables.hs @@ -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