From 2309d53f52f25efe00f2195a58c448506a2605ab Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 13 Mar 2017 17:52:28 +0500
Subject: - Add timezone field to User and Server model - Pass Velocity
 DateTool to templates - Adjusted templates to use timezone

---
 src/org/traccar/reports/ReportUtils.java | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/org/traccar/reports')

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 1402e10d4..968fb357b 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -24,6 +24,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.TimeZone;
 
 public final class ReportUtils {
 
@@ -46,6 +47,14 @@ public final class ReportUtils {
         return unit != null ? unit : "kn";
     }
 
+    public static TimeZone getTimezone(long userId) {
+        String timezone = Context.getPermissionsManager().getUser(userId).getTimezone();
+        if (timezone == null) {
+            timezone = Context.getPermissionsManager().getServer().getTimezone();
+        }
+        return timezone != null ? TimeZone.getTimeZone(timezone) : TimeZone.getDefault();
+    }
+
     public static Collection<Long> getDeviceList(Collection<Long> deviceIds, Collection<Long> groupIds) {
         Collection<Long> result = new ArrayList<>();
         result.addAll(deviceIds);
-- 
cgit v1.2.3