6 files changed, 173 insertions, 1 deletions
diff --git a/web/app/view/GeofenceDialog.js b/web/app/view/GeofenceDialog.js
new file mode 100644
index 000000000..a3100a797
--- /dev/null
+++ b/web/app/view/GeofenceDialog.js
@@ -0,0 +1,39 @@
+/*
+ * 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.view.GeofenceDialog', {
+    extend: 'Traccar.view.BaseEditDialog',
+
+    requires: [
+        'Traccar.view.BaseEditDialogController'
+    ],
+
+    controller: 'baseEditDialog',
+    title: Strings.sharedGeofence,
+
+    items: {
+        xtype: 'form',
+        items: [{
+            xtype: 'textfield',
+            name: 'name',
+            fieldLabel: Strings.sharedName
+        }, {
+            xtype: 'textfield',
+            name: 'description',
+            fieldLabel: Strings.sharedDescription
+        }]
+    }
+});
diff --git a/web/app/view/Geofences.js b/web/app/view/Geofences.js
new file mode 100644
index 000000000..4a5fc9e38
--- /dev/null
+++ b/web/app/view/Geofences.js
@@ -0,0 +1,48 @@
+/*
+ * 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.view.Geofences', {
+    extend: 'Ext.grid.Panel',
+    xtype: 'geofencesView',
+
+    requires: [
+        'Traccar.view.GeofencesController',
+        'Traccar.view.EditToolbar'
+    ],
+
+    controller: 'geofences',
+    store: 'Geofences',
+
+    selType: 'rowmodel',
+
+    tbar: {
+        xtype: 'editToolbar'
+    },
+
+    listeners: {
+        selectionchange: 'onSelectionChange'
+    },
+
+    columns: [{
+        text: Strings.sharedName,
+        dataIndex: 'name',
+        flex: 1
+    }, {
+        text: Strings.sharedDescription,
+        dataIndex: 'description',
+        flex: 1
+    }]
+});
diff --git a/web/app/view/GeofencesController.js b/web/app/view/GeofencesController.js
new file mode 100644
index 000000000..59e416d56
--- /dev/null
+++ b/web/app/view/GeofencesController.js
@@ -0,0 +1,72 @@
+/*
+ * 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.view.GeofencesController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.geofences',
+
+    requires: [
+        'Traccar.view.GeofenceDialog',
+        'Traccar.view.BaseWindow'
+    ],
+
+    init: function () {
+        Ext.getStore('Geofences').load();
+    },
+
+    onAddClick: function () {
+        var geofence, dialog;
+        geofence = Ext.create('Traccar.model.Geofence');
+        geofence.store = this.getView().getStore();
+        dialog = Ext.create('Traccar.view.GeofenceDialog');
+        dialog.down('form').loadRecord(geofence);
+        dialog.show();
+    },
+
+    onEditClick: function () {
+        var geofence, dialog;
+        geofence = this.getView().getSelectionModel().getSelection()[0];
+        dialog = Ext.create('Traccar.view.GeofenceDialog');
+        dialog.down('form').loadRecord(geofence);
+        dialog.show();
+    },
+
+    onRemoveClick: function () {
+        var geofence = this.getView().getSelectionModel().getSelection()[0];
+        Ext.Msg.show({
+            title: Strings.sharedGeofence,
+            message: Strings.sharedRemoveConfirm,
+            buttons: Ext.Msg.YESNO,
+            buttonText: {
+                yes: Strings.sharedRemove,
+                no: Strings.sharedCancel
+            },
+            fn: function (btn) {
+                var store = Ext.getStore('Geofences');
+                if (btn === 'yes') {
+                    store.remove(geofence);
+                    store.sync();
+                }
+            }
+        });
+    },
+
+    onSelectionChange: function (selected) {
+        var disabled = selected.length > 0;
+        this.lookupReference('toolbarEditButton').setDisabled(disabled);
+        this.lookupReference('toolbarRemoveButton').setDisabled(disabled);
+    }
+});
diff --git a/web/app/view/SettingsMenu.js b/web/app/view/SettingsMenu.js
index 1ada94359..704884928 100644
--- a/web/app/view/SettingsMenu.js
+++ b/web/app/view/SettingsMenu.js
@@ -35,6 +35,9 @@ Ext.define('Traccar.view.SettingsMenu', {
             text: Strings.settingsGroups,
             handler: 'onGroupsClick'
         }, {
+            text: Strings.sharedGeofences,
+            handler: 'onGeofencesClick'
+        }, {
             text: Strings.settingsServer,
             hidden: true,
             handler: 'onServerClick',
diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js
index 6d767e3a9..48ae60aa5 100644
--- a/web/app/view/SettingsMenuController.js
+++ b/web/app/view/SettingsMenuController.js
@@ -24,6 +24,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
         'Traccar.view.ServerDialog',
         'Traccar.view.Users',
         'Traccar.view.Groups',
+        'Traccar.view.Geofences',
         'Traccar.view.BaseWindow'
     ],
 
@@ -50,6 +51,16 @@ Ext.define('Traccar.view.SettingsMenuController', {
         }).show();
     },
 
+    onGeofencesClick: function () {
+        Ext.create('Traccar.view.BaseWindow', {
+            title: Strings.sharedGeofences,
+            modal: false,
+            items: {
+                xtype: 'geofencesView'
+            }
+        }).show();
+    },
+
     onServerClick: function () {
         var dialog = Ext.create('Traccar.view.ServerDialog');
         dialog.down('form').loadRecord(Traccar.app.getServer());
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index d0e8bda52..6b768c887 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -22,7 +22,6 @@ Ext.define('Traccar.view.UserDialog', {
     ],
 
     controller: 'userDialog',
-
     title: Strings.settingsUser,
 
     items: {