diff options
| -rw-r--r-- | modern/src/common/formatter.js | 1 | ||||
| -rw-r--r-- | modern/src/reports/EventReportPage.js | 2 | ||||
| -rw-r--r-- | web/app/model/Event.js | 2 | ||||
| -rw-r--r-- | web/app/view/Events.js | 2 | ||||
| -rw-r--r-- | web/app/view/ReportController.js | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js index e41e591e..289a6d94 100644 --- a/modern/src/common/formatter.js +++ b/modern/src/common/formatter.js @@ -9,6 +9,7 @@ export const formatPosition = (value, key) => { case 'fixTime': case 'deviceTime': case 'serverTime': + case 'eventTime': return moment(value).format('LLL'); case 'latitude': case 'longitude': diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js index 054181d0..459383e9 100644 --- a/modern/src/reports/EventReportPage.js +++ b/modern/src/reports/EventReportPage.js @@ -74,7 +74,7 @@ const EventReportPage = () => { <TableBody> {items.map(item => ( <TableRow key={item.id}> - <TableCell>{formatPosition(item, 'serverTime')}</TableCell> + <TableCell>{formatPosition(item, 'eventTime')}</TableCell> <TableCell>{item.type}</TableCell> <TableCell>{}</TableCell> <TableCell>{}</TableCell> diff --git a/web/app/model/Event.js b/web/app/model/Event.js index f0c9c3aa..d1297dd7 100644 --- a/web/app/model/Event.js +++ b/web/app/model/Event.js @@ -27,7 +27,7 @@ Ext.define('Traccar.model.Event', { name: 'type', type: 'string' }, { - name: 'serverTime', + name: 'eventTime', type: 'date', dateFormat: 'c' }, { diff --git a/web/app/view/Events.js b/web/app/view/Events.js index 3f4b5757..d800837f 100644 --- a/web/app/view/Events.js +++ b/web/app/view/Events.js @@ -110,7 +110,7 @@ Ext.define('Traccar.view.Events', { dataIndex: 'text' }, { text: Strings.positionFixTime, - dataIndex: 'serverTime', + dataIndex: 'eventTime', renderer: Traccar.AttributeFormatter.getFormatter('lastUpdate') }] } diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 88a4cea6..cc0fd4ac 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -514,9 +514,9 @@ Ext.define('Traccar.view.ReportController', { eventsColumns: [{ text: Strings.positionFixTime, - dataIndex: 'serverTime', + dataIndex: 'eventTime', xtype: 'datecolumn', - renderer: Traccar.AttributeFormatter.getFormatter('serverTime') + renderer: Traccar.AttributeFormatter.getFormatter('eventTime') }, { text: Strings.reportDeviceName, dataIndex: 'deviceId', |