haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to UTC time parsing (from Chetan Taralekar)

Browse Source
This commit is contained in:
Michael Snoyman 2011-07-15 09:25:41 +03:00
parent 6556deffdd
commit 626f2d8132
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Yesod/Form/Jquery.hs
View File

@ -121,7 +121,7 @@ jqueryDayTimeUTCTime (UTCTime day utcTime) =
where where
showTimeOfDay (TimeOfDay hour minute _) = showTimeOfDay (TimeOfDay hour minute _) =
let (h, apm) = if hour < 12 then (hour, "AM") else (hour - 12, "PM") let (h, apm) = if hour < 12 then (hour, "AM") else (hour - 12, "PM")
in (show h) ++ ":" ++ (showLeadingZero minute) ++ " " ++ apm in (showLeadingZero h) ++ ":" ++ (showLeadingZero minute) ++ " " ++ apm
jqueryDayTimeField :: YesodJquery master => Field (GWidget sub master ()) FormMessage UTCTime jqueryDayTimeField :: YesodJquery master => Field (GWidget sub master ()) FormMessage UTCTime
jqueryDayTimeField = Field jqueryDayTimeField = Field
@ -135,7 +135,7 @@ jqueryDayTimeField = Field
addScript' urlJqueryUiDateTimePicker addScript' urlJqueryUiDateTimePicker
addStylesheet' urlJqueryUiCss addStylesheet' urlJqueryUiCss
addJulius [JULIUS| addJulius [JULIUS|
$(function(){$("##{theId}").datetimepicker({dateFormat : "yyyy/mm/dd h:MM TT"})}); $(function(){$("##{theId}").datetimepicker({dateFormat : "yyyy/mm/dd hh:MM TT"})});
|] |]
} }
where where
@ -143,7 +143,8 @@ $(function(){$("##{theId}").datetimepicker({dateFormat : "yyyy/mm/dd h:MM TT"})}
parseUTCTime :: String -> Either FormMessage UTCTime parseUTCTime :: String -> Either FormMessage UTCTime
parseUTCTime s = parseUTCTime s =
let (dateS, timeS) = break isSpace (dropWhile isSpace s) let (dateS, timeS') = break isSpace (dropWhile isSpace s)
timeS = drop 1 timeS'
dateE = parseDate dateS dateE = parseDate dateS
in case dateE of in case dateE of
Left l -> Left l Left l -> Left l