slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

showDateSpan: handle boundary-crossing 1-day spans

Browse Source 
Eg recognise that 2014/11/30-2014/12/1 can be abbreviated to
2014/11/30d, similarly 2014/12/31-2015/1/1. Doesn't handle feb 29th
correctly, so eg 2000/2/28-2000/3/1 is wrongly abbreviated to
2000/2/28d.
This commit is contained in:
Simon Michael 2014-12-03 18:12:02 -08:00
parent 1d388e1c6c
commit bd39e5df99
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hledger-lib/Hledger/Data/Dates.hs
View File

@ -90,6 +90,7 @@ instance Show DateSpan where
showDate :: Day -> String showDate :: Day -> String
showDate = formatTime defaultTimeLocale "%0C%y/%m/%d" showDate = formatTime defaultTimeLocale "%0C%y/%m/%d"
-- XXX review for more boundary crossing issues
-- | Render a datespan as a display string, abbreviating into a -- | Render a datespan as a display string, abbreviating into a
-- compact form if possible. -- compact form if possible.
showDateSpan ds@(DateSpan (Just from) (Just to)) = showDateSpan ds@(DateSpan (Just from) (Just to)) =
@ -117,8 +118,26 @@ showDateSpan ds@(DateSpan (Just from) (Just to)) =
-> formatTime defaultTimeLocale "%0C%y/%m/%dw%V" from -> formatTime defaultTimeLocale "%0C%y/%m/%dw%V" from
-- a day, YYYY/MM/DDd (d suffix is to distinguish from a regular date in register) -- a day, YYYY/MM/DDd (d suffix is to distinguish from a regular date in register)
((fy,fm,fd), (ty,tm,td)) | fy==ty && fm==tm && fd+1==td -> formatTime defaultTimeLocale "%0C%y/%m/%dd" from ((fy,fm,fd), (ty,tm,td)) | fy==ty && fm==tm && fd+1==td -> formatTime defaultTimeLocale "%0C%y/%m/%dd" from
-- crossing a year boundary
((fy,fm,fd), (ty,tm,td)) | fy+1==ty && fm==12 && tm==1 && fd==31 && td==1 -> formatTime defaultTimeLocale "%0C%y/%m/%dd" from
-- crossing a month boundary XXX wrongly shows LEAPYEAR/2/28-LEAPYEAR/3/1 as LEAPYEAR/2/28
((fy,fm,fd), (ty,tm,td)) | fy==ty && fm+1==tm && fd `elem` fromMaybe [] (lookup fm lastdayofmonth) && td==1 -> formatTime defaultTimeLocale "%0C%y/%m/%dd" from
-- otherwise, YYYY/MM/DD-YYYY/MM/DD -- otherwise, YYYY/MM/DD-YYYY/MM/DD
_ -> showDateSpan' ds _ -> showDateSpan' ds
where lastdayofmonth = [(1,[31])
,(2,[28,29])
,(3,[31])
,(4,[30])
,(5,[30])
,(6,[31])
,(7,[31])
,(8,[31])
,(9,[30])
,(10,[31])
,(11,[30])
,(12,[31])
]
showDateSpan ds = showDateSpan' ds showDateSpan ds = showDateSpan' ds
-- | Render a datespan as a display string. -- | Render a datespan as a display string.