diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
| commit | 7fd1c08dd2f789ddd37ff075a6ebda1645947616 (patch) | |
| tree | 75b715e6dd70f6be3357e1710c4db6f1f6a1e29e /src/org/traccar/model | |
| parent | 4606737cc07b736f9c8f98ae680b928c94c082c8 (diff) | |
| parent | 0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff) | |
| download | trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.gz trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.bz2 trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/model')
| -rw-r--r-- | src/org/traccar/model/Server.java | 10 | ||||
| -rw-r--r-- | src/org/traccar/model/User.java | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java index 00b1f60d0..f03a0aa60 100644 --- a/src/org/traccar/model/Server.java +++ b/src/org/traccar/model/Server.java @@ -137,4 +137,14 @@ public class Server { this.zoom = zoom; } + private boolean twelveHourFormat; + + public boolean getTwelveHourFormat() { + return twelveHourFormat; + } + + public void setTwelveHourFormat(boolean twelveHourFormat) { + this.twelveHourFormat = twelveHourFormat; + } + } diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java index 1531ba9e4..e58311834 100644 --- a/src/org/traccar/model/User.java +++ b/src/org/traccar/model/User.java @@ -140,6 +140,16 @@ public class User { this.zoom = zoom; } + private boolean twelveHourFormat; + + public boolean getTwelveHourFormat() { + return twelveHourFormat; + } + + public void setTwelveHourFormat(boolean twelveHourFormat) { + this.twelveHourFormat = twelveHourFormat; + } + private String password; public String getPassword() { |