aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/Trips.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-10-20 09:55:49 +0500
committerAbyss777 <abyss@fox5.ru>2016-10-20 09:55:49 +0500
commit40d7ff2f9505150c85e87332fac9f67725beba8e (patch)
tree34c14e3ff4a7b9d94d68cd46d3a50b4bfefa7fdd /src/org/traccar/reports/Trips.java
parent45302036168fe3adf1d9d184cd68e92e15dd3b1f (diff)
downloadtrackermap-server-40d7ff2f9505150c85e87332fac9f67725beba8e.tar.gz
trackermap-server-40d7ff2f9505150c85e87332fac9f67725beba8e.tar.bz2
trackermap-server-40d7ff2f9505150c85e87332fac9f67725beba8e.zip
- Fix export empty reports
- Cleanup templates metadata
Diffstat (limited to 'src/org/traccar/reports/Trips.java')
-rw-r--r--src/org/traccar/reports/Trips.java22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 27863d877..705644849 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -187,20 +187,18 @@ public final class Trips {
for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
Context.getPermissionsManager().checkDevice(userId, deviceId);
Collection<TripReport> trips = detectTrips(deviceId, from, to);
- if (!trips.isEmpty()) {
- DeviceReport deviceTrips = new DeviceReport();
- Device device = Context.getIdentityManager().getDeviceById(deviceId);
- deviceTrips.setDeviceName(device.getName());
- sheetNames.add(deviceTrips.getDeviceName());
- if (device.getGroupId() != 0) {
- Group group = Context.getDeviceManager().getGroupById(device.getGroupId());
- if (group != null) {
- deviceTrips.setGroupName(group.getName());
- }
+ DeviceReport deviceTrips = new DeviceReport();
+ Device device = Context.getIdentityManager().getDeviceById(deviceId);
+ deviceTrips.setDeviceName(device.getName());
+ sheetNames.add(deviceTrips.getDeviceName());
+ if (device.getGroupId() != 0) {
+ Group group = Context.getDeviceManager().getGroupById(device.getGroupId());
+ if (group != null) {
+ deviceTrips.setGroupName(group.getName());
}
- deviceTrips.setObjects(detectTrips(deviceId, from, to));
- devicesTrips.add(deviceTrips);
}
+ deviceTrips.setObjects(trips);
+ devicesTrips.add(deviceTrips);
}
String templatePath = Context.getConfig().getString("report.templatesPath",
"templates/export/");