- Added deviceId in SummaryReport

- Response bare array for application/json
- Migrate to /api/reports/route in web-interface

5 files changed, 34 insertions, 5 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index ec942d21e..e3bf2ba31 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -56,7 +56,8 @@ Ext.define('Traccar.Application', {
         'AllGeofences',
         'Notifications',
         'AllNotifications',
-        'GeofenceTypes'
+        'GeofenceTypes',
+        'ReportRoute'
     ],
 
     controllers: [
diff --git a/web/app/store/ReportRoute.js b/web/app/store/ReportRoute.js
new file mode 100644
index 000000000..18e28d63d
--- /dev/null
+++ b/web/app/store/ReportRoute.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015- Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.ReportRoute', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.Position',
+
+    proxy: {
+        type: 'rest',
+        url: '/api/reports/route',
+        headers : {
+        	'Accept' : 'application/json'		    
+  		}
+    }
+});
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 6ef9f91e6..ab7461cf0 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -35,7 +35,7 @@ Ext.define('Traccar.view.MapController', {
                     add: 'updateLatest',
                     update: 'updateLatest'
                 },
-                '#Positions': {
+                '#ReportRoute': {
                     load: 'loadReport',
                     clear: 'clearReport'
                 }
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 4261b9040..b4578915a 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.Report', {
     ],
 
     controller: 'report',
-    store: 'Positions',
+    store: 'ReportRoute',
 
     title: Strings.reportTitle,
 
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 4fe7c62b8..04e07e640 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -49,7 +49,7 @@ Ext.define('Traccar.view.ReportController', {
                 toDate.getFullYear(), toDate.getMonth(), toDate.getDate(),
                 toTime.getHours(), toTime.getMinutes(), toTime.getSeconds(), toTime.getMilliseconds());
 
-            store = Ext.getStore('Positions');
+            store = Ext.getStore('ReportRoute');
             store.load({
                 params: {
                     deviceId: deviceId,
@@ -61,7 +61,7 @@ Ext.define('Traccar.view.ReportController', {
     },
 
     onClearClick: function () {
-        Ext.getStore('Positions').removeAll();
+        Ext.getStore('ReportRoute').removeAll();
     },
 
     onSelectionChange: function (selected) {