Merge pull request #371 from Abyss777/charts

Charts implementation

1 files changed, 38 insertions, 12 deletions

diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 5851c4c3..339761e9 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -16,7 +16,7 @@
  */
 
 Ext.define('Traccar.view.Report', {
-    extend: 'Ext.grid.Panel',
+    extend: 'Ext.panel.Panel',
     xtype: 'reportView',
 
     requires: [
@@ -67,17 +67,43 @@ Ext.define('Traccar.view.Report', {
         }]
     },
 
-    listeners: {
-        selectionchange: 'onSelectionChange'
-    },
-
-    forceFit: true,
+    layout: 'card',
 
-    columns: {
-        defaults: {
-            minWidth: Traccar.Style.columnWidthNormal
+    items: [{
+        xtype: 'grid',
+        itemId: 'grid',
+        listeners: {
+            selectionchange: 'onSelectionChange'
+        },
+        forceFit: true,
+        columns: {
+            defaults: {
+                minWidth: Traccar.Style.columnWidthNormal
+            },
+            items: [
+            ]
+        },
+        style: Traccar.Style.reportGridStyle
+    }, {
+        xtype: 'cartesian',
+        itemId: 'chart',
+        plugins: {
+            ptype: 'chartitemevents',
+            moveEvents: true
+        },
+        store: 'ReportRoute',
+        axes: [{
+            title: Strings.reportCharts,
+            type: 'numeric',
+            position: 'left'
+        }, {
+            type: 'time',
+            position: 'bottom',
+            fields: ['fixTime']
+        }],
+        listeners: {
+            itemclick: 'onChartMarkerClick'
         },
-        items: [
-        ]
-    }
+        insetPadding: Traccar.Style.chartPadding
+    }]
 });