From 8fb49dd602f4eb854b300b5b399206aa2fbca87b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 15 Jun 2021 13:01:04 +0200 Subject: [PATCH] fix(schools): switch authorship modes to required in form --- src/Handler/School.hs | 4 ++-- test/Database/Fill.hs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Handler/School.hs b/src/Handler/School.hs index be69e883a..2cdaf0c33 100644 --- a/src/Handler/School.hs +++ b/src/Handler/School.hs @@ -88,10 +88,10 @@ mkSchoolForm mSsh template = renderAForm FormStandard $ SchoolForm <*> (fromMaybe (ExamModeDNF predDNFFalse) <$> aopt pathPieceField (fslI MsgSchoolExamDiscouragedModes) (Just $ sfExamDiscouragedModes <$> template <|> pure (ExamModeDNF predDNFFalse))) <*> apopt (selectField optionsFinite) (fslI MsgExamCloseMode) (sfExamCloseMode <$> template <|> pure ExamCloseSeparate) <* aformSection MsgSchoolAuthorshipStatementSection - <*> apopt (selectField optionsFinite) (fslI MsgSchoolAuthorshipStatementSheetMode) (sfSheetAuthorshipStatementMode <$> template <|> pure SchoolAuthorshipStatementModeOptional) + <*> areq (selectField optionsFinite) (fslI MsgSchoolAuthorshipStatementSheetMode) (sfSheetAuthorshipStatementMode <$> template <|> pure SchoolAuthorshipStatementModeOptional) <*> aopt htmlField (fslI MsgSchoolAuthorshipStatementSheetDefinition & setTooltip MsgSchoolAuthorshipStatementSheetDefinitionTip) (sfSheetAuthorshipStatementDefinition <$> template) <*> apopt checkBoxField (fslI MsgSchoolAuthorshipStatementSheetAllowOther) (sfSheetAuthorshipStatementAllowOther <$> template <|> pure True) - <*> apopt (selectField optionsFinite) (fslI MsgSchoolAuthorshipStatementSheetExamMode) (sfSheetExamAuthorshipStatementMode <$> template <|> pure SchoolAuthorshipStatementModeOptional) + <*> areq (selectField optionsFinite) (fslI MsgSchoolAuthorshipStatementSheetExamMode) (sfSheetExamAuthorshipStatementMode <$> template <|> pure SchoolAuthorshipStatementModeOptional) <*> aopt htmlField (fslI MsgSchoolAuthorshipStatementSheetExamDefinition & setTooltip MsgSchoolAuthorshipStatementSheetExamDefinitionTip) (sfSheetExamAuthorshipStatementDefinition <$> template) <*> apopt checkBoxField (fslI MsgSchoolAuthorshipStatementSheetExamAllowOther) (sfSheetExamAuthorshipStatementAllowOther <$> template <|> pure True) where diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs index 68e33f41a..8ee7d4675 100644 --- a/test/Database/Fill.hs +++ b/test/Database/Fill.hs @@ -732,7 +732,6 @@ fillDb = do , examSynchronicity = Just $ ExamSynchronicityPreset ExamSynchronous , examRequiredEquipment = Just $ ExamRequiredEquipmentPreset ExamRequiredEquipmentNone } - -- , examAuthorshipStatement = Nothing , examStaff = Just "Hofmann" , examAuthorshipStatement = Nothing }