Merge remote-tracking branch 'refs/remotes/tananaev/master'

3 files changed, 41 insertions, 4 deletions

diff --git a/web/app/model/Device.js b/web/app/model/Device.js
index b8434d6ad..588d53c1f 100644
--- a/web/app/model/Device.js
+++ b/web/app/model/Device.js
@@ -33,6 +33,9 @@ Ext.define('Traccar.model.Device', {
     }, {
         name: 'lastUpdate',
         type: 'date',
-        dateWriteFormat: 'c'
+        dateFormat: 'c'
+    }, {
+        name: 'groupId',
+        type: 'int'
     }]
 });
diff --git a/web/app/model/Group.js b/web/app/model/Group.js
new file mode 100644
index 000000000..a28897feb
--- /dev/null
+++ b/web/app/model/Group.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Ext.define('Traccar.model.Group', {
+    extend: 'Ext.data.Model',
+    identifier: 'negative',
+
+    fields: [{
+        name: 'id',
+        type: 'int'
+    }, {
+        name: 'name',
+        type: 'string'
+    }, {
+        name: 'groupId',
+        type: 'int'
+    }]
+});
diff --git a/web/app/model/Position.js b/web/app/model/Position.js
index 365b06115..e559a7eab 100644
--- a/web/app/model/Position.js
+++ b/web/app/model/Position.js
@@ -29,13 +29,16 @@ Ext.define('Traccar.model.Position', {
         type: 'int'
     }, {
         name: 'serverTime',
-        type: 'date'
+        type: 'date',
+        dateFormat: 'c'
     }, {
         name: 'deviceTime',
-        type: 'date'
+        type: 'date',
+        dateFormat: 'c'
     }, {
         name: 'fixTime',
-        type: 'date'
+        type: 'date',
+        dateFormat: 'c'
     }, {
         name: 'valid',
         type: 'boolean'