diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-14 20:46:03 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-14 20:46:03 +1200 |
commit | dab4694bcab525bcc26e6af42aacc45901093dc2 (patch) | |
tree | 77631b518eacf8b9a59d9785068624e5ef52003f /web/app/model | |
parent | 79f557f7b4bb209876977bba99f8c0a18f672b29 (diff) | |
parent | d40b862b56075e1544d3ed117576e05354b398a1 (diff) | |
download | etbsa-traccar-web-dab4694bcab525bcc26e6af42aacc45901093dc2.tar.gz etbsa-traccar-web-dab4694bcab525bcc26e6af42aacc45901093dc2.tar.bz2 etbsa-traccar-web-dab4694bcab525bcc26e6af42aacc45901093dc2.zip |
Merge pull request #524 from Abyss777/drivers
Drivers implementation
Diffstat (limited to 'web/app/model')
-rw-r--r-- | web/app/model/Driver.js | 35 | ||||
-rw-r--r-- | web/app/model/Event.js | 3 | ||||
-rw-r--r-- | web/app/model/ReportTrip.js | 6 |
3 files changed, 44 insertions, 0 deletions
diff --git a/web/app/model/Driver.js b/web/app/model/Driver.js new file mode 100644 index 0000000..3c3b30e --- /dev/null +++ b/web/app/model/Driver.js @@ -0,0 +1,35 @@ +/* + * Copyright 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2017 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +Ext.define('Traccar.model.Driver', { + extend: 'Ext.data.Model', + identifier: 'negative', + + fields: [{ + name: 'id', + type: 'int' + }, { + name: 'name', + type: 'string' + }, { + name: 'uniqueId', + type: 'string' + }, { + name: 'attributes' + }] +}); diff --git a/web/app/model/Event.js b/web/app/model/Event.js index 70fab17..9455b0d 100644 --- a/web/app/model/Event.js +++ b/web/app/model/Event.js @@ -51,6 +51,9 @@ Ext.define('Traccar.model.Event', { text = Strings[alarmKey] || alarmKey; } else if (rec.get('type') === 'textMessage') { text = Strings.eventTextMessage + ': ' + rec.get('attributes')['message']; + } else if (rec.get('type') === 'driverChanged') { + text = Strings.eventDriverChanged + ': ' + Traccar.AttributeFormatter.driverUniqueIdFormatter( + rec.get('attributes')['driverUniqueId']); } else { text = Traccar.app.getEventString(rec.get('type')); } diff --git a/web/app/model/ReportTrip.js b/web/app/model/ReportTrip.js index d243a8a..edff02b 100644 --- a/web/app/model/ReportTrip.js +++ b/web/app/model/ReportTrip.js @@ -55,5 +55,11 @@ Ext.define('Traccar.model.ReportTrip', { }, { name: 'endAddress', type: 'string' + }, { + name: 'driverUniqueId', + type: 'string' + }, { + name: 'driverName', + type: 'string' }] }); |