diff options
author | Abyss777 <abyss@fox5.ru> | 2016-10-17 14:05:26 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-10-17 14:05:26 +0500 |
commit | be258e48a631254b3f02483a122a46973fccefdf (patch) | |
tree | 3ce4aa0fecbb65ef63dd24d2d29b29c7d793ba88 /web/app | |
parent | 32cfba2f48b2ec73ed282af94bb793dde49b0a72 (diff) | |
download | trackermap-web-be258e48a631254b3f02483a122a46973fccefdf.tar.gz trackermap-web-be258e48a631254b3f02483a122a46973fccefdf.tar.bz2 trackermap-web-be258e48a631254b3f02483a122a46973fccefdf.zip |
- Replace CSV button to XLSX
- Adopt download function to binary files
- Rewrite dom manipulation to extjs
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/view/Report.js | 4 | ||||
-rw-r--r-- | web/app/view/ReportController.js | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/web/app/view/Report.js b/web/app/view/Report.js index 18debc63..b07bd1ca 100644 --- a/web/app/view/Report.js +++ b/web/app/view/Report.js @@ -49,8 +49,8 @@ Ext.define('Traccar.view.Report', { disabled: true, handler: 'onReportClick' }, { - text: Strings.reportCsv, - reference: 'csvButton', + text: Strings.reportXlsx, + reference: 'xlsxButton', disabled: true, handler: 'onReportClick' }, { diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 115769d8..49d6d773 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -74,11 +74,11 @@ Ext.define('Traccar.view.ReportController', { time = this.fromDate && this.fromTime && this.toDate && this.toTime; disabled = !reportType || !devices || !time; this.lookupReference('showButton').setDisabled(disabled); - this.lookupReference('csvButton').setDisabled(disabled); + this.lookupReference('xlsxButton').setDisabled(disabled); }, onReportClick: function (button) { - var reportType, from, to, store, url; + var reportType, from, to, store, url, accept; reportType = this.lookupReference('reportTypeField').getValue(); @@ -102,9 +102,10 @@ Ext.define('Traccar.view.ReportController', { to: to.toISOString() } }); - } else if (button.reference === 'csvButton') { + } else if (button.reference === 'xlsxButton') { url = this.getView().getStore().getProxy().url; - this.downloadCsv(url, { + accept = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + this.downloadFile(url, accept, { deviceId: this.deviceId, groupId: this.groupId, type: this.eventType, @@ -149,7 +150,7 @@ Ext.define('Traccar.view.ReportController', { if (object instanceof Traccar.model.Position && reportType === 'route') { this.getView().getSelectionModel().select([object], false, true); this.getView().getView().focusRow(object); - } + } }, selectTrip: function (trip) { @@ -166,20 +167,21 @@ Ext.define('Traccar.view.ReportController', { }); }, - downloadCsv: function (requestUrl, requestParams) { + downloadFile: function (requestUrl, acceptHeader, requestParams) { Ext.Ajax.request({ url: requestUrl, method: 'GET', params: requestParams, headers: { - Accept: 'text/csv' + Accept: acceptHeader }, + binary: true, success: function (response) { - var disposition, filename, type, blob, url, downloadUrl, elementA; + var disposition, filename, type, blob, url, downloadUrl; disposition = response.getResponseHeader('Content-Disposition'); filename = disposition.slice(disposition.indexOf('=') + 1, disposition.length); type = response.getResponseHeader('Content-Type'); - blob = new Blob([response.responseText], {type: type}); + blob = new Blob([response.responseBytes], {type: type}); if (typeof window.navigator.msSaveBlob !== 'undefined') { // IE workaround window.navigator.msSaveBlob(blob, filename); @@ -187,11 +189,11 @@ Ext.define('Traccar.view.ReportController', { url = window.URL || window.webkitURL; downloadUrl = url.createObjectURL(blob); if (filename) { - elementA = document.createElement('a'); - elementA.href = downloadUrl; - elementA.download = filename; - document.body.appendChild(elementA); - elementA.click(); + Ext.dom.Helper.append(Ext.getBody(), { + tag: 'a', + href: downloadUrl, + download: filename + }).click(); } setTimeout(function () { url.revokeObjectURL(downloadUrl); |