From 7a6de316942316466622f9bfa64691c4ba433b88 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 8 Aug 2016 18:05:07 +0500
Subject: - Added deviceId in SummaryReport

- Response bare array for application/json
- Migrate to /api/reports/route in web-interface
---
 src/org/traccar/reports/Events.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 9e14bd3db..fbbd3131b 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import java.util.Date;
 
 import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import javax.json.JsonArrayBuilder;
 
 import org.traccar.Context;
 import org.traccar.model.Event;
@@ -19,12 +19,13 @@ public final class Events {
 
     public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Collection<String> types, Date from, Date to) throws SQLException {
-        JsonObjectBuilder json = Json.createObjectBuilder();
+        JsonArrayBuilder json = Json.createArrayBuilder();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
             for (String type : types) {
-                json.add(String.valueOf(deviceId), JsonConverter.arrayToJson(Context.getDataManager()
-                        .getEvents(deviceId, type, from, to)));
+                for (Event event : Context.getDataManager().getEvents(deviceId, type, from, to)) {
+                    json.add(JsonConverter.objectToJson(event));
+                }
             }
         }
         return json.build().toString();
-- 
cgit v1.2.3