From 731231d5eae5ab91361fec09686c2d1977ab9bae Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 Mar 2020 10:33:54 +0100 Subject: [PATCH] fix(exams): provide bonus information in return of examBonusGrade --- src/Handler/Utils/Exam.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Utils/Exam.hs b/src/Handler/Utils/Exam.hs index 00d060934..3ed2a9d6a 100644 --- a/src/Handler/Utils/Exam.hs +++ b/src/Handler/Utils/Exam.hs @@ -224,8 +224,8 @@ examBonusGrade :: ( MonoFoldable sheets => Exam -> Either Points sheets -- ^ `Points` retrieved from relevant `ExamBonus`, iff it exists -> results - -> Maybe ExamResultGrade -examBonusGrade exam@Exam{..} bonusInp = examGrade exam mBonus + -> (Maybe Points, Maybe ExamResultGrade) +examBonusGrade exam@Exam{..} bonusInp = (mBonus, ) . examGrade exam mBonus where mBonus = asum [ bonusInp ^? _Left , examResultBonus <$> examBonusRule <*> bonusPossible <*> bonusAchieved