From aa455d2bdd2b9a7a15650cf6e3cc2d42137b829a Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sun, 2 Dec 2018 16:47:56 +0100
Subject: [PATCH] =?UTF-8?q?Statistik=20Abgaben/Bl=C3=A4tter=20done?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messages/uniworx/de.msg                 | 3 ++-
 src/Foundation.hs                       | 2 +-
 src/Handler/Corrections.hs              | 2 +-
 src/Handler/Sheet.hs                    | 2 +-
 src/Handler/Utils/Rating.hs             | 4 ++--
 templates/widgets/gradingSummary.hamlet | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index f6d38f8fb..315d0e3de 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -392,7 +392,8 @@ SheetTypeInformational grading@SheetGrading: Keine Wertung
 SheetTypeNotGraded: Unbewertet
 SheetTypeInfo: Bonus Blätter zählen normal, erhöhen aber nicht die maximal erreichbare Punktzahl bzw. Anzahl zu bestehender Blätter. Blätter ohne Wertung werden nirgends angerechnet, die Bewertung durch den Korrektor dient lediglich zur Information an die Teilnehmer.
 SheetGradingBonusIncluded: Erzielte Bonuspunkte wurden hier bereits zu den erreichten normalen Punkten hinzugezählt.
-SheetGradingSummaryTitle n@Int: Zusammenfassung über alle #{display n} Abgaben/Blätter
+SheetGradingSummaryTitle n@Int: Zusammenfassung über alle #{display n} Blätter
+SubmissionGradingSummaryTitle n@Int: Zusammenfassung über alle #{display n} Abgaben
 
 SheetTypeBonus': Bonus
 SheetTypeNormal': Normal
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8577ae9fd..c443a3c01 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -142,7 +142,7 @@ pattern CSubmissionR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Cr
 pattern CSubmissionR tid ssh csh shn cid ptn
   = CSheetR tid ssh csh shn (SubmissionR cid ptn)
 
--- Messages
+-- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
 mkMessage "UniWorX" "messages/uniworx" "de"
 mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
 mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de"
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 9a398e017..7455f2311 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -370,7 +370,7 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions =
       points <- E.select . E.from $ correctionsTableQuery whereClause getTypePoints
       -- points <- E.select . E.from $ t@((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) -> (correctionsTableQuery whereClause getTypePoints t) <* E.distinctOn []
       return $ foldMap (\(E.Value stype, E.Value srpoints, E.Value srtime) -> sheetTypeSum stype (srpoints <* srtime)) points
-  let statistics = gradeSummaryWidget gradingSummary
+  let statistics = gradeSummaryWidget MsgSubmissionGradingSummaryTitle gradingSummary
   fmap toTypedContent . defaultLayout $ do
     setTitleI MsgCourseCorrectionsTitle
     $(widgetFile "corrections")
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index bb6e551d5..523a7d297 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -229,7 +229,7 @@ getSheetListR tid ssh csh = do
     , dbtIdent     = "sheets" :: Text
     }
   -- Collect summary over all Sheets, not just the ones shown due to pagination:
-  statistics <- gradeSummaryWidget <$> do
+  statistics <- gradeSummaryWidget MsgSheetGradingSummaryTitle <$> do
     rows <- runDB $ E.select $ E.from $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) -> do
       E.on $ submission E.?. SubmissionId E.==. submissionUser E.?. SubmissionUserSubmission
       E.on $  (E.just $ sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet
diff --git a/src/Handler/Utils/Rating.hs b/src/Handler/Utils/Rating.hs
index 6cffb948d..d5f6f8006 100644
--- a/src/Handler/Utils/Rating.hs
+++ b/src/Handler/Utils/Rating.hs
@@ -219,8 +219,8 @@ addBonusToPoints sts =
     maxBonusPass = fmap $ min maxPasses
     addBonusPass = maybeAdd bonusPasses
 
-gradeSummaryWidget ::  SheetTypeSummary -> Widget
-gradeSummaryWidget sts =
+gradeSummaryWidget ::  (Int -> UniWorXMessage) -> SheetTypeSummary -> Widget
+gradeSummaryWidget title sts =
   let SheetTypeSummary{..} = addBonusToPoints sts
       sumSummaries = normalSummary <> bonusSummary <> informationalSummary & _numSheets %~ (<> numNotGraded)
       hasPassings  = positiveSum $ numGradePasses sumSummaries
diff --git a/templates/widgets/gradingSummary.hamlet b/templates/widgets/gradingSummary.hamlet
index 544651caf..e728bcfbd 100644
--- a/templates/widgets/gradingSummary.hamlet
+++ b/templates/widgets/gradingSummary.hamlet
@@ -1,7 +1,7 @@
 $# Displays gradings Summary for various purposes
 $# --
 <div>
-  <h3>_{MsgSheetGradingSummaryTitle $ getSum $ numSheets $ sumSummaries}
+  <h3>_{title $ getSum $ numSheets $ sumSummaries}
   <table .table .table--striped>
     <tr .table__row .table__row--head>
       <th>