aboutsummaryrefslogtreecommitdiff
path: root/web/app/model
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-06-18 07:59:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-06-18 07:59:43 +0500
commit4109447d0adc778b246543b77672c280d58da8bf (patch)
tree08ee98636cec128587bbf5f25654c5e3534dfcd9 /web/app/model
parentb3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a (diff)
downloadtrackermap-server-4109447d0adc778b246543b77672c280d58da8bf.tar.gz
trackermap-server-4109447d0adc778b246543b77672c280d58da8bf.tar.bz2
trackermap-server-4109447d0adc778b246543b77672c280d58da8bf.zip
- Update Geofences API and Manager a bit
- Show geofence name in event toasts - Link/Unlink geofences to users, devices and groups
Diffstat (limited to 'web/app/model')
-rw-r--r--web/app/model/Device.js2
-rw-r--r--web/app/model/Event.js3
-rw-r--r--web/app/model/Geofence.js36
3 files changed, 41 insertions, 0 deletions
diff --git a/web/app/model/Device.js b/web/app/model/Device.js
index 588d53c1f..c0a6739f5 100644
--- a/web/app/model/Device.js
+++ b/web/app/model/Device.js
@@ -37,5 +37,7 @@ Ext.define('Traccar.model.Device', {
}, {
name: 'groupId',
type: 'int'
+ }, {
+ name: 'geofenceIds',
}]
});
diff --git a/web/app/model/Event.js b/web/app/model/Event.js
index 4dd3ea7ff..698ebb535 100644
--- a/web/app/model/Event.js
+++ b/web/app/model/Event.js
@@ -35,6 +35,9 @@ Ext.define('Traccar.model.Event', {
name: 'positionId',
type: 'int'
}, {
+ name: 'geofenceId',
+ type: 'int'
+ }, {
name: 'attributes'
}]
});
diff --git a/web/app/model/Geofence.js b/web/app/model/Geofence.js
new file mode 100644
index 000000000..a832455ac
--- /dev/null
+++ b/web/app/model/Geofence.js
@@ -0,0 +1,36 @@
+/*
+ * 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.Geofence', {
+ extend: 'Ext.data.Model',
+ identifier: 'negative',
+
+ fields: [{
+ name: 'id',
+ type: 'int'
+ }, {
+ name: 'name',
+ type: 'string'
+ }, {
+ name: 'description',
+ type: 'string'
+ }, {
+ name: 'area',
+ type: 'string'
+ }, {
+ name: 'attributes'
+ }]
+});