Merge branch 'master' into disable_vehicle_features

5 files changed, 76 insertions, 80 deletions

diff --git a/web/app/view/dialog/CalendarController.js b/web/app/view/dialog/CalendarController.js
index 14d8294..fb8cbff 100644
--- a/web/app/view/dialog/CalendarController.js
+++ b/web/app/view/dialog/CalendarController.js
@@ -26,12 +26,12 @@ Ext.define('Traccar.view.dialog.CalendarController', {
             reader = new FileReader();
             reader.onload = function (event) {
                 fileField.up('window').lookupReference('dataField').setValue(
-                        btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result))));
+                    event.target.result.substr(event.target.result.indexOf(',') + 1));
             };
             reader.onerror = function (event) {
                 Traccar.app.showError(event.target.error);
             };
-            reader.readAsArrayBuffer(fileField.fileInputEl.dom.files[0]);
+            reader.readAsDataURL(fileField.fileInputEl.dom.files[0]);
         }
     }
 });
diff --git a/web/app/view/dialog/CommandController.js b/web/app/view/dialog/CommandController.js
index 8c566da..3fdc7b0 100644
--- a/web/app/view/dialog/CommandController.js
+++ b/web/app/view/dialog/CommandController.js
@@ -43,66 +43,62 @@ Ext.define('Traccar.view.dialog.CommandController', {
         form.updateRecord();
         record = form.getRecord();
 
-        if (record.get('type') === 'positionPeriodic') {
-            attributes = this.lookupReference('paramPositionPeriodic');
-            value = attributes.down('numberfield[name="frequency"]').getValue();
-            value *= attributes.down('combobox[name="unit"]').getValue();
-
-            record.set('attributes', {
-                frequency: value
-            });
-        }
-
-        if (record.get('type') === 'outputControl') {
-            attributes = this.lookupReference('paramOutputControl');
-            index = attributes.down('numberfield[name="index"]').getValue();
-            value = attributes.down('textfield[name="data"]').getValue();
-
-            record.set('attributes', {
-                index: index,
-                data: value
-            });
-        }
-
-        if (record.get('type') === 'sendUssd') {
-            attributes = this.lookupReference('paramSendSmsUssd');
-            phone = attributes.down('textfield[name="phone"]').getValue();
-            record.set('attributes', {
-                phone: phone
-            });
-        }
-
-        if (record.get('type') === 'sendSms') {
-            attributes = this.lookupReference('paramSendSmsUssd');
-            phone = attributes.down('textfield[name="phone"]').getValue();
-            value = attributes.down('textfield[name="message"]').getValue();
-            record.set('attributes', {
-                phone: phone,
-                message: value
-            });
-        }
-
-        if (record.get('type') === 'setTimezone') {
-            attributes = this.lookupReference('paramSetTimezone');
-            value = attributes.down('numberfield[name="timezone"]').getValue();
-            record.set('attributes', {
-                timezone: value * 3600
-            });
-        }
-
-        if (record.get('type') === 'setIndicator') {
-            attributes = this.lookupReference('paramSetIndicator');
-            value = attributes.down('numberfield[name="data"]').getValue();
-            record.set('attributes', {
-                data: value
-            });
-        }
-
-        if (record.get('type') === 'custom') {
-            value = this.lookupReference('paramCustom').getValue();
-            record.set('attributes', {
-                data: value
-            });
+        switch (record.get('type')) {
+            case 'positionPeriodic':
+                attributes = this.lookupReference('paramPositionPeriodic');
+                value = attributes.down('numberfield[name="frequency"]').getValue();
+                value *= attributes.down('combobox[name="unit"]').getValue();
+                record.set('attributes', {
+                    frequency: value
+                });
+                break;
+            case 'outputControl':
+                attributes = this.lookupReference('paramOutputControl');
+                index = attributes.down('numberfield[name="index"]').getValue();
+                value = attributes.down('textfield[name="data"]').getValue();
+                record.set('attributes', {
+                    index: index,
+                    data: value
+                });
+                break;
+            case 'sendUssd':
+                attributes = this.lookupReference('paramSendSmsUssd');
+                phone = attributes.down('textfield[name="phone"]').getValue();
+                record.set('attributes', {
+                    phone: phone
+                });
+                break;
+            case 'sendSms':
+                attributes = this.lookupReference('paramSendSmsUssd');
+                phone = attributes.down('textfield[name="phone"]').getValue();
+                value = attributes.down('textfield[name="message"]').getValue();
+                record.set('attributes', {
+                    phone: phone,
+                    message: value
+                });
+                break;
+            case 'setTimezone':
+                attributes = this.lookupReference('paramSetTimezone');
+                value = attributes.down('numberfield[name="timezone"]').getValue();
+                record.set('attributes', {
+                    timezone: value * 3600
+                });
+                break;
+            case 'setIndicator':
+                attributes = this.lookupReference('paramSetIndicator');
+                value = attributes.down('numberfield[name="data"]').getValue();
+                record.set('attributes', {
+                    data: value
+                });
+                break;
+            case 'custom':
+                value = this.lookupReference('paramCustom').getValue();
+                record.set('attributes', {
+                    data: value
+                });
+                break;
+            default:
+                break;
         }
 
         Ext.Ajax.request({
diff --git a/web/app/view/dialog/LoginController.js b/web/app/view/dialog/LoginController.js
index 1b5cd07..c25d9a8 100644
--- a/web/app/view/dialog/LoginController.js
+++ b/web/app/view/dialog/LoginController.js
@@ -86,14 +86,12 @@ Ext.define('Traccar.view.dialog.LoginController', {
             prefix = url.substring(0, url.indexOf(paramName));
             suffix = url.substring(url.indexOf(paramName));
             suffix = suffix.substring(suffix.indexOf('=') + 1);
-            suffix = (suffix.indexOf('&') >= 0) ? suffix.substring(suffix.indexOf('&')) : '';
+            suffix = suffix.indexOf('&') >= 0 ? suffix.substring(suffix.indexOf('&')) : '';
             url = prefix + paramName + '=' + paramValue + suffix;
+        } else if (url.indexOf('?') < 0) {
+            url += '?' + paramName + '=' + paramValue;
         } else {
-            if (url.indexOf('?') < 0) {
-                url += '?' + paramName + '=' + paramValue;
-            } else {
-                url += '&' + paramName + '=' + paramValue;
-            }
+            url += '&' + paramName + '=' + paramValue;
         }
         window.location.href = url;
     },
diff --git a/web/app/view/dialog/MapPickerController.js b/web/app/view/dialog/MapPickerController.js
index 23f60ec..8641e37 100644
--- a/web/app/view/dialog/MapPickerController.js
+++ b/web/app/view/dialog/MapPickerController.js
@@ -30,7 +30,7 @@ Ext.define('Traccar.view.dialog.MapPickerController', {
         }
     },
 
-    getMapState: function (button) {
+    getMapState: function () {
         this.fireEvent('mapstaterequest');
     },
 
diff --git a/web/app/view/dialog/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js
index 7233562..ce66371 100644
--- a/web/app/view/dialog/ReportConfigController.js
+++ b/web/app/view/dialog/ReportConfigController.js
@@ -26,23 +26,25 @@ Ext.define('Traccar.view.dialog.ReportConfigController', {
     ],
 
     onSaveClick: function (button) {
-        var eventType;
-        this.getView().callingPanel.deviceId = this.lookupReference('deviceField').getValue();
-        this.getView().callingPanel.groupId = this.lookupReference('groupField').getValue();
+        var eventType, callingPanel;
+        callingPanel = this.getView().callingPanel;
+
+        callingPanel.deviceId = this.lookupReference('deviceField').getValue();
+        callingPanel.groupId = this.lookupReference('groupField').getValue();
         eventType = this.lookupReference('eventTypeField').getValue();
         if (eventType.indexOf(Traccar.store.ReportEventTypes.allEvents) > -1) {
             eventType = [Traccar.store.ReportEventTypes.allEvents];
         } else if (eventType.length === this.lookupReference('eventTypeField').getStore().getCount() - 1) {
             eventType = [Traccar.store.ReportEventTypes.allEvents];
         }
-        this.getView().callingPanel.eventType = eventType;
-        this.getView().callingPanel.chartType = this.lookupReference('chartTypeField').getValue();
-        this.getView().callingPanel.showMarkers = this.lookupReference('showMarkersField').getValue();
-        this.getView().callingPanel.fromDate = this.lookupReference('fromDateField').getValue();
-        this.getView().callingPanel.fromTime = this.lookupReference('fromTimeField').getValue();
-        this.getView().callingPanel.toDate = this.lookupReference('toDateField').getValue();
-        this.getView().callingPanel.toTime = this.lookupReference('toTimeField').getValue();
-        this.getView().callingPanel.updateButtons();
+        callingPanel.eventType = eventType;
+        callingPanel.chartType = this.lookupReference('chartTypeField').getValue();
+        callingPanel.showMarkers = this.lookupReference('showMarkersField').getValue();
+        callingPanel.fromDate = this.lookupReference('fromDateField').getValue();
+        callingPanel.fromTime = this.lookupReference('fromTimeField').getValue();
+        callingPanel.toDate = this.lookupReference('toDateField').getValue();
+        callingPanel.toTime = this.lookupReference('toTimeField').getValue();
+        callingPanel.updateButtons();
         button.up('window').close();
     }
 });