From 0a17447db65e188e8f21000a1e162eb0d73ef1eb Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 3 Jan 2016 13:32:08 +1300 Subject: Fix another problem with date format --- src/org/traccar/api/ObjectMapperProvider.java | 2 +- web/app/model/Device.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/api/ObjectMapperProvider.java b/src/org/traccar/api/ObjectMapperProvider.java index b68f9a458..5a9cbb9d9 100644 --- a/src/org/traccar/api/ObjectMapperProvider.java +++ b/src/org/traccar/api/ObjectMapperProvider.java @@ -29,7 +29,7 @@ public class ObjectMapperProvider implements ContextResolver { private ObjectMapper mapper = new ObjectMapper(); public ObjectMapperProvider() { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); mapper.setConfig(mapper.getSerializationConfig().with(dateFormat)); diff --git a/web/app/model/Device.js b/web/app/model/Device.js index 983e3e62e..3cd9ee560 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -32,6 +32,7 @@ Ext.define('Traccar.model.Device', { type: 'string' }, { name: 'lastUpdate', - type: 'date' + type: 'date', + dateWriteFormat: 'C' }] }); -- cgit v1.2.3