From aa4248e73510c14eb64cfbb3c20cf65da805cd50 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 6 Oct 2020 17:06:04 -0700
Subject: Implement daily summary report

---
 .../java/org/traccar/reports/model/BaseReport.java | 22 ++++++++++++++++++++++
 .../java/org/traccar/reports/model/StopReport.java | 20 --------------------
 .../java/org/traccar/reports/model/TripReport.java | 20 --------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

(limited to 'src/main/java/org/traccar/reports/model')

diff --git a/src/main/java/org/traccar/reports/model/BaseReport.java b/src/main/java/org/traccar/reports/model/BaseReport.java
index 9f2d1188c..deb42bb8a 100644
--- a/src/main/java/org/traccar/reports/model/BaseReport.java
+++ b/src/main/java/org/traccar/reports/model/BaseReport.java
@@ -16,6 +16,8 @@
  */
 package org.traccar.reports.model;
 
+import java.util.Date;
+
 public class BaseReport {
 
     private long deviceId;
@@ -103,4 +105,24 @@ public class BaseReport {
         this.endOdometer = endOdometer;
     }
 
+    private Date startTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    private Date endTime;
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
 }
diff --git a/src/main/java/org/traccar/reports/model/StopReport.java b/src/main/java/org/traccar/reports/model/StopReport.java
index fd8fa9335..28b7def62 100644
--- a/src/main/java/org/traccar/reports/model/StopReport.java
+++ b/src/main/java/org/traccar/reports/model/StopReport.java
@@ -50,26 +50,6 @@ public class StopReport extends BaseReport  {
         this.longitude = longitude;
     }
 
-    private Date startTime;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    private Date endTime;
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
     private String address;
 
     public String getAddress() {
diff --git a/src/main/java/org/traccar/reports/model/TripReport.java b/src/main/java/org/traccar/reports/model/TripReport.java
index 3140f3019..6c1c20953 100644
--- a/src/main/java/org/traccar/reports/model/TripReport.java
+++ b/src/main/java/org/traccar/reports/model/TripReport.java
@@ -80,16 +80,6 @@ public class TripReport extends BaseReport {
         this.endLon = endLon;
     }
 
-    private Date startTime;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
     private String startAddress;
 
     public String getStartAddress() {
@@ -100,16 +90,6 @@ public class TripReport extends BaseReport {
         this.startAddress = address;
     }
 
-    private Date endTime;
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
     private String endAddress;
 
     public String getEndAddress() {
-- 
cgit v1.2.3