From b14169a2b7bfcaecaa0f5ea9baafad4e7e4f1ae2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 23 Nov 2016 11:41:11 +0500
Subject: - Pass client timezone to excel template - Templates: adjust
 timezone, use "https" in links

---
 src/org/traccar/reports/Events.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/reports/Events.java')

diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 9d82b97a5..ada1580d9 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import org.joda.time.DateTime;
 import org.jxls.area.Area;
 import org.jxls.builder.xls.XlsCommentAreaBuilder;
 import org.jxls.common.CellRef;
@@ -36,6 +37,7 @@ import org.jxls.transform.Transformer;
 import org.jxls.transform.poi.PoiTransformer;
 import org.jxls.util.TransformerFactory;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Geofence;
@@ -68,13 +70,15 @@ public final class Events {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Collection<String> types, Date from, Date to) throws SQLException, IOException {
+            Collection<String> types, String fromString, String toString) throws SQLException, IOException {
         ArrayList<DeviceReport> devicesEvents = new ArrayList<>();
         ArrayList<String> sheetNames = new ArrayList<>();
+        DateTime from = DateUtil.parseDateTime(fromString);
+        DateTime to = DateUtil.parseDateTime(toString);
         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, to);
+            Collection<Event> events = Context.getDataManager().getEvents(deviceId, from.toDate(), to.toDate());
             boolean all = types.isEmpty() || types.contains(Event.ALL_EVENTS);
             for (Iterator<Event> iterator = events.iterator(); iterator.hasNext();) {
                 Event event = iterator.next();
@@ -118,6 +122,7 @@ 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("bracketsRegex", "[\\{\\}\"]");
             Transformer transformer = TransformerFactory.createTransformer(inputStream, outputStream);
             List<Area> xlsAreas = new XlsCommentAreaBuilder(transformer).build();
-- 
cgit v1.2.3