From 5d9f8837654897e84ce752e4122be50fdbb171f1 Mon Sep 17 00:00:00 2001 From: SJost Date: Wed, 8 Aug 2018 11:45:51 +0200 Subject: [PATCH 1/4] minor gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9abd44d27..8187c8e52 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ uniworx.nix src/Handler/Assist.bak src/Handler/Course.SnapCustom.hs *.orig +.directory From f66935659cce91f05ebeaffe77af64a96d696547 Mon Sep 17 00:00:00 2001 From: SJost Date: Tue, 14 Aug 2018 10:34:11 +0200 Subject: [PATCH 2/4] Minor --- src/Handler/Corrections.hs | 2 +- src/Handler/Course.hs | 6 +++--- templates/course.hamlet | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 670cb1c17..96ad16794 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -100,7 +100,7 @@ colSheet = sortable (Just "sheet") (i18nCell MsgSheet) colCorrector :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colCorrector = sortable (Just "corrector") (i18nCell MsgCorrector) $ \case - DBRow{ dbrOutput = (_, _, _, Nothing, _) } -> cell mempty + DBRow{ dbrOutput = (_, _, _, Nothing , _) } -> cell mempty DBRow{ dbrOutput = (_, _, _, Just corr, _) } -> textCell . display . userDisplayName $ entityVal corr colSubmissionLink :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 05ae4e04b..fcfde2613 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -433,15 +433,15 @@ newCourseForm template = identForm FIDcourse $ \html -> do (result, widget) <- flip (renderAForm FormStandard) html $ CourseForm -- <$> pure cid -- $ join $ cfCourseId <$> template -- why doesnt this work? <$> aopt hiddenField "courseId" (cfCourseId <$> template) - <*> areq (ciField textField) (fslI MsgCourseName) (cfName <$> template) + <*> areq (ciField textField) (fslI MsgCourseName) (cfName <$> template) <*> aopt htmlField (fslI MsgCourseDescription & setTooltip MsgCourseDescriptionTip) (cfDesc <$> template) - <*> aopt urlField (fslI MsgCourseHomepage) (cfLink <$> template) + <*> aopt urlField (fslI MsgCourseHomepage) (cfLink <$> template) <*> areq (ciField textField) (fslI MsgCourseShorthand -- & addAttr "disabled" "disabled" & setTooltip MsgCourseShorthandUnique) (cfShort <$> template) - <*> areq termActiveField (fslI MsgCourseSemester) (cfTerm <$> template) + <*> areq termActiveField (fslI MsgCourseSemester) (cfTerm <$> template) <*> areq schoolField (fslI MsgCourseSchool) (cfSchool <$> template) <*> aopt (natField "Kapazität") (fslI MsgCourseCapacity & setTooltip MsgCourseCapacityTip diff --git a/templates/course.hamlet b/templates/course.hamlet index 2f2a56a1e..f45717007 100644 --- a/templates/course.hamlet +++ b/templates/course.hamlet @@ -6,7 +6,7 @@
#{schoolName school} $maybe descr <- courseDescription course -
Beschreibung +
_{MsgCourseDescription}
#{descr} From 3515500685a32a9241ee0f0addb81402c1024ca1 Mon Sep 17 00:00:00 2001 From: SJost Date: Mon, 20 Aug 2018 09:44:49 +0200 Subject: [PATCH 3/4] minor comments --- src/Handler/Utils/Form.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index f405a6dd7..afb855d46 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -218,7 +218,8 @@ pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..} sci <- maybe (Left $ MsgInvalidNumber t) Right (readMaybe $ unpack t :: Maybe Scientific) return . fromRational $ round (sci * 100) % 100 ---termField: see Utils.Term +--termField: see Utils.Term +--schoolField: see Handler.Course zipFileField :: Bool -- ^ Unpack zips? -> Field Handler (Source Handler File) From a8328204f73113e7a6996b74955080550c07f31a Mon Sep 17 00:00:00 2001 From: SJost Date: Tue, 21 Aug 2018 09:02:36 +0200 Subject: [PATCH 4/4] tags added to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f6bcdce0..c37cbe326 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ src/Handler/Course.SnapCustom.hs *.orig .stack-work-* .directory +tags