Merge pull request #23 from safareli/year

fix YYYY formatting

Author: safareli

src/Data/Formatter/DateTime.purs

@@ -156,7 +156,7 @@ fix12 h = if h == 0 then 12 else h
 
 formatCommand ∷ DT.DateTime → FormatterCommand → String
 formatCommand dt@(DT.DateTime d t) = case _ of
-  YearFull → show $ fromEnum $ D.year d
+  YearFull → padQuadrupleDigit $ fromEnum $ D.year d
   YearTwoDigits → formatYearTwoDigits $ fromEnum $ D.year d
   YearAbsolute → show $ fromEnum $ D.year d
   MonthFull → show $ D.month d
@@ -178,6 +178,8 @@ formatCommand dt@(DT.DateTime d t) = case _ of
   MillisecondsTwoDigits → padSingleDigit $ (_ / 10) $ fromEnum $ T.millisecond t
   Placeholder s → s
 
+--TODO we need leftpad here
+
 padSingleDigit ∷ Int → String
 padSingleDigit i
   | i < 10    = "0" <> (show i)
@@ -189,6 +191,13 @@ padDoubleDigit i
   | i < 100 = "0" <> (show i)
   | otherwise = show i
 
+padQuadrupleDigit ∷ Int → String
+padQuadrupleDigit i
+  | i < 10   = "000" <> (show i)
+  | i < 100  = "00" <> (show i)
+  | i < 1000 = "0" <> (show i)
+  | otherwise = show i
+
 format ∷ Formatter → DT.DateTime → String
 format f d = foldMap (formatCommand d) f
 

test/src/DateTime.purs

@@ -17,6 +17,7 @@ datetimeTest = describe "Data.Formatter.DateTime" do
   forAll (\a → a.format <> " | " <> a.dateStr)
     "formatDateTime/unformaDateTime should formatt/unforma dateTime"
     [ { format: "MM/DD/YYYY", dateStr: "04/12/2017" , date: makeDateTime 2017 4 12 11 3 4 234}
+    , { format: "YYYY", dateStr: "0017" , date: makeDateTime 17 0 0 0 0 0 0}
     , { format: "MMMM", dateStr: "April" , date: makeDateTime 2017 4 12 11 3 4 234}
     , { 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}