diff --git a/src/Handler/Exam/Form.hs b/src/Handler/Exam/Form.hs index 5948bf744..1020c6f28 100644 --- a/src/Handler/Exam/Form.hs +++ b/src/Handler/Exam/Form.hs @@ -344,9 +344,9 @@ validateExam = do guardValidation MsgExamClosedMustBeAfterEnd . fromMaybe True $ (>=) <$> efClosed <*> efEnd forM_ efOccurrences $ \ExamOccurrenceForm{..} -> do - guardValidation (MsgExamOccurrenceEndMustBeAfterStart eofName) $ NTop eofEnd >= NTop (Just eofStart) + guardValidation (MsgExamOccurrenceEndMustBeAfterStart eofName) $ NTop eofEnd >= NTop (Just eofStart) guardValidation (MsgExamOccurrenceStartMustBeAfterExamStart eofName) $ NTop (Just eofStart) >= NTop efStart - warnValidation (MsgExamOccurrenceEndMustBeBeforeExamEnd eofName) $ NTop eofEnd <= NTop efEnd + warn_Validation (MsgExamOccurrenceEndMustBeBeforeExamEnd eofName) $ NTop eofEnd <= NTop efEnd forM_ [ (a, b) | a <- Set.toAscList efOccurrences, b <- Set.toAscList efOccurrences, b > a ] $ \(a, b) -> do eofRange' <- formatTimeRange SelFormatDateTime (eofStart a) (eofEnd a) diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs index b789bccba..c54ed44b3 100644 --- a/src/Utils/Form.hs +++ b/src/Utils/Form.hs @@ -944,14 +944,15 @@ guardValidationM :: ( MonadHandler m => msg -> m Bool -> FormValidator r m () guardValidationM = (. lift) . (=<<) . guardValidation - -warnValidation :: ( MonadHandler m +-- | like `guardValidation`, but issues a warning instead +warn_Validation :: ( MonadHandler m , RenderMessage (HandlerSite m) msg ) => msg -- ^ Message describing violation -> Bool -- ^ @False@ iff constraint is violated -> FormValidator r m () -warnValidation msg isValid = unless isValid $ addMessageI Warning msg +warn_Validation msg isValid = unless isValid $ addMessageI Warning msg + ----------------------- -- Form Manipulation --