Use timezone from preferences for excel reports

1 files changed, 8 insertions, 4 deletions

diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index d2255684f..e5acd28f9 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -27,9 +27,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.poi.ss.util.WorkbookUtil;
-import org.joda.time.DateTime;
+import org.apache.velocity.tools.generic.DateTool;
 import org.jxls.area.Area;
 import org.jxls.builder.xls.XlsCommentAreaBuilder;
 import org.jxls.common.CellRef;
@@ -70,13 +71,13 @@ public final class Events {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Collection<String> types, DateTime from, DateTime to) throws SQLException, IOException {
+            Collection<String> types, Date from, Date to) throws SQLException, IOException {
         ArrayList<DeviceReport> devicesEvents = new ArrayList<>();
         ArrayList<String> sheetNames = new ArrayList<>();
         HashMap<Long, String> geofenceNames = new HashMap<>();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            Collection<Event> events = Context.getDataManager().getEvents(deviceId, from.toDate(), to.toDate());
+            Collection<Event> events = Context.getDataManager().getEvents(deviceId, from, to);
             boolean all = types.isEmpty() || types.contains(Event.ALL_EVENTS);
             for (Iterator<Event> iterator = events.iterator(); iterator.hasNext();) {
                 Event event = iterator.next();
@@ -120,7 +121,10 @@ public final class Events {
             jxlsContext.putVar("to", to);
             jxlsContext.putVar("distanceUnit", ReportUtils.getDistanceUnit(userId));
             jxlsContext.putVar("speedUnit", ReportUtils.getSpeedUnit(userId));
-            jxlsContext.putVar("timezone", from.getZone());
+            jxlsContext.putVar("webUrl", Context.getVelocityEngine().getProperty("web.url"));
+            jxlsContext.putVar("dateTool", new DateTool());
+            jxlsContext.putVar("timezone", ReportUtils.getTimezone(userId));
+            jxlsContext.putVar("locale", Locale.getDefault());
             jxlsContext.putVar("bracketsRegex", "[\\{\\}\"]");
             Transformer transformer = TransformerFactory.createTransformer(inputStream, outputStream);
             List<Area> xlsAreas = new XlsCommentAreaBuilder(transformer).build();