Fixes #222

messages/uniworx/de.msg

@@ -258,6 +258,7 @@ RatingDone: Bewertung fertiggestellt
 RatingPercent: Erreicht
 RatingFiles: Korrigierte Dateien
 PointsNotPositive: Punktzahl darf nicht negativ sein
+PointsTooHigh maxPoints@Points: Punktzahl darf nicht höher als #{tshow maxPoints} sein 
 RatingPointsDone: Abgabe zählt als korrigiert, gdw. Punktezahl gesetzt ist
 ColumnRatingPointsDone: Punktzahl/Abgeschlossen
 Pseudonyms: Pseudonyme

src/Foundation.hs

@@ -228,6 +228,15 @@ embedRenderMessage ''UniWorX ''CorrectorState id
 embedRenderMessage ''UniWorX ''SheetGrading ("SheetGrading" <>)
 embedRenderMessage ''UniWorX ''SheetType ("SheetType" <>)
 
+newtype SheetTypeComplete = SheetTypeComplete SheetType 
+instance RenderMessage UniWorX (SheetTypeComplete) where
+  renderMessage foundation ls (SheetTypeComplete st) = case st of
+      NotGraded -> mr NotGraded
+      other -> mr (grading other) <> ", " <> mr other
+    where 
+      mr :: RenderMessage UniWorX msg => msg -> Text
+      mr = renderMessage foundation ls
+
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
 embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
 

src/Handler/Corrections.hs

@@ -486,7 +486,9 @@ postCorrectionR tid ssh csh shn cid = do
       let ratingComment = fmap Text.strip submissionRatingComment >>= (\c -> c <$ guard (not $ null c))
           pointsForm = case sheetType of
             NotGraded  -> pure Nothing
-            _otherwise -> aopt pointsField (fslpI MsgRatingPoints "Punktezahl") (Just $ submissionRatingPoints)
+            _otherwise -> aopt  (pointsFieldMax $ preview (_grading . _maxPoints) sheetType) 
+                                (fslpI MsgRatingPoints "Punktezahl") 
+                                (Just $ submissionRatingPoints)
 
       ((corrResult, corrForm), corrEncoding) <- runFormPost . identForm FIDcorrection . renderAForm FormStandard $ (,,)
         <$> areq checkBoxField (fslI MsgRatingDone) (Just $ submissionRatingDone Submission{..})

src/Handler/Utils/Form.hs

@@ -193,6 +193,9 @@ pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..}
       sci <- maybe (Left $ MsgInvalidNumber t) Right (readMaybe $ unpack t :: Maybe Scientific)
       return . fromRational $ round (sci * 100) % 100
 
+pointsFieldMax :: (Monad m, HandlerSite m ~ UniWorX) => Maybe Points -> Field m Points --TODO allow fractions
+pointsFieldMax Nothing = pointsField
+pointsFieldMax (Just maxp) = checkBool (<= maxp) (MsgPointsTooHigh maxp) pointsField
 
 termsActiveField :: Field Handler TermId
 termsActiveField = selectField $ optionsPersistKey [TermActive ==. True] [Desc TermStart] termName

templates/sheetShow.hamlet

@@ -18,7 +18,7 @@ $maybe descr <- sheetDescription sheet
       <dt .deflist__dt>_{MsgSheetSolutionFrom}
       <dd .deflist__dd>#{solution}
     <dt .deflist__dt>_{MsgSheetType}
-    <dd .deflist__dd>_{sheetType sheet}
+    <dd .deflist__dd>_{SheetTypeComplete (sheetType sheet)}
     $if CorrectorSubmissions == sheetSubmissionMode sheet
       <dt .deflist__dt>_{MsgSheetPseudonym}
       <dd .deflist__dd #pseudonym>