From 51607c8000762e14d8ca1d15935b80bc08c80667 Mon Sep 17 00:00:00 2001 From: SJost Date: Fri, 21 Dec 2018 17:12:06 +0100 Subject: [PATCH] minor change gradingSummaryRow --- templates/widgets/gradingSummaryRow.hamlet | 34 +++++++++++++++------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/templates/widgets/gradingSummaryRow.hamlet b/templates/widgets/gradingSummaryRow.hamlet index 0b40eeba3..16ef69f15 100644 --- a/templates/widgets/gradingSummaryRow.hamlet +++ b/templates/widgets/gradingSummaryRow.hamlet @@ -15,15 +15,21 @@ $# _{sumHeader} $maybe _ <- hasMarkedPasses $with Sum pmax <- summary ^. _numMarkedPasses - $with Sum pacv <- summary ^. _achievedPasses - - $if pmax > 0 - #{textPercentInt pacv pmax} - - #{display pacv} / #{display pmax} + $if pmax > 0 + $with Sum pacv <- summary ^. _achievedPasses + + $if pmax > 0 + #{textPercentInt pacv pmax} + + #{display pacv} / #{display pmax} + $else + + $maybe _ <- hasPasses - - #{display $ summary ^. _numSheetsPasses} + $with Sum numPass <- summary ^. _numSheetsPasses + + $if numPass > 0 + #{display numPass} $maybe _ <- hasMarkedPoints $with Sum pmax <- summary ^. _sumMarkedPoints $with Sum pacv <- summary ^. _achievedPoints @@ -32,9 +38,17 @@ $# #{textPercent $ realToFrac $ pacv / pmax} #{display pacv} / #{display pmax} - \ (_{title $ getSum $ summary ^. _numMarkedPoints}) + $if ((summary ^. _numMarkedPoints) /= (summary ^. _numSheets)) + $# Falls Anzahl Blätter der Zeile verschieden von Anzahl gewerterer Blätter + \ (_{title $ getSum $ summary ^. _numMarkedPoints}) + $# Kurze Alternative mit Hashtag-Symbol für "Anzahl" + $# \ (##{display $ summary ^. _numMarkedPoints}) $maybe _ <- hasPoints #{display (summary ^. _sumSheetsPoints)} - \ (_{title $ getSum $ summary ^. _numSheetsPoints}) + $if ((summary ^. _numSheetsPoints) /= (summary ^. _numSheets)) + $# Falls Anzahl Blätter der Zeile verschieden von Anzahl Blätter mit Punkten + \ (_{title $ getSum $ summary ^. _numSheetsPoints}) + $# Kurze Alternative mit Hashtag-Symbol für "Anzahl" + $# \ (##{display $ summary ^. _numSheetsPoints}) #{display $ summary ^. _numSheets} \ No newline at end of file