5 files changed, 18 insertions, 18 deletions

diff --git a/database/changelog-3.6.xml b/database/changelog-3.6.xml
index f61755f36..378ec741f 100644
--- a/database/changelog-3.6.xml
+++ b/database/changelog-3.6.xml
@@ -14,7 +14,7 @@
       <column name="type" type="VARCHAR(128)">
         <constraints nullable="false" />
       </column>
-      <column name="eventtime" type="TIMESTAMP">
+      <column name="servertime" type="TIMESTAMP">
         <constraints nullable="false" />
       </column>
       <column name="deviceid" type="INT" />
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 22b71e204..a0233e601 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -177,12 +177,12 @@
     </entry>
 
     <entry key='database.insertEvent'>
-        INSERT INTO events (type, eventTime, deviceId, positionId, attributes)
-        VALUES (:type, :eventTime, :deviceId, :positionId, :attributes);
+        INSERT INTO events (type, serverTime, deviceId, positionId, attributes)
+        VALUES (:type, :serverTime, :deviceId, :positionId, :attributes);
     </entry>
 
     <entry key='database.selectEvents'>
-        SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;
+        SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND serverTime BETWEEN :from AND :to ORDER BY serverTime DESC;
     </entry>
 
     <!-- PROTOCOL CONFIG -->
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 649c3bb15..5748f3993 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -177,12 +177,12 @@
     </entry>

 

     <entry key='database.insertEvent'>

-        INSERT INTO events (type, eventTime, deviceId, positionId, attributes)

-        VALUES (:type, :eventTime, :deviceId, :positionId, :attributes);

+        INSERT INTO events (type, serverTime, deviceId, positionId, attributes)

+        VALUES (:type, :serverTime, :deviceId, :positionId, :attributes);

     </entry>

 

     <entry key='database.selectEvents'>

-        SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND eventTime BETWEEN :from AND :to ORDER BY eventTime DESC;

+        SELECT * FROM events WHERE deviceId = :deviceId AND type LIKE :type AND serverTime BETWEEN :from AND :to ORDER BY serverTime DESC;

     </entry>

 

     <!-- PROTOCOL CONFIG -->

diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index 4ea3e3b49..74a748ea5 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -35,5 +35,5 @@ public class EventResource extends BaseResource {
             @QueryParam("interval") int interval) throws SQLException {
         Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
         return Context.getDataManager().getLastEvents(deviceId, type, interval);
-        }
+    }
 }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 75049c433..6de885c70 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -8,13 +8,13 @@ public class Event extends Message {
         this.setType(type);
         this.setDeviceId(deviceId);
         this.setPositionId(positionId);
-        this.eventTime = new Date();
+        this.serverTime = new Date();
     }
 
     public Event(String type, long deviceId) {
         this.setType(type);
         this.setDeviceId(deviceId);
-        this.eventTime = new Date();
+        this.serverTime = new Date();
     }
 
     public Event() {
@@ -43,21 +43,21 @@ public class Event extends Message {
     public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
     public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
 
-    private Date eventTime;
+    private Date serverTime;
 
-    public Date getEventTime() {
-        if (eventTime != null) {
-            return new Date(eventTime.getTime());
+    public Date getServerTime() {
+        if (serverTime != null) {
+            return new Date(serverTime.getTime());
         } else {
             return null;
         }
     }
 
-    public void setEventTime(Date eventTime) {
-        if (eventTime != null) {
-            this.eventTime = new Date(eventTime.getTime());
+    public void setServerTime(Date serverTime) {
+        if (serverTime != null) {
+            this.serverTime = new Date(serverTime.getTime());
         } else {
-            this.eventTime = null;
+            this.serverTime = null;
         }
     }