Merge pull request #3247 from Abyss777/report_stops

Imlement Stops report

5 files changed, 205 insertions, 24 deletions

diff --git a/src/org/traccar/reports/model/BaseReport.java b/src/org/traccar/reports/model/BaseReport.java
index 13c67cbb7..e1dec1407 100644
--- a/src/org/traccar/reports/model/BaseReport.java
+++ b/src/org/traccar/reports/model/BaseReport.java
@@ -74,4 +74,14 @@ public class BaseReport {
         }
     }
 
+    private String spentFuel;
+
+    public String getSpentFuel() {
+        return spentFuel;
+    }
+
+    public void setSpentFuel(String spentFuel) {
+        this.spentFuel = spentFuel;
+    }
+
 }
diff --git a/src/org/traccar/reports/model/StopReport.java b/src/org/traccar/reports/model/StopReport.java
new file mode 100644
index 000000000..6b2e86299
--- /dev/null
+++ b/src/org/traccar/reports/model/StopReport.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.reports.model;
+
+import java.util.Date;
+
+public class StopReport extends BaseReport  {
+
+    private long positionId;
+
+    public long getPositionId() {
+        return positionId;
+    }
+
+    public void setPositionId(long positionId) {
+        this.positionId = positionId;
+    }
+
+    private double latitude;
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    private double longitude;
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+
+    private Date startTime;
+
+    public Date getStartTime() {
+        if (startTime != null) {
+            return new Date(startTime.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    public void setStartTime(Date startTime) {
+        if (startTime != null) {
+            this.startTime = new Date(startTime.getTime());
+        } else {
+            this.startTime = null;
+        }
+    }
+
+    private Date endTime;
+
+    public Date getEndTime() {
+        if (endTime != null) {
+            return new Date(endTime.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    public void setEndTime(Date endTime) {
+        if (endTime != null) {
+            this.endTime = new Date(endTime.getTime());
+        } else {
+            this.endTime = null;
+        }
+    }
+
+    private String address;
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    private long duration;
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
+
+    private long engineHours; // milliseconds
+
+    public long getEngineHours() {
+        return engineHours;
+    }
+
+    public void setEngineHours(long engineHours) {
+        this.engineHours = engineHours;
+    }
+
+    public void addEngineHours(long engineHours) {
+        this.engineHours += engineHours;
+    }
+}
diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java
index 85ba6bc54..6f9e9459f 100644
--- a/src/org/traccar/reports/model/SummaryReport.java
+++ b/src/org/traccar/reports/model/SummaryReport.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,15 +31,4 @@ public class SummaryReport extends BaseReport {
     public void addEngineHours(long engineHours) {
         this.engineHours += engineHours;
     }
-
-    private String spentFuel;
-
-    public String getSpentFuel() {
-        return spentFuel;
-    }
-
-    public void setSpentFuel(String spentFuel) {
-        this.spentFuel = spentFuel;
-    }
-
 }
diff --git a/src/org/traccar/reports/model/TripReport.java b/src/org/traccar/reports/model/TripReport.java
index fce805ad6..efe556f79 100644
--- a/src/org/traccar/reports/model/TripReport.java
+++ b/src/org/traccar/reports/model/TripReport.java
@@ -145,15 +145,4 @@ public class TripReport extends BaseReport {
     public void setDuration(long duration) {
         this.duration = duration;
     }
-
-    private String spentFuel;
-
-    public String getSpentFuel() {
-        return spentFuel;
-    }
-
-    public void setSpentFuel(String spentFuel) {
-        this.spentFuel = spentFuel;
-    }
-
 }
diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/org/traccar/reports/model/TripsConfig.java
new file mode 100644
index 000000000..55258a6cf
--- /dev/null
+++ b/src/org/traccar/reports/model/TripsConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.reports.model;
+
+public class TripsConfig {
+
+    public TripsConfig() {
+    }
+
+    public TripsConfig(double minimalTripDistance, long minimalTripDuration,
+            long minimalParkingDuration, boolean greedyParking) {
+        this.minimalTripDistance = minimalTripDistance;
+        this.minimalTripDuration = minimalTripDuration;
+        this.minimalParkingDuration = minimalParkingDuration;
+        this.greedyParking = greedyParking;
+    }
+
+    private double minimalTripDistance;
+
+    public double getMinimalTripDistance() {
+        return minimalTripDistance;
+    }
+
+    public void setMinimalTripDistance(double minimalTripDistance) {
+        this.minimalTripDistance = minimalTripDistance;
+    }
+
+    private long minimalTripDuration;
+
+    public long getMinimalTripDuration() {
+        return minimalTripDuration;
+    }
+
+    public void setMinimalTripDuration(long minimalTripDuration) {
+        this.minimalTripDuration = minimalTripDuration;
+    }
+
+    private long minimalParkingDuration;
+
+    public long getMinimalParkingDuration() {
+        return minimalParkingDuration;
+    }
+
+    public void setMinimalParkingDuration(long minimalParkingDuration) {
+        this.minimalParkingDuration = minimalParkingDuration;
+    }
+
+    private boolean greedyParking;
+
+    public boolean getGreedyParking() {
+        return greedyParking;
+    }
+
+    public void setGreedyParking(boolean greedyParking) {
+        this.greedyParking = greedyParking;
+    }
+}