aboutsummaryrefslogtreecommitdiff
path: root/web/app/view
diff options
context:
space:
mode:
Diffstat (limited to 'web/app/view')
-rw-r--r--web/app/view/ReportController.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 2f10cde..88a4cea 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -150,7 +150,7 @@ Ext.define('Traccar.view.ReportController', {
},
onReportClick: function (button) {
- var reportType, from, to, store, url;
+ var reportType, from, to, store, url, daily;
this.getGrid().getSelectionModel().deselectAll();
@@ -164,6 +164,8 @@ Ext.define('Traccar.view.ReportController', {
this.toDate.getFullYear(), this.toDate.getMonth(), this.toDate.getDate(),
this.toTime.getHours(), this.toTime.getMinutes(), this.toTime.getSeconds(), this.toTime.getMilliseconds());
+ daily = reportType === 'daily';
+
this.reportProgress = true;
this.updateButtons();
@@ -186,7 +188,8 @@ Ext.define('Traccar.view.ReportController', {
groupId: this.groupId,
type: this.eventType,
from: from.toISOString(),
- to: to.toISOString()
+ to: to.toISOString(),
+ daily: daily
}
});
} else {
@@ -197,6 +200,7 @@ Ext.define('Traccar.view.ReportController', {
type: this.eventType,
from: Ext.Date.format(from, 'c'),
to: Ext.Date.format(to, 'c'),
+ daily: daily,
mail: button.reference === 'emailButton'
});
}
@@ -427,7 +431,7 @@ Ext.define('Traccar.view.ReportController', {
} else if (newValue === 'events') {
this.getGrid().reconfigure('ReportEvents', this.eventsColumns);
this.getView().getLayout().setActiveItem('grid');
- } else if (newValue === 'summary') {
+ } else if (newValue === 'summary' || newValue === 'daily') {
this.getGrid().reconfigure('ReportSummary', this.summaryColumns);
this.getView().getLayout().setActiveItem('grid');
} else if (newValue === 'trips') {
@@ -538,6 +542,11 @@ Ext.define('Traccar.view.ReportController', {
dataIndex: 'deviceId',
renderer: Traccar.AttributeFormatter.getFormatter('deviceId')
}, {
+ text: Strings.reportStartDate,
+ dataIndex: 'startTime',
+ xtype: 'datecolumn',
+ renderer: Traccar.AttributeFormatter.dateFormatter
+ }, {
text: Strings.sharedDistance,
dataIndex: 'distance',
renderer: Traccar.AttributeFormatter.getFormatter('distance')