aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-02-17 12:59:39 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-02-17 12:59:39 +1300
commit29b57a52c6a66075261d7e6d4797fa1bcc7c8cb8 (patch)
tree98507be26e58b4708cde9d6711c0a4bbd3cdbaef /src
parent2a940c45a38cec42a6a85714f7941ee8613f48ee (diff)
downloadetbsa-traccar-web-29b57a52c6a66075261d7e6d4797fa1bcc7c8cb8.tar.gz
etbsa-traccar-web-29b57a52c6a66075261d7e6d4797fa1bcc7c8cb8.tar.bz2
etbsa-traccar-web-29b57a52c6a66075261d7e6d4797fa1bcc7c8cb8.zip
Archive default from value change
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/web/client/view/ArchiveView.java5
-rw-r--r--src/org/traccar/web/shared/model/ApplicationSettings.java6
-rw-r--r--src/org/traccar/web/shared/model/UserSettings.java6
3 files changed, 15 insertions, 2 deletions
diff --git a/src/org/traccar/web/client/view/ArchiveView.java b/src/org/traccar/web/client/view/ArchiveView.java
index d510cbe..04ece4a 100644
--- a/src/org/traccar/web/client/view/ArchiveView.java
+++ b/src/org/traccar/web/client/view/ArchiveView.java
@@ -128,8 +128,9 @@ public class ArchiveView implements SelectionChangedEvent.SelectionChangedHandle
// Initialize with current time
Date now = new Date();
- fromDate.setValue(now);
- fromTime.setValue(now);
+ Date from = new Date(now.getTime() - 60 * 60 * 1000);
+ fromDate.setValue(from);
+ fromTime.setValue(from);
toDate.setValue(now);
toTime.setValue(now);
}
diff --git a/src/org/traccar/web/shared/model/ApplicationSettings.java b/src/org/traccar/web/shared/model/ApplicationSettings.java
index ecbd183..6f5bfe5 100644
--- a/src/org/traccar/web/shared/model/ApplicationSettings.java
+++ b/src/org/traccar/web/shared/model/ApplicationSettings.java
@@ -3,6 +3,8 @@ package org.traccar.web.shared.model;
import java.io.Serializable;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@@ -11,6 +13,10 @@ public class ApplicationSettings implements Serializable {
private static final long serialVersionUID = 1;
+ @Id
+ @GeneratedValue
+ private long id;
+
public ApplicationSettings() {
registrationEnabled = true;
}
diff --git a/src/org/traccar/web/shared/model/UserSettings.java b/src/org/traccar/web/shared/model/UserSettings.java
index f7163a1..3f6deea 100644
--- a/src/org/traccar/web/shared/model/UserSettings.java
+++ b/src/org/traccar/web/shared/model/UserSettings.java
@@ -5,6 +5,8 @@ import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@@ -13,6 +15,10 @@ public class UserSettings implements Serializable {
private static final long serialVersionUID = 1;
+ @Id
+ @GeneratedValue
+ private long id;
+
public UserSettings() {
speedUnit = SpeedUnit.knots;
}