import.csv added time import if available

Closes #4554
portfolio-performance · Feb 27, 2025 · 45c46e7 · 45c46e7
1 parent d3d7cd3
commit 45c46e7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/csv/CSVExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/csv/CSVExtractor.java
@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.DateTimeException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -118,11 +119,19 @@ protected final LocalDateTime getDate(String dateColumn, String timeColumn, Stri
         String dateValue = getText(dateColumn, rawValues, field2column);
         if (dateValue == null)
             return null;
+        boolean isTimeInData = dateValue.contains("T"); //$NON-NLS-1$
 
         LocalDateTime result;
         try
         {
-            Date date = (Date) field2column.get(dateColumn).getFormat().getFormat().parseObject(dateValue);
+            String simpleDateFormatText = field2column.get(dateColumn).getFormat().toPattern();
+            boolean isTimeInFormat = simpleDateFormatText.contains("\'T\'"); //$NON-NLS-1$
+            if (isTimeInData && !isTimeInFormat)
+            {
+                simpleDateFormatText += "\'T\'HH:mm"; //$NON-NLS-1$
+            }
+            SimpleDateFormat formatter = new SimpleDateFormat(simpleDateFormatText);
+            Date date = (Date) formatter.parseObject(dateValue);
             result = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
         }
         catch (ParseException e)