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

Minor adjustments to Fieldsettings

Browse Source
This commit is contained in:
SJost 2018-06-21 17:08:28 +02:00
parent 1c9b121edb
commit 20c50b1a45
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Submission.hs
View File

@ -61,7 +61,7 @@ makeSubmissionForm :: Maybe SubmissionId -> Bool -> SheetGroup -> [Text] -> Form
makeSubmissionForm msmid unpackZips grouping buddies = identForm FIDsubmission $ \html -> do makeSubmissionForm msmid unpackZips grouping buddies = identForm FIDsubmission $ \html -> do
flip (renderAForm FormStandard) html $ (,) flip (renderAForm FormStandard) html $ (,)
<$> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing <$> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing
<*> (catMaybes <$> sequenceA [bool aforced' aopt editableBuddies textField (fsm $ MsgSubmissionMember g) buddy <*> (catMaybes <$> sequenceA [bool aforced' aopt editableBuddies textField (fslpI (MsgSubmissionMember g) "user@campus.lmu.de" ) buddy
| g <- [1..(max groupNr $ length buddies)] -- groupNr might have decreased meanwhile | g <- [1..(max groupNr $ length buddies)] -- groupNr might have decreased meanwhile
| buddy <- map (Just . Just) buddies ++ repeat Nothing -- show current buddies | buddy <- map (Just . Just) buddies ++ repeat Nothing -- show current buddies
]) ])

12
src/Handler/Utils/Form.hs
View File

@ -385,8 +385,8 @@ fsb :: Text -> FieldSettings site -- DEPRECATED
fsb = bfs -- Just to avoid annoying Ambiguous Type Errors fsb = bfs -- Just to avoid annoying Ambiguous Type Errors
fsl :: Text -> FieldSettings UniWorX fsl :: Text -> FieldSettings UniWorX
fsl label = fsl lbl =
FieldSettings { fsLabel = (SomeMessage label) FieldSettings { fsLabel = (SomeMessage lbl)
, fsTooltip = Nothing , fsTooltip = Nothing
, fsId = Nothing , fsId = Nothing
, fsName = Nothing , fsName = Nothing
@ -394,8 +394,8 @@ fsl label =
} }
fslp :: Text -> Text -> FieldSettings UniWorX fslp :: Text -> Text -> FieldSettings UniWorX
fslp label placeholder = fslp lbl placeholder =
FieldSettings { fsLabel = (SomeMessage label) FieldSettings { fsLabel = (SomeMessage lbl)
, fsTooltip = Nothing , fsTooltip = Nothing
, fsId = Nothing , fsId = Nothing
, fsName = Nothing , fsName = Nothing
@ -403,8 +403,8 @@ fslp label placeholder =
} }
fslpI :: RenderMessage UniWorX msg => msg -> Text -> FieldSettings UniWorX fslpI :: RenderMessage UniWorX msg => msg -> Text -> FieldSettings UniWorX
fslpI label placeholder = fslpI lbl placeholder =
FieldSettings { fsLabel = (SomeMessage label) FieldSettings { fsLabel = (SomeMessage lbl)
, fsTooltip = Nothing , fsTooltip = Nothing
, fsId = Nothing , fsId = Nothing
, fsName = Nothing , fsName = Nothing