Fixed issue #428

EPPlusSoftware · Jul 6, 2021 · 96ae436 · 96ae436
1 parent 85c1fb7
commit 96ae436
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/EPPlus/Style/XmlAccess/ExcelNumberFormatXml.cs b/src/EPPlus/Style/XmlAccess/ExcelNumberFormatXml.cs
@@ -509,18 +509,18 @@ private void ToNetFormat(string ExcelFormat, bool forColWidth)
                 //Add qoutes
                 if (DataType == eFormatType.DateTime) SetDecimal(lstDec, sb); //Remove?
 
-                // AM/PM format
-                if (containsAmPm)
-                {
-                    format += "tt";
-                }
-
 
                 if (format == "")
                     format = sb.ToString();
                 else
                     text = sb.ToString();
 
+                // AM/PM format
+                if (containsAmPm)
+                {
+                    format += "tt";
+                }
+
                 if (forColWidth)
                 {
                     NetFormatForWidth = format;

diff --git a/src/EPPlusTest/WorkSheetTests.cs b/src/EPPlusTest/WorkSheetTests.cs
@@ -1696,6 +1696,19 @@ public void Text()
                 Assert.AreEqual("2018", ws.Cells["A1"].Text);
             }
         }
+        [TestMethod]
+        public void ValudateDateTextWithAMPM()
+        {
+            using (var package = new ExcelPackage())
+            {
+                var ws = package.Workbook.Worksheets.Add("dateText");
+                ws.Cells["A1"].Value = new DateTime(2021, 7, 6, 9, 29, 0);
+                ws.Cells["A1"].Style.Numberformat.Format = "[$-0409]M/d/yyyy h:mm AM/PM";
+
+                Assert.AreEqual("7/6/2021 9:29 AM", ws.Cells["A1"].Text);
+            }
+        }
+
         [TestMethod]
         public void CopyWorkSheetWithInsertInSharedFormula()
         {