- Added trips report

- Refactored reports models
- Added tests for ReportUtils
- Added speed to test-generator.py
- Other changes

3 files changed, 33 insertions, 0 deletions

diff --git a/web/app/store/ReportSummary.js b/web/app/store/ReportSummary.js
index 35dad736b..7c9a4fca2 100644
--- a/web/app/store/ReportSummary.js
+++ b/web/app/store/ReportSummary.js
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/web/app/store/ReportTrips.js b/web/app/store/ReportTrips.js
new file mode 100644
index 000000000..e0d86aa48
--- /dev/null
+++ b/web/app/store/ReportTrips.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.
+ */
+
+Ext.define('Traccar.store.ReportTrips', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.ReportTrip',
+
+    proxy: {
+        type: 'rest',
+        url: 'api/reports/trips',
+        headers: {
+            'Accept': 'application/json'
+        }
+    }
+});
diff --git a/web/app/store/ReportTypes.js b/web/app/store/ReportTypes.js
index d544a2fda..09ef61db6 100644
--- a/web/app/store/ReportTypes.js
+++ b/web/app/store/ReportTypes.js
@@ -25,6 +25,9 @@ Ext.define('Traccar.store.ReportTypes', {
         key: 'events',
         name: Strings.reportEvents
     }, {
+        key: 'trips',
+        name: Strings.reportTrips
+    }, {
         key: 'summary',
         name: Strings.reportSummary
     }]