15 files changed, 200 insertions, 10 deletions
diff --git a/debug.xml b/debug.xml
index a55d1a6a6..9c8352589 100644
--- a/debug.xml
+++ b/debug.xml
@@ -47,6 +47,7 @@
     <entry key='event.globalSpeedLimit'>90</entry>
     <entry key='event.motionHandler'>true</entry>
     <entry key='event.geofenceHandler'>true</entry>
+    <entry key='event.alertHandler'>true</entry>
 
     <!--<entry key='event.forward.enable'>true</entry>
     <entry key='event.forward.url'>http://localhost/</entry>
@@ -83,6 +84,8 @@
 
     <entry key='database.changelog'>./schema/changelog-master.xml</entry>
 
+    <entry key='database.positionsHistoryDays'>7</entry>
+
     <entry key='database.selectServers'>
         SELECT * FROM server;
     </entry>
@@ -320,6 +323,10 @@
         DELETE FROM notifications WHERE id = :id;
     </entry>
 
+    <entry key='database.clearPositionsHistory'>
+        DELETE FROM positions WHERE deviceid = :deviceId and servertime &lt; :serverTime;
+    </entry>
+
     <!-- PROTOCOL CONFIG -->
 
     <entry key='gps103.port'>5001</entry>
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 44f1b0657..eb08c7e08 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -29,10 +29,7 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.logging.LoggingHandler;
 import org.jboss.netty.handler.timeout.IdleStateHandler;
-import org.traccar.events.CommandResultEventHandler;
-import org.traccar.events.GeofenceEventHandler;
-import org.traccar.events.MotionEventHandler;
-import org.traccar.events.OverspeedEventHandler;
+import org.traccar.events.*;
 import org.traccar.helper.Log;
 
 import java.net.InetSocketAddress;
@@ -52,6 +49,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private OverspeedEventHandler overspeedEventHandler;
     private MotionEventHandler motionEventHandler;
     private GeofenceEventHandler geofenceEventHandler;
+    private AlertEventHandler alertEventHandler;
 
     private static final class OpenChannelHandler extends SimpleChannelHandler {
 
@@ -146,6 +144,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (Context.getConfig().getBoolean("event.geofenceHandler")) {
             geofenceEventHandler = new GeofenceEventHandler();
         }
+        if (Context.getConfig().getBoolean("event.alertHandler")) {
+            alertEventHandler = new AlertEventHandler();
+        }
     }
 
     protected abstract void addSpecificHandlers(ChannelPipeline pipeline);
@@ -207,6 +208,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
             pipeline.addLast("GeofenceEventHandler", geofenceEventHandler);
         }
 
+        if (alertEventHandler != null) {
+            pipeline.addLast("AlertEventHandler", alertEventHandler);
+        }
+
         pipeline.addLast("mainHandler", new MainEventHandler());
         return pipeline;
     }
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
index 1b8d93e34..45374ca15 100644
--- a/src/org/traccar/Main.java
+++ b/src/org/traccar/Main.java
@@ -16,10 +16,13 @@
 package org.traccar;
 
 import org.traccar.helper.Log;
-
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.Locale;
 
 public final class Main {
+    static final long cleanDelay = 10*1000;
+    static final long cleanPeriod = 24*60*60*1000;
 
     private Main() {
     }
@@ -35,6 +38,18 @@ public final class Main {
             Context.getWebServer().start();
         }
 
+        Timer timer = new Timer();
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    Context.getDataManager().clearPositionsHistory();
+                } catch (Exception error) {
+                    Log.warning(error);
+                }
+            }
+        }, cleanDelay, cleanPeriod);
+
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
             public void run() {
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 0aecaf2e7..e5a245568 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -398,6 +398,33 @@ public class DataManager {
                 .executeQuery(Position.class);
     }
 
+    public void clearPositionsHistory() throws SQLException {
+        //SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+        int histDays = config.getInteger("database.positionsHistoryDays");
+        if (histDays == 0) {
+            return;
+        }
+
+        String sql = getQuery("database.clearPositionsHistory");
+        if (sql == null) {
+            return;
+        }
+
+        for (Device device : getAllDevices()) {
+            Date lastUpdate = device.getLastUpdate();
+            if(lastUpdate != null){
+
+                Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000 );
+                //String dt = s.format(dateBefore);
+
+                QueryBuilder.create(dataSource, sql)
+                        .setLong("deviceId", device.getId())
+                        .setDate("serverTime", dateBefore)
+                        .executeUpdate();
+            }
+        }
+    }
+
     public Server getServer() throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectServers"))
                 .executeQuerySingle(Server.class);
diff --git a/src/org/traccar/events/AlertEventHandler.java b/src/org/traccar/events/AlertEventHandler.java
new file mode 100644
index 000000000..92d1566a7
--- /dev/null
+++ b/src/org/traccar/events/AlertEventHandler.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package org.traccar.events;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class AlertEventHandler extends BaseEventHandler {
+
+    @Override
+    protected Collection<Event> analyzePosition(Position position) {
+        Object alarm = position.getAttributes().get(Position.KEY_ALARM);
+        if (alarm != null) {
+            Collection<Event> events = new ArrayList<>();
+            if(alarm.equals(Event.TYPE_SOS_ALARM)){
+                events.add(new Event(Event.TYPE_SOS_ALARM, position.getDeviceId(), position.getId()));
+            } else if(alarm.equals(Event.TYPE_VIBRATION_ALARM)){
+                events.add(new Event(Event.TYPE_VIBRATION_ALARM, position.getDeviceId(), position.getId()));
+            } else if(alarm.equals(Event.TYPE_MOVEMENT_ALARM)){
+                events.add(new Event(Event.TYPE_MOVEMENT_ALARM, position.getDeviceId(), position.getId()));
+            } else if(alarm.equals(Event.TYPE_OVERSPEED_ALARM)){
+                events.add(new Event(Event.TYPE_OVERSPEED_ALARM, position.getDeviceId(), position.getId()));
+            }
+            return events;
+        }
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 235a39f9a..3a0056bd6 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -48,6 +48,11 @@ public class Event extends Message {
     public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
     public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
 
+    public static final String TYPE_SOS_ALARM = "sosAlarm";
+    public static final String TYPE_VIBRATION_ALARM = "vibrationAlarm";
+    public static final String TYPE_MOVEMENT_ALARM = "movementAlarm";
+    public static final String TYPE_OVERSPEED_ALARM = "overspeedAlarm";
+
     private Date serverTime;
 
     public Date getServerTime() {
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index ec5d3adef..09375958e 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -24,6 +24,7 @@ import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -64,8 +65,20 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
 
     private void processStatus(Position position, long status) {
         if (!BitUtil.check(status, 0) || !BitUtil.check(status, 1)
-                || !BitUtil.check(status, 3) || !BitUtil.check(status, 4)) {
-            position.set(Position.KEY_ALARM, true);
+                || !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) {
+
+            if (!BitUtil.check(status, 0)){
+                position.set(Position.KEY_ALARM, Event.TYPE_VIBRATION_ALARM);//theft alarm
+            } else if (!BitUtil.check(status, 1)){
+                position.set(Position.KEY_ALARM, "robbery");
+            } else if (!BitUtil.check(status, 3)){
+                position.set(Position.KEY_ALARM, "illegal ignition");
+            } else if (!BitUtil.check(status, 4)){
+                position.set(Position.KEY_ALARM, "entering");
+            } else if (!BitUtil.check(status, 7)){
+                position.set(Position.KEY_ALARM, "out");
+            }
+
         }
         position.set(Position.KEY_IGNITION, !BitUtil.check(status, 10));
         position.set(Position.KEY_STATUS, status);
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 5527e80f3..4ef31b1df 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -118,6 +118,9 @@ public class WebServer {
         resourceHandler.setResourceBase(config.getString("web.path"));
         if (config.getBoolean("web.debug")) {
             resourceHandler.setWelcomeFiles(new String[] {"debug.html"});
+            //Troubleshooting Locked UI Files on Windows while app is running (like html, js, css, etc...),
+            //you can make changes to the UI Files and refresh the page in the browser without stopping the app first
+            resourceHandler.setMinMemoryMappedContentLength(-1);
         } else {
             resourceHandler.setWelcomeFiles(new String[] {"release.html", "index.html"});
         }
diff --git a/tools/minify.bat b/tools/minify.bat
new file mode 100644
index 000000000..6ab8fd94b
--- /dev/null
+++ b/tools/minify.bat
@@ -0,0 +1,5 @@
+@echo off
+cd C:\[traccar path]\traccar\web
+set SDK=C:\[sencha path]\ext-6.0.0
+
+sencha -sdk %SDK% compile -classpath=app.js,app,%SDK%\packages\core\src,%SDK%\packages\core\overrides,%SDK%\classic\classic\src,%SDK%\classic\classic\overrides exclude -all and include -recursive -file app.js and exclude -namespace=Ext and concatenate -closure app.min.js
diff --git a/tools/test-generator.py b/tools/test-generator.py
index 681d1755d..54e5feced 100755
--- a/tools/test-generator.py
+++ b/tools/test-generator.py
@@ -32,8 +32,10 @@ for i in range(0, len(waypoints)):
         lon = lon1 + (lon2 - lon1) * j / count
         points.append((lat, lon))
 
-def send(lat, lon, course):
+def send(lat, lon, course, alarm):
     params = (('id', id), ('timestamp', int(time.time())), ('lat', lat), ('lon', lon), ('bearing', course))
+    if alarm:
+        params = params + (('alarm', 'sosAlarm'),)
     urllib2.urlopen(server + '?' + urllib.urlencode(params)).read()
 
 def course(lat1, lon1, lat2, lon2):
@@ -50,6 +52,7 @@ index = 0
 while True:
     (lat1, lon1) = points[index % len(points)]
     (lat2, lon2) = points[(index + 1) % len(points)]
-    send(lat1, lon1, course(lat1, lon1, lat2, lon2))
+    alarm = ((index % 10) == 0)
+    send(lat1, lon1, course(lat1, lon1, lat2, lon2), alarm)
     time.sleep(period)
     index += 1
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 3432ca1e0..e14a9539b 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -34,6 +34,24 @@ Ext.define('Traccar.AttributeFormatter', {
         return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit'));
     },
 
+    alarmFormatter: function (attributes) {
+        var value = '';
+        if (attributes instanceof Object) {//for Traccar.view.Attributes
+            if (attributes.hasOwnProperty('alarm')){
+                value = attributes.alarm;
+                if (typeof value === 'boolean') {
+                    value = (value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no);
+                }
+            }
+        } else {//for Traccar.view.Report
+            value = attributes;
+            if (typeof value === 'boolean') {
+                value = (value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no);
+            }
+        }
+        return '<span style="color:red;">' + value + '</span>';
+    },
+
     defaultFormatter: function (value) {
         if (typeof value === 'number') {
             return Number(value.toFixed(Traccar.Style.numberPrecision));
@@ -58,6 +76,8 @@ Ext.define('Traccar.AttributeFormatter', {
             return this.courseFormatter;
         } else if (key === 'distance' || key === 'odometer') {
             return this.distanceFormatter;
+        } else if (key === 'alarm') {
+            return this.alarmFormatter;
         } else {
             return this.defaultFormatter;
         }
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 98ded9c47..dec3c9158 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -89,6 +89,17 @@ Ext.define('Traccar.controller.Root', {
         }
     },
 
+    beep: function() {
+        if(this.snd == null){
+            this.snd = new Audio("data:audio/wav;base64,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qJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//8elePK/Lf//IInrOF/FvDoADYAGBMGb7FtErm5MXMlmPAJQVgWta7Zx2go+8xJ0UiCb8LHHdftWyLJE0QIAIsI+UbXu67dZMjmgDGCGl1H+vpF4NSDckSIkk7Vd+sxEhBQMRU8j/12UIRhzSaUdQ+rQU5kGeFxm+hb1oh6pWWmv3uvmReDl0UnvtapVaIzo1jZbf/pD6ElLqSX+rUmOQNpJFa/r+sa4e/pBlAABoAAAAA3CUgShLdGIxsY7AUABPRrgCABdDuQ5GC7DqPQCgbbJUAoRSUj+NIEig0YfyWUho1VBBBA//uQZB4ABZx5zfMakeAAAAmwAAAAF5F3P0w9GtAAACfAAAAAwLhMDmAYWMgVEG1U0FIGCBgXBXAtfMH10000EEEEEECUBYln03TTTdNBDZopopYvrTTdNa325mImNg3TTPV9q3pmY0xoO6bv3r00y+IDGid/9aaaZTGMuj9mpu9Mpio1dXrr5HERTZSmqU36A3CumzN/9Robv/Xx4v9ijkSRSNLQhAWumap82WRSBUqXStV/YcS+XVLnSS+WLDroqArFkMEsAS+eWmrUzrO0oEmE40RlMZ5+ODIkAyKAGUwZ3mVKmcamcJnMW26MRPgUw6j+LkhyHGVGYjSUUKNpuJUQoOIAyDvEyG8S5yfK6dhZc0Tx1KI/gviKL6qvvFs1+bWtaz58uUNnryq6kt5RzOCkPWlVqVX2a/EEBUdU1KrXLf40GoiiFXK///qpoiDXrOgqDR38JB0bw7SoL+ZB9o1RCkQjQ2CBYZKd/+VJxZRRZlqSkKiws0WFxUyCwsKiMy7hUVFhIaCrNQsKkTIsLivwKKigsj8XYlwt/WKi2N4d//uQRCSAAjURNIHpMZBGYiaQPSYyAAABLAAAAAAAACWAAAAApUF/Mg+0aohSIRobBAsMlO//Kk4soosy1JSFRYWaLC4qZBYWFRGZdwqKiwkNBVmoWFSJkWFxX4FFRQWR+LsS4W/rFRb/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////VEFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU291bmRib3kuZGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMjAwNGh0dHA6Ly93d3cuc291bmRib3kuZGUAAAAAAAAAACU=");
+        }
+        this.snd.play();
+    },
+
+    showAlarmSelected: function () {
+        return Ext.getCmp('showAlarmButton') && Ext.getCmp('showAlarmButton').pressed;
+    },
+
     asyncUpdate: function (first) {
         var protocol, socket, self = this;
         protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -160,7 +171,10 @@ Ext.define('Traccar.controller.Root', {
                     }
                     device = Ext.getStore('Devices').getById(array[i].deviceId);
                     if (typeof device !== 'undefined') {
-                        Ext.toast(text, device.getData().name);
+                        if(self.showAlarmSelected()){
+                            self.beep();
+                            Ext.toast(text, device.getData().name);
+                        }
                     }
                 }
             }
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 1a70dfef8..77d796b1e 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -57,6 +57,24 @@ Ext.define('Traccar.view.Devices', {
             tooltipType: 'title'
         }, {
             xtype: 'tbfill'
+        },{
+            id: 'showAlarmButton',
+            glyph: 'xf0a2@FontAwesome',
+            tooltip: 'Show Alarms',
+            tooltipType: 'title',
+            pressed : true,
+            enableToggle: true,
+            listeners:{
+                toggle: function(button, pressed){
+                    if(pressed){
+                        button.setGlyph('xf0a2@FontAwesome');
+                    }
+                    else {
+                        button.setGlyph('xf1f7@FontAwesome');
+                    }
+                },
+                scope:this
+            }
         }, {
             id: 'deviceFollowButton',
             glyph: 'xf05b@FontAwesome',
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 4261b9040..78ff5d52f 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -115,5 +115,10 @@ Ext.define('Traccar.view.Report', {
         dataIndex: 'address',
         flex: 1,
         renderer: Traccar.AttributeFormatter.getFormatter('address')
+    }, {
+        text: 'Alarm',
+        dataIndex: 'attributes',
+        flex: 1,
+        renderer: Traccar.AttributeFormatter.getFormatter('alarm')
     }]
 });
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e97bb45b1..2f930a27c 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -118,6 +118,10 @@
     "eventCommandResult": "Command result",
     "eventGeofenceEnter": "Device has entered geofence",
     "eventGeofenceExit": "Device has exited geofence",
+    "eventSosAlarm": "SOS alarm",
+    "eventVibrationAlarm": "Vibration alarm",
+    "eventMovementAlarm": "Movement alarm",
+    "eventOverspeedAlarm": "Overspeed alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail"