fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug with SheetInfo Form fixed

Browse Source
This commit is contained in:
SJost 2018-01-05 14:10:35 +01:00
parent 06a29205cd
commit 3575e69123
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Handler/Sheet.hs
View File

@ -15,7 +15,7 @@ import Handler.Utils
-- import Data.Time -- import Data.Time
import qualified Data.Text as T import qualified Data.Text as T
-- import Data.Function ((&)) -- import Data.Function ((&))
-- import Yesod.Form.Bootstrap3 import Yesod.Form.Bootstrap3
-- --
import Colonnade -- hiding (fromMaybe) import Colonnade -- hiding (fromMaybe)
import Yesod.Colonnade import Yesod.Colonnade
@ -30,7 +30,7 @@ import qualified Data.UUID.Cryptographic as UUID
-} -}
data SheetForm = SheetForm data SheetForm = SheetForm
{ sfCourseId :: CourseId { sfCourseId :: Maybe CourseId
, sfName :: Text , sfName :: Text
, sfType :: SheetType , sfType :: SheetType
, sfMarkingText :: Maybe Text , sfMarkingText :: Maybe Text
@ -43,11 +43,11 @@ data SheetForm = SheetForm
, sfSolutionF :: Maybe FileInfo , 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 makeSheetForm cid template = identForm FIDsheet $ \html -> do
(result, widget) <- flip (renderBootstrap3 bsHorizontalDefault) html $ SheetForm (result, widget) <- flip (renderBootstrap3 bsHorizontalDefault) html $ SheetForm
<$> areq hiddenField "KursId" $ Just cid <$> areq hiddenField "KursId" (Just cid)
<*> areq textField (fsb "Name") (sfName <$> template) <*> areq textField (fsb "Name") (sfName <$> template)
<*> sheetTypeAFormReq (fsb "Bewertung") (sfType <$> template) <*> sheetTypeAFormReq (fsb "Bewertung") (sfType <$> template)
<*> aopt textField (fsb "Hinweise zur Bewertung") (sfMarkingText <$> template) <*> aopt textField (fsb "Hinweise zur Bewertung") (sfMarkingText <$> template)
@ -75,7 +75,7 @@ makeSheetForm cid template = identForm FIDsheet $ \html -> do
_ -> (result, widget) _ -> (result, widget)
where where
validateSheet _ = [] validateSheet _ = []
-}
fetchSheet :: TermIdentifier -> Text -> Text -> YesodDB UniWorX (Entity Sheet) fetchSheet :: TermIdentifier -> Text -> Text -> YesodDB UniWorX (Entity Sheet)
fetchSheet tid csh shn = do fetchSheet tid csh shn = do