Merge pull request #524 from Abyss777/drivers

Drivers implementation

3 files changed, 65 insertions, 4 deletions

diff --git a/web/app/store/AllDrivers.js b/web/app/store/AllDrivers.js
new file mode 100644
index 0000000..9d72388
--- /dev/null
+++ b/web/app/store/AllDrivers.js
@@ -0,0 +1,30 @@
+/*
+ * 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.store.AllDrivers', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.Driver',
+
+    proxy: {
+        type: 'rest',
+        url: 'api/drivers',
+        extraParams: {
+            all: true
+        }
+    }
+});
diff --git a/web/app/store/Drivers.js b/web/app/store/Drivers.js
new file mode 100644
index 0000000..fd4ca20
--- /dev/null
+++ b/web/app/store/Drivers.js
@@ -0,0 +1,30 @@
+/*
+ * 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.store.Drivers', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.Driver',
+
+    proxy: {
+        type: 'rest',
+        url: 'api/drivers',
+        writer: {
+            writeAllFields: true
+        }
+    }
+});
diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js
index 0a6572d..c3d6d18 100644
--- a/web/app/store/PositionAttributes.js
+++ b/web/app/store/PositionAttributes.js
@@ -121,10 +121,6 @@ Ext.define('Traccar.store.PositionAttributes', {
         valueType: 'number',
         dataType: 'consumption'
     }, {
-        key: 'rfid',
-        name: Strings.positionRfid,
-        valueType: 'string'
-    }, {
         key: 'versionFw',
         name: Strings.positionVersionFw,
         valueType: 'string'
@@ -233,6 +229,11 @@ Ext.define('Traccar.store.PositionAttributes', {
         key: 'result',
         name: Strings.eventCommandResult,
         valueType: 'string'
+    }, {
+        key: 'driverUniqueId',
+        name: Strings.positionDriverUniqueId,
+        valueType: 'string',
+        dataType: 'driverUniqueId'
     }],
 
     getAttributeName: function (key, capitalize) {