2 files changed, 47 insertions, 0 deletions
diff --git a/web/app/view/CommandDialog.js b/web/app/view/CommandDialog.js
index af36f558..24e0e191 100644
--- a/web/app/view/CommandDialog.js
+++ b/web/app/view/CommandDialog.js
@@ -90,6 +90,33 @@ Ext.define('Traccar.view.CommandDialog', {
                 hidden: true
             }]
         }, {
+            xtype: 'fieldcontainer',
+            reference: 'paramSetTimezone',
+            name: 'attributes',
+            hidden: true,
+
+            items: [{
+                xtype: 'numberfield',
+                fieldLabel: Strings.commandTimezone,
+                name: 'timezone',
+                minValue: -12,
+                step: 0.5,
+                maxValue: +14
+            }]
+        }, {
+            xtype: 'fieldcontainer',
+            reference: 'paramSetIndicator',
+            name: 'attributes',
+            hidden: true,
+
+            items: [{
+                xtype: 'numberfield',
+                fieldLabel: Strings.commandData,
+                name: 'data',
+                minValue: 0,
+                maxValue: 99
+            }]
+        }, {
             xtype: 'textfield',
             reference: 'paramCustom',
             fieldLabel: Strings.commandCustom,
diff --git a/web/app/view/CommandDialogController.js b/web/app/view/CommandDialogController.js
index 9442e4f4..6e809fa1 100644
--- a/web/app/view/CommandDialogController.js
+++ b/web/app/view/CommandDialogController.js
@@ -28,6 +28,10 @@ Ext.define('Traccar.view.CommandDialogController', {
             selected.getValue() !== 'sendSms' && selected.getValue() !== 'sendUssd');
         this.lookupReference('paramSmsMessage').setHidden(
             selected.getValue() !== 'sendSms');
+        this.lookupReference('paramSetTimezone').setHidden(
+            selected.getValue() !== 'setTimezone');
+        this.lookupReference('paramSetIndicator').setHidden(
+            selected.getValue() !== 'setIndicator');
         this.lookupReference('paramCustom').setHidden(
             selected.getValue() !== 'custom');
     },
@@ -78,6 +82,22 @@ Ext.define('Traccar.view.CommandDialogController', {
             });
         }
 
+        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', {