diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-24 18:50:29 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 18:50:29 +1300 |
| commit | 3e1a25b54ab342bedc8d688bb6ccb3c2d6c60d0c (patch) | |
| tree | fc2122a934e80ba7d7e5670dd1540e72a7dfc8ae /src/org/traccar/helper | |
| parent | ebe64e810bd8e57a805a571cfd6110fbc3cd57c1 (diff) | |
| parent | 0bbf8f554638cdc89d5dd618c500839554602dee (diff) | |
| download | traccar-server-3e1a25b54ab342bedc8d688bb6ccb3c2d6c60d0c.tar.gz traccar-server-3e1a25b54ab342bedc8d688bb6ccb3c2d6c60d0c.tar.bz2 traccar-server-3e1a25b54ab342bedc8d688bb6ccb3c2d6c60d0c.zip | |
Merge pull request #2592 from Abyss777/excel_timezone
Fix excel export if timezone of client and server are different
Diffstat (limited to 'src/org/traccar/helper')
| -rw-r--r-- | src/org/traccar/helper/DateUtil.java | 7 |
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); + } + } |