From b81b7bf58c56458efb1b1dd6062e29256bbb7147 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 3 Nov 2018 21:53:45 +0100 Subject: [PATCH] Fixes #225 --- src/Handler/Sheet.hs | 5 +++-- templates/widgets/sheetTypeSummary.hamlet | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 840601eb1..8feceb2bf 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -187,10 +187,11 @@ getSheetListR tid ssh csh = do $ \(Entity _ Sheet{sheetType=sType}, _, mbSub) -> case mbSub of (Just (Entity _ Submission{submissionRatingPoints=Just sPoints})) -> case preview (_grading . _maxPoints) sType of - (Nothing) -> mempty - (Just maxPoints) -> + Just maxPoints + | maxPoints /= 0 -> let percent = sPoints / maxPoints in textCell $ textPercent $ realToFrac percent + _other -> mempty _other -> mempty ] psValidator = def diff --git a/templates/widgets/sheetTypeSummary.hamlet b/templates/widgets/sheetTypeSummary.hamlet index 38fc7db3d..b3bb512f7 100644 --- a/templates/widgets/sheetTypeSummary.hamlet +++ b/templates/widgets/sheetTypeSummary.hamlet @@ -12,7 +12,9 @@ $with realGrades <- normalSummary <> bonusSummary $maybe achievedBonus <- positiveSum (sumGradePoints bonusSummary) von #{display achievedBonus} erreichbaren # Bonuspunkten) - \ #{textPercent $ realToFrac $ nPts / realPoints} + $if realPoints /= 0 + \ #{textPercent $ realToFrac $ nPts / realPoints} + \. $maybe fakePoints <- positiveSum (sumGradePoints informationalSummary)
  • Hinweis: @@ -20,8 +22,9 @@ $with realGrades <- normalSummary <> bonusSummary welche nicht gewertet wurden, sondern nur informativen Charakter besitzen $maybe achievedFakes <- getSum <$> achievedPoints informationalSummary , davon wurden #{display achievedFakes} erreicht - \ #{textPercent $ realToFrac $ achievedFakes / fakePoints} - . + $if fakePoints /= 0 + \ #{textPercent $ realToFrac $ achievedFakes / fakePoints} + \. $maybe reqPasses <- positiveSum (numGradePasses normalSummary)
  • @@ -30,7 +33,7 @@ $with realGrades <- normalSummary <> bonusSummary \ davon #{display passed} bestanden $maybe bonusPassed <- getSum <$> achievedPasses bonusSummary \ (inklusive #{display bonusPassed} Bonusaufgaben) - . + \. $maybe noGradeSheets <- positiveSum numNotGraded