dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed small issues when reading Excel files using ClosedXML

Browse Source
This commit is contained in:
Daniel Schick 2025-11-21 09:22:34 +01:00
parent e8b094b700
commit f2a9bc9e0f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ENI2/Excel/ExcelReader.cs
View File

@ -562,6 +562,11 @@ namespace ENI2.Excel
{ {
result = cellValue.GetDateTime(); result = cellValue.GetDateTime();
} }
else if (cellValue.IsTimeSpan)
{
TimeSpan timespan = cellValue.GetTimeSpan();
result = new DateTime(timespan.Ticks);
}
else if (cellValue.IsNumber) else if (cellValue.IsNumber)
{ {
double numValue = 0; double numValue = 0;
@ -774,7 +779,7 @@ namespace ENI2.Excel
string dateString = ReadCellAsText(sheetName, range); string dateString = ReadCellAsText(sheetName, range);
if (dateString != null) if (dateString != null)
{ {
string[] formats = { "yyyy/MM/dd HH:mm", "yyyy/MM/dd", "dd.MM.yyyy", "dd-MM-yyyy", "d/M/yyyy", "dd/M/yyyy", "d/MM/yyyy", "dd/MM/yyyy", "d/MMM/yyyy", "dd/MMM/yyyy", "yyyy-MM-dd", "yyyy-mm-d" }; string[] formats = { "yyyy/MM/dd HH:mm", "yyyy/MM/dd", "dd.MM.yyyy", "dd-MM-yyyy", "d/M/yyyy", "dd/M/yyyy", "d/MM/yyyy", "dd/MM/yyyy", "d/MMM/yyyy", "dd/MMM/yyyy", "yyyy-MM-dd", "yyyy-MM-d", "dd.MM.yyyy HH:mm:ss", "dd.MM.yyyy HH:mm" };
if (DateTime.TryParseExact(dateString, formats, NumberFormatInfo.InvariantInfo, DateTimeStyles.None, out DateTime tmpDate)) if (DateTime.TryParseExact(dateString, formats, NumberFormatInfo.InvariantInfo, DateTimeStyles.None, out DateTime tmpDate))
return tmpDate; return tmpDate;
CultureInfo en = CultureInfo.CreateSpecificCulture("en-US"); CultureInfo en = CultureInfo.CreateSpecificCulture("en-US");

2
ENI2/Excel/ExcelUtil.cs
View File

@ -1702,7 +1702,7 @@ namespace ENI2.Excel
string s = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", 54 + i)); string s = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", 54 + i));
// All invalid codes become "0000", Oct/25 // All invalid codes become "0000", Oct/25
l10fc.PortFacilityGISISCode = (s != null) && Regex.IsMatch(s.Trim(), @"^\d{4}$") ? s.Trim() : "0000"; l10fc.PortFacilityGISISCode = (s != null) && Regex.IsMatch(s.Trim(), @"^\d{1,4}$") ? s.Trim().PadLeft(4, '0') : "0000";
l10fc.PortFacilitySecurityMattersToReport = reader.ReadCellAsText(sheetTitle, string.Format("K{0}", 54 + i), 255); l10fc.PortFacilitySecurityMattersToReport = reader.ReadCellAsText(sheetTitle, string.Format("K{0}", 54 + i), 255);