Merge pull request #2592 from Abyss777/excel_timezone

Fix excel export if timezone of client and server are different

1 files changed, 6 insertions, 1 deletions

diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java
index ad8534eb8..de36d4420 100644
--- a/src/org/traccar/helper/DateUtil.java
+++ b/src/org/traccar/helper/DateUtil.java
@@ -18,12 +18,13 @@ package org.traccar.helper;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 
 public final class DateUtil {
 
-    private static final DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.dateTime();
+    private static final DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.dateTimeParser();
 
     private DateUtil() {
     }
@@ -64,4 +65,8 @@ public final class DateUtil {
         return DATE_FORMAT.parseDateTime(value).toDate();
     }
 
+    public static DateTime parseDateTime(String value) {
+        return DATE_FORMAT.withOffsetParsed().parseDateTime(value);
+    }
+
 }