Bring back desc for boolean values

This commit is contained in:
Filip Gralinski 2020-01-07 22:02:06 +01:00
parent c9b8f65958
commit e323eb6bea
2 changed files with 2 additions and 2 deletions

View File

@ -408,7 +408,7 @@ getScore testId variantId = do
E.&&. (evaluation ^. EvaluationVersion E.==. E.just (submission ^. SubmissionVersion) E.&&. (evaluation ^. EvaluationVersion E.==. E.just (submission ^. SubmissionVersion)
E.||. E.isNothing (evaluation ^. EvaluationVersion)) E.||. E.isNothing (evaluation ^. EvaluationVersion))
E.&&. evaluation ^. EvaluationTest E.==. E.val testId) E.&&. evaluation ^. EvaluationTest E.==. E.val testId)
E.orderBy [E.asc (E.isNothing (evaluation ^. EvaluationVersion))] E.orderBy [E.desc (E.isNothing (evaluation ^. EvaluationVersion))]
return evaluation return evaluation
return $ case evaluations of return $ case evaluations of
(e:_) -> evaluationScore $ entityVal e (e:_) -> evaluationScore $ entityVal e

View File

@ -61,7 +61,7 @@ processVariant dbName (variant, Entity _ submission, Entity _ out, Entity testId
E.&&. (evaluation ^. EvaluationVersion E.==. E.just (E.val (submissionVersion submission)) E.&&. (evaluation ^. EvaluationVersion E.==. E.just (E.val (submissionVersion submission))
E.||. E.isNothing (evaluation ^. EvaluationVersion)) E.||. E.isNothing (evaluation ^. EvaluationVersion))
E.&&. evaluation ^. EvaluationTest E.==. E.val testId) E.&&. evaluation ^. EvaluationTest E.==. E.val testId)
E.orderBy [E.asc (E.isNothing (evaluation ^. EvaluationVersion))] E.orderBy [E.desc (E.isNothing (evaluation ^. EvaluationVersion))]
return evaluation return evaluation
case evaluations of case evaluations of