diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-04-20 20:21:38 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 20:21:38 +1200 |
| commit | 957a6544c4d5a44d52f821377b97ee2205bb22a2 (patch) | |
| tree | 9ca8487766cc7789435f0b782b41b1b29dee405e /web/app/model/Event.js | |
| parent | 4e7d2b8fdb41390205d69997d61db536545f5564 (diff) | |
| parent | 5ad9dc859216a129da6f352b13b908d08ec983a2 (diff) | |
| download | trackermap-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.tar.gz trackermap-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.tar.bz2 trackermap-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.zip | |
Merge pull request #665 from Abyss777/multi_maintenance
Implement Maintenances
Diffstat (limited to 'web/app/model/Event.js')
| -rw-r--r-- | web/app/model/Event.js | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/web/app/model/Event.js b/web/app/model/Event.js index 966cd607..f0c9c3aa 100644 --- a/web/app/model/Event.js +++ b/web/app/model/Event.js @@ -1,6 +1,6 @@ /* - * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org) - * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) + * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2017 - 2018 Andrey Kunitsyn (andrey@traccar.org) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,9 +40,12 @@ Ext.define('Traccar.model.Event', { name: 'geofenceId', type: 'int' }, { + name: 'maintenanceId', + type: 'int' + }, { name: 'text', convert: function (v, rec) { - var text, alarmKey, geofence; + var text, alarmKey, geofence, maintenance; if (rec.get('type') === 'commandResult') { text = Strings.eventCommandResult + ': ' + rec.get('attributes')['result']; } else if (rec.get('type') === 'alarm') { @@ -63,9 +66,15 @@ Ext.define('Traccar.model.Event', { text += ' "' + geofence.get('name') + '"'; } } + if (rec.get('maintenanceId')) { + maintenance = Ext.getStore('Maintenances').getById(rec.get('maintenanceId')); + if (maintenance) { + text += ' "' + maintenance.get('name') + '"'; + } + } return text; }, - depends: ['type', 'attributes', 'geofenceId'] + depends: ['type', 'attributes', 'geofenceId', 'maintenanceId'] }, { name: 'attributes' }] |