Fix DateTime format 🐛

fslaborg · Oct 16, 2023 · 5f6c8da · 5f6c8da
1 parent 1a71e96
commit 5f6c8da
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/src/FsSpreadsheet.ExcelIO/FsExtensions.fs b/src/FsSpreadsheet.ExcelIO/FsExtensions.fs
@@ -208,8 +208,10 @@ module FsExtensions =
                                         // get cellformat from stylesheet
                                         let cellFormat : CellFormat = xlsxWorkbookPart.WorkbookStylesPart.Stylesheet.CellFormats.ChildElements.GetItem (int c.StyleIndex.InnerText) :?> CellFormat
                                         if cellFormat <> null then
-                                            // if numberformatid is between 14 and 18 it is date time.
-                                            if cellFormat.NumberFormatId >= UInt32Value(uint32 14) && cellFormat.NumberFormatId <= UInt32Value(uint32 18) then 
+                                            // if numberformatid is between 14 and 18 it is standard date time format.
+                                            // custom formats are given in the range of 164 to 180, all none default date time formats fall in there.
+                                            let dateTimeFormats = [14..22]@[164 .. 180] |> List.map (uint32 >> UInt32Value)
+                                            if List.contains cellFormat.NumberFormatId dateTimeFormats then 
                                                 c.DataType <- CellValues.Date
                                     with
                                         | _ -> ()

diff --git a/tests/TestUtils/TestFiles/TestWorkbook_ClosedXML.xlsx b/tests/TestUtils/TestFiles/TestWorkbook_ClosedXML.xlsx
diff --git a/tests/TestUtils/TestFiles/TestWorkbook_Excel.xlsx b/tests/TestUtils/TestFiles/TestWorkbook_Excel.xlsx
diff --git a/tests/TestUtils/TestFiles/TestWorkbook_FableExceljs.xlsx b/tests/TestUtils/TestFiles/TestWorkbook_FableExceljs.xlsx
diff --git a/tests/TestUtils/TestFiles/TestWorkbook_FsSpreadsheet.xlsx b/tests/TestUtils/TestFiles/TestWorkbook_FsSpreadsheet.xlsx