chore(datetime): add timeFormatUser
This commit is contained in:
parent
5e671f1f76
commit
ad44855910
@ -7,7 +7,7 @@ module Handler.Utils.DateTime
|
|||||||
, toMidnight, beforeMidnight, toMidday, toMorning
|
, toMidnight, beforeMidnight, toMidday, toMorning
|
||||||
, formatDiffDays, formatCalendarDiffDays
|
, formatDiffDays, formatCalendarDiffDays
|
||||||
, formatTime'
|
, formatTime'
|
||||||
, formatTime, formatTimeW, formatTimeMail
|
, formatTime, formatTimeUser, formatTimeW, formatTimeMail
|
||||||
, formatTimeRange, formatTimeRangeW, formatTimeRangeMail
|
, formatTimeRange, formatTimeRangeW, formatTimeRangeMail
|
||||||
, getTimeLocale, getDateTimeFormat
|
, getTimeLocale, getDateTimeFormat
|
||||||
, getDateTimeFormatter
|
, getDateTimeFormatter
|
||||||
@ -84,6 +84,9 @@ formatTime' fmtStr t = fmap fromString $ Time.formatTime <$> getTimeLocale <*> p
|
|||||||
formatTime :: (HasLocalTime t, MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> t -> m Text
|
formatTime :: (HasLocalTime t, MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> t -> m Text
|
||||||
formatTime proj t = flip formatTime' t . unDateTimeFormat =<< getDateTimeFormat proj
|
formatTime proj t = flip formatTime' t . unDateTimeFormat =<< getDateTimeFormat proj
|
||||||
|
|
||||||
|
formatTimeUser :: (HasLocalTime t, MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> t -> Maybe (Entity User) -> m Text
|
||||||
|
formatTimeUser proj t mUser = flip formatTime' t . unDateTimeFormat =<< getDateTimeFormatUser proj mUser
|
||||||
|
|
||||||
-- formatTimeH :: (HasLocalTime t) => SelDateTimeFormat -> t -> Handler Text
|
-- formatTimeH :: (HasLocalTime t) => SelDateTimeFormat -> t -> Handler Text
|
||||||
-- formatTimeH = formatTime
|
-- formatTimeH = formatTime
|
||||||
|
|
||||||
@ -97,12 +100,14 @@ getTimeLocale :: MonadHandler m => m TimeLocale
|
|||||||
getTimeLocale = getTimeLocale' <$> languages
|
getTimeLocale = getTimeLocale' <$> languages
|
||||||
|
|
||||||
getDateTimeFormat :: (MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> m DateTimeFormat
|
getDateTimeFormat :: (MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> m DateTimeFormat
|
||||||
getDateTimeFormat sel = do
|
getDateTimeFormat sel = liftHandler maybeAuth >>= getDateTimeFormatUser sel
|
||||||
mauth <- liftHandler maybeAuth
|
|
||||||
|
getDateTimeFormatUser :: (MonadHandler m, HandlerSite m ~ UniWorX, YesodAuthPersist UniWorX, AuthEntity UniWorX ~ User, AuthId UniWorX ~ UserId) => SelDateTimeFormat -> Maybe (Entity User) -> m DateTimeFormat
|
||||||
|
getDateTimeFormatUser sel mUser = do
|
||||||
UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
|
UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
|
||||||
let
|
let
|
||||||
fmt
|
fmt
|
||||||
| Just (Entity _ User{..}) <- mauth
|
| Just (Entity _ User{..}) <- mUser
|
||||||
= case sel of
|
= case sel of
|
||||||
SelFormatDateTime -> userDateTimeFormat
|
SelFormatDateTime -> userDateTimeFormat
|
||||||
SelFormatDate -> userDateFormat
|
SelFormatDate -> userDateFormat
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user