Merge pull request #524 from Abyss777/drivers

Drivers implementation

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 00000000..3c3b30e5
--- /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 70fab178..9455b0dd 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 d243a8ae..edff02b5 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'
     }]
 });