- Moved retrieving Accept to BaseResource

- Added Events report
- Removed deviceIds from csv

2 files changed, 41 insertions, 3 deletions

diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 1edeb0773..d3457e5a5 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -1,5 +1,45 @@
 package org.traccar.reports;
 
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Date;
+
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
+
+import org.traccar.Context;
+import org.traccar.model.Event;
+import org.traccar.web.CsvBuilder;
+import org.traccar.web.JsonConverter;
+
 public final class Events {
 
+    private 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();
+        for (long deviceId: ReportUtils.getReportedDevices(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)));
+            }
+        }
+        return json.build().toString();
+    }
+
+    public static byte[] getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
+            Collection<String> types, Date from, Date to) throws SQLException {
+        CsvBuilder csv = new CsvBuilder();
+        csv.addHeaderLine(new Event());
+        for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+            Context.getPermissionsManager().checkDevice(userId, deviceId);
+            for (String type : types) {
+                csv.addArray(Context.getDataManager().getEvents(deviceId, type, from, to));
+            }
+        }
+        return csv.get();
+    }
 }
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index 3602c4758..035526970 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -31,13 +31,11 @@ public final class Route {
     public static byte[] getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Date from, Date to) throws SQLException {
         CsvBuilder csv = new CsvBuilder();
+        csv.addHeaderLine(new Position());
         for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            csv.addLine(deviceId);
-            csv.addHeaderLine(new Position());
             csv.addArray(Context.getDataManager().getPositions(deviceId, from, to));
         }
         return csv.get();
     }
-
 }