From 3575e69123688d1057512e323845a0aa082770bf Mon Sep 17 00:00:00 2001 From: SJost Date: Fri, 5 Jan 2018 14:10:35 +0100 Subject: [PATCH] Bug with SheetInfo Form fixed --- src/Handler/Sheet.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index bbfcdbd4c..5297939da 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -15,7 +15,7 @@ import Handler.Utils -- import Data.Time import qualified Data.Text as T -- import Data.Function ((&)) --- import Yesod.Form.Bootstrap3 +import Yesod.Form.Bootstrap3 -- import Colonnade -- hiding (fromMaybe) import Yesod.Colonnade @@ -30,7 +30,7 @@ import qualified Data.UUID.Cryptographic as UUID -} data SheetForm = SheetForm - { sfCourseId :: CourseId + { sfCourseId :: Maybe CourseId , sfName :: Text , sfType :: SheetType , sfMarkingText :: Maybe Text @@ -43,11 +43,11 @@ data SheetForm = SheetForm , sfSolutionF :: Maybe FileInfo } -{- TODO: Problem wih fileAFormOpt -makeSheetForm :: CourseId -> Maybe SheetForm -> Form SheetForm + +makeSheetForm :: Maybe CourseId -> Maybe SheetForm -> Form SheetForm makeSheetForm cid template = identForm FIDsheet $ \html -> do (result, widget) <- flip (renderBootstrap3 bsHorizontalDefault) html $ SheetForm - <$> areq hiddenField "KursId" $ Just cid + <$> areq hiddenField "KursId" (Just cid) <*> areq textField (fsb "Name") (sfName <$> template) <*> sheetTypeAFormReq (fsb "Bewertung") (sfType <$> template) <*> aopt textField (fsb "Hinweise zur Bewertung") (sfMarkingText <$> template) @@ -75,7 +75,7 @@ makeSheetForm cid template = identForm FIDsheet $ \html -> do _ -> (result, widget) where validateSheet _ = [] - -} + fetchSheet :: TermIdentifier -> Text -> Text -> YesodDB UniWorX (Entity Sheet) fetchSheet tid csh shn = do