diff options
author | ninioe <ninioe@gmail.com> | 2016-07-12 16:04:40 +0300 |
---|---|---|
committer | ninioe <ninioe@gmail.com> | 2016-07-12 16:04:40 +0300 |
commit | d045c1e2174146ddc8ad8b2ef4442863f3d84a11 (patch) | |
tree | 458ac9a09ef9df6426a34067072164c44ac18020 /web/app/AttributeFormatter.js | |
parent | 8d5b4ec5ec8e4aaa2c34793e3100a7782551afbd (diff) | |
download | trackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.tar.gz trackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.tar.bz2 trackermap-server-d045c1e2174146ddc8ad8b2ef4442863f3d84a11.zip |
Added support for Alarm popup & positions history cleaner
1. added support for Alarm and Alarm Type in popup and also in history
records. can be muted with a toggle button in the UI
2. added a timer to clear positions history once a day. the default is
to save positions history for 7 days if not defined in the configuration
file.
3. prevent the lock of the UI files (js, html, css, etc..) for wondows
developers in debug mode. It's easier to do changes to the UI without
stopping the app each time.
4. tools: added support in test-generator.py to simulate Alert, also
added minify.bat file to compile new js files for the UI using sencha
SDK for windows developers
Diffstat (limited to 'web/app/AttributeFormatter.js')
-rw-r--r-- | web/app/AttributeFormatter.js | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 3432ca1e0..51b479b9a 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -34,6 +34,34 @@ Ext.define('Traccar.AttributeFormatter', { return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit')); }, + //added by Erez + alarmFormatter: function (attributes) { + if (attributes instanceof Object) { + if (attributes.hasOwnProperty('alarm')){ + var value = attributes.alarm; + if (typeof value === 'boolean') { + value = (value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no); + } + return '<span style="color:red;">' + value + '</span>'; + } + } + return ''; + }, + + //added by Erez + alarmTypeFormatter: function (attributes) { + var alatmType = ''; + if (attributes instanceof Object) { + for (key in attributes) { + if (attributes.hasOwnProperty(key) && key.toLowerCase()=='alarm-type') { + alatmType = attributes[key]; + break; + } + } + } + return '<span style="color:red;">' + alatmType + '</span>'; + }, + defaultFormatter: function (value) { if (typeof value === 'number') { return Number(value.toFixed(Traccar.Style.numberPrecision)); @@ -58,6 +86,10 @@ Ext.define('Traccar.AttributeFormatter', { return this.courseFormatter; } else if (key === 'distance' || key === 'odometer') { return this.distanceFormatter; + } else if (key === 'alarm') {//added by Erez + return this.alarmFormatter; + } else if (key === 'alarm-type') {//added by Erez + return this.alarmTypeFormatter; } else { return this.defaultFormatter; } |