From d67213556dcc87453c0ad5cd6f9e8851c477a2f3 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 11 Jun 2018 21:01:43 +1200 Subject: Increase reports timeout --- web/app/Style.js | 1 + web/app/store/ReportEvents.js | 1 + web/app/store/ReportRoute.js | 1 + web/app/store/ReportStops.js | 1 + web/app/store/ReportSummary.js | 1 + web/app/store/ReportTrips.js | 1 + web/app/view/ReportController.js | 1 + 7 files changed, 7 insertions(+) (limited to 'web') diff --git a/web/app/Style.js b/web/app/Style.js index f12e9f5..b33e5c2 100644 --- a/web/app/Style.js +++ b/web/app/Style.js @@ -20,6 +20,7 @@ Ext.define('Traccar.Style', { refreshPeriod: 60 * 1000, reconnectTimeout: 60 * 1000, + reportTimeout: 120 * 1000, normalPadding: 10, diff --git a/web/app/store/ReportEvents.js b/web/app/store/ReportEvents.js index ca90693..061aaa4 100644 --- a/web/app/store/ReportEvents.js +++ b/web/app/store/ReportEvents.js @@ -22,6 +22,7 @@ Ext.define('Traccar.store.ReportEvents', { proxy: { type: 'rest', url: 'api/reports/events', + timeout: Traccar.Style.reportTimeout, headers: { 'Accept': 'application/json' }, diff --git a/web/app/store/ReportRoute.js b/web/app/store/ReportRoute.js index 6ee4bbc..7babe16 100644 --- a/web/app/store/ReportRoute.js +++ b/web/app/store/ReportRoute.js @@ -22,6 +22,7 @@ Ext.define('Traccar.store.ReportRoute', { proxy: { type: 'rest', url: 'api/reports/route', + timeout: Traccar.Style.reportTimeout, headers: { 'Accept': 'application/json' }, diff --git a/web/app/store/ReportStops.js b/web/app/store/ReportStops.js index 9e9ba13..75c9fc1 100644 --- a/web/app/store/ReportStops.js +++ b/web/app/store/ReportStops.js @@ -23,6 +23,7 @@ Ext.define('Traccar.store.ReportStops', { proxy: { type: 'rest', url: 'api/reports/stops', + timeout: Traccar.Style.reportTimeout, headers: { 'Accept': 'application/json' }, diff --git a/web/app/store/ReportSummary.js b/web/app/store/ReportSummary.js index 4e53d94..f328da2 100644 --- a/web/app/store/ReportSummary.js +++ b/web/app/store/ReportSummary.js @@ -23,6 +23,7 @@ Ext.define('Traccar.store.ReportSummary', { proxy: { type: 'rest', url: 'api/reports/summary', + timeout: Traccar.Style.reportTimeout, headers: { 'Accept': 'application/json' }, diff --git a/web/app/store/ReportTrips.js b/web/app/store/ReportTrips.js index d8aa922..057cc7c 100644 --- a/web/app/store/ReportTrips.js +++ b/web/app/store/ReportTrips.js @@ -23,6 +23,7 @@ Ext.define('Traccar.store.ReportTrips', { proxy: { type: 'rest', url: 'api/reports/trips', + timeout: Traccar.Style.reportTimeout, headers: { 'Accept': 'application/json' }, diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 62a8a92..204c36c 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -367,6 +367,7 @@ Ext.define('Traccar.view.ReportController', { Ext.Ajax.request({ url: requestUrl, method: 'GET', + timeout: Traccar.Style.reportTimeout, params: requestParams, headers: { Accept: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' -- cgit v1.2.3