aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/Trips.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-24 10:45:44 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-24 10:45:44 +0500
commit0bbf8f554638cdc89d5dd618c500839554602dee (patch)
tree86616330311bc5c46bab0733af70238f624196f6 /src/org/traccar/reports/Trips.java
parentb14169a2b7bfcaecaa0f5ea9baafad4e7e4f1ae2 (diff)
downloadtrackermap-server-0bbf8f554638cdc89d5dd618c500839554602dee.tar.gz
trackermap-server-0bbf8f554638cdc89d5dd618c500839554602dee.tar.bz2
trackermap-server-0bbf8f554638cdc89d5dd618c500839554602dee.zip
- Use one parser
- Reverted passing variables way
Diffstat (limited to 'src/org/traccar/reports/Trips.java')
-rw-r--r--src/org/traccar/reports/Trips.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index c31eaac83..1c2ba3fe3 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -35,7 +35,6 @@ 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.Group;
import org.traccar.model.Position;
@@ -177,11 +176,9 @@ public final class Trips {
public static void getExcel(OutputStream outputStream,
long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
- String fromString, String toString) throws SQLException, IOException {
+ DateTime from, DateTime to) throws SQLException, IOException {
ArrayList<DeviceReport> devicesTrips = new ArrayList<>();
ArrayList<String> sheetNames = new ArrayList<>();
- DateTime from = DateUtil.parseDateTime(fromString);
- DateTime to = DateUtil.parseDateTime(toString);
for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
Context.getPermissionsManager().checkDevice(userId, deviceId);
Collection<TripReport> trips = detectTrips(deviceId, from.toDate(), to.toDate());