Skip to content

Add weekday name format for DateTimes #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2017
Merged

Add weekday name format for DateTimes #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0939947
add weekday name format for DateTimes
tippenein Aug 17, 2017
008df60
add short- and long-options
tippenein Aug 17, 2017
bc790a7
make consistent with momentjs formatting
tippenein Sep 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/Data/Formatter/DateTime.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ data FormatterCommand
| DayOfMonth
| UnixTimestamp
| DayOfWeek
| DayOfWeekName
| DayOfWeekNameShort
| Hours24
| Hours12
| Meridiem
Expand Down Expand Up @@ -89,6 +91,8 @@ printFormatterCommand = case _ of
DayOfMonth → "D"
UnixTimestamp → "X"
DayOfWeek → "E"
DayOfWeekName → "dddd"
DayOfWeekNameShort → "ddd"
Hours24 → "HH"
Hours12 → "hh"
Meridiem → "a"
Expand Down Expand Up @@ -125,6 +129,8 @@ formatterCommandParser = (PC.try <<< PS.string) `oneOfAs`
, Tuple "DD" DayOfMonthTwoDigits
, Tuple "D" DayOfMonth
, Tuple "E" DayOfWeek
, Tuple "dddd" DayOfWeekName
, Tuple "ddd" DayOfWeekNameShort
, Tuple "HH" Hours24
, Tuple "hh" Hours12
, Tuple "a" Meridiem
Expand Down Expand Up @@ -167,6 +173,8 @@ formatCommand dt@(DT.DateTime d t) = case _ of
DayOfMonth → show $ fromEnum $ D.day d
UnixTimestamp → show $ Int.floor $ (_ / 1000.0) $ unwrap $ unInstant $ fromDateTime dt
DayOfWeek → show $ fromEnum $ D.weekday d
DayOfWeekName → show $ D.weekday d
DayOfWeekNameShort → Str.take 3 $ show $ D.weekday d
Hours24 → padSingleDigit (fromEnum $ T.hour t)
Hours12 → padSingleDigit $ fix12 $ (fromEnum $ T.hour t) `mod` 12
Meridiem → if (fromEnum $ T.hour t) >= 12 then "PM" else "AM"
Expand Down Expand Up @@ -356,6 +364,10 @@ unformatCommandParser = case _ of
}
-- TODO we would need to use this value if we support date format using week number
DayOfWeek → void $ parseInt 1 (validateRange 1 7) "Incorrect day of week"
DayOfWeekName → _{day = _} `modifyWithParser`
(fromEnum <$> parseDayOfWeekName)
DayOfWeekNameShort → _{day = _} `modifyWithParser`
(fromEnum <$> parseDayOfWeekNameShort)
Hours24 → _{hour = _} `modifyWithParser`
(parseInt 2 (validateRange 0 24 <> exactLength) "Incorrect 24 hour")
Hours12 → _{hour = _} `modifyWithParser`
Expand Down Expand Up @@ -405,6 +417,29 @@ parseMeridiem = (PC.try <<< PS.string) `oneOfAs`
, Tuple "PM" PM
]


parseDayOfWeekName ∷ ∀ m. Monad m ⇒ P.ParserT String m D.Weekday
parseDayOfWeekName = (PC.try <<< PS.string) `oneOfAs`
[ Tuple "Monday" D.Monday
, Tuple "Tuesday" D.Tuesday
, Tuple "Wednesday" D.Wednesday
, Tuple "Thursday" D.Thursday
, Tuple "Friday" D.Friday
, Tuple "Saturday" D.Saturday
, Tuple "Sunday" D.Sunday
]

parseDayOfWeekNameShort ∷ ∀ m. Monad m ⇒ P.ParserT String m D.Weekday
parseDayOfWeekNameShort = (PC.try <<< PS.string) `oneOfAs`
[ Tuple "Mon" D.Monday
, Tuple "Tue" D.Tuesday
, Tuple "Wed" D.Wednesday
, Tuple "Thu" D.Thursday
, Tuple "Fri" D.Friday
, Tuple "Sat" D.Saturday
, Tuple "Sun" D.Sunday
]

parseMonth ∷ ∀ m. Monad m ⇒ P.ParserT String m D.Month
parseMonth = (PC.try <<< PS.string) `oneOfAs`
[ Tuple "January" D.January
Expand Down
2 changes: 2 additions & 0 deletions test/src/DateTime.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ datetimeTest = describe "Data.Formatter.DateTime" do
, { format: "YYYY-DD-MM", dateStr: "2017-12-04" , date: makeDateTime 2017 4 12 11 3 4 234}
, { format: "YYYY-MMM", dateStr: "2017-Apr" , date: makeDateTime 2017 4 12 11 3 4 234}
, { format: "MMM D", dateStr: "Apr 1" , date: makeDateTime 2017 4 1 0 0 0 0}
, { format: "dddd, MMM D", dateStr: "Saturday, Apr 1" , date: makeDateTime 2017 4 1 0 0 0 0}
, { format: "ddd, MMM D", dateStr: "Sat, Apr 1" , date: makeDateTime 2017 4 1 0 0 0 0}
, { format: "hh:mm:ss:SSS a", dateStr: "11:03:04:234 AM" , date: makeDateTime 2017 4 12 11 3 4 234}
, { format: "YY", dateStr: "17" , date: makeDateTime 2017 4 12 11 3 4 234}
, { format: "YY", dateStr: "17" , date: makeDateTime 20017 4 12 0 0 0 0} -- Format 20017 with YY
Expand Down