Finish implementing grid report

3 files changed, 4 insertions, 3 deletions

diff --git a/web/app/Resources.js b/web/app/Resources.js
index 0fae64cff..bb939c603 100644
--- a/web/app/Resources.js
+++ b/web/app/Resources.js
@@ -64,6 +64,7 @@ var styles = {
 
     report_height: 250,
     report_time: 100,
+    report_format: 'Y-m-d H:i:s',
 
     map_center: [ -0.1275, 51.507222 ],
     map_zoom: 6,
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index a8b191ef1..55c8bf0e7 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -71,8 +71,8 @@ Ext.define('Traccar.view.report.Report', {
     }],
 
     columns: [
-        { text: strings.report_time, dataIndex: 'fixTime', flex: 1 },
         { text: strings.report_valid, dataIndex: 'valid', flex: 1 },
+        { text: strings.report_time, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format },
         { text: strings.report_latitude, dataIndex: 'latitude', flex: 1 },
         { text: strings.report_longitude, dataIndex: 'longitude', flex: 1 },
         { text: strings.report_altitude, dataIndex: 'altitude', flex: 1 },
diff --git a/web/app/view/report/ReportController.js b/web/app/view/report/ReportController.js
index 48cfda74f..5c6578681 100644
--- a/web/app/view/report/ReportController.js
+++ b/web/app/view/report/ReportController.js
@@ -25,14 +25,14 @@ Ext.define('Traccar.view.report.ReportController', {
         var fromTime = this.lookupReference('fromTimeField').getValue();
 
         var from = new Date(
-            fromDate.getYear(), fromDate.getMonth(), fromDate.getDay(),
+            fromDate.getFullYear(), fromDate.getMonth(), fromDate.getDay(),
             fromTime.getHours(), fromTime.getMinutes(), fromTime.getSeconds(), fromTime.getMilliseconds());
 
         var toDate = this.lookupReference('toDateField').getValue();
         var toTime = this.lookupReference('toTimeField').getValue();
 
         var to = new Date(
-            toDate.getYear(), toDate.getMonth(), toDate.getDay(),
+            toDate.getFullYear(), toDate.getMonth(), toDate.getDay(),
             toTime.getHours(), toTime.getMinutes(), toTime.getSeconds(), toTime.getMilliseconds());
 
         var store = Ext.getStore('Positions');