diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-07-25 16:20:15 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 16:20:15 +1200 |
| commit | 4a31e34ca62d4b1941d3bc329afc127ef7263f34 (patch) | |
| tree | 09b9ad0420a4819a350bcdcffeeee2342c5d2483 /web/app/view/Report.js | |
| parent | 866c3073ef48a24d86834a391a4d3d91209a6eed (diff) | |
| parent | b4841fa0a6293c0b895cf6bb65c6c2d871c78397 (diff) | |
| download | trackermap-server-4a31e34ca62d4b1941d3bc329afc127ef7263f34.tar.gz trackermap-server-4a31e34ca62d4b1941d3bc329afc127ef7263f34.tar.bz2 trackermap-server-4a31e34ca62d4b1941d3bc329afc127ef7263f34.zip | |
Merge pull request #2104 from ninioe/master
Added support for Alarm notifications & positions history cleaner & show alarms in report & Mute button & unlock UI files (for windows)
Diffstat (limited to 'web/app/view/Report.js')
| -rw-r--r-- | web/app/view/Report.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/app/view/Report.js b/web/app/view/Report.js index 4261b9040..78ff5d52f 100644 --- a/web/app/view/Report.js +++ b/web/app/view/Report.js @@ -115,5 +115,10 @@ Ext.define('Traccar.view.Report', { dataIndex: 'address', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('address') + }, { + text: 'Alarm', + dataIndex: 'attributes', + flex: 1, + renderer: Traccar.AttributeFormatter.getFormatter('alarm') }] }); |