Add room to device msg (#43)

* #43 Add room to device msg Signed-off-by: hxmelab <hxmelab@gmail.com> * #43 Merge master Signed-off-by: hxmelab <hxmelab@gmail.com>
hxmelab · Mar 8, 2021 · 7f06731 · 7f06731
1 parent c0f617c
commit 7f06731
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/nodes/shc-device.html b/nodes/shc-device.html
@@ -42,7 +42,7 @@
                             'IntrusionDetectionControl,Keypad,LatestMotion,' +
                             'PowerMeter,PowerSwitch,PresenceSimulationConfiguration,' +
                             'PrivacyMode,RoomClimateControl,ShutterContact, ' +
-                            'ShutterControl, SmokeDetectorCheck,TemperatureLevel,ValveTappet,' +
+                            'ShutterControl,SmokeDetectorCheck,TemperatureLevel,ValveTappet,' +
                             'MultiLevelSwitch,HSBColorActuator,HueColorTemperature,HueBlinkingActuator,' +
                             'BinarySwitch';
 
@@ -54,7 +54,7 @@
                 const shcConfig = RED.nodes.node($('#node-input-shc').val());
                 const selectDevice = $('#node-input-device');
 
-                function format(device) {
+                function format(device, roomName) {
                     let services = '';
 
                     try {
@@ -69,7 +69,7 @@
                     }
 
                     return $('<option/>')
-                        .val(device.name + '|' + device.id + '|' + device.deviceModel + '|' + services)
+                        .val(device.name + '|' + device.id + '|' + device.deviceModel + '|' + services + '|' + roomName)
                         .text(device.name);
                 }
 
@@ -112,7 +112,7 @@
                         const optGroup = $('<optgroup label="Devices"></optgroup>');
                         selectDevice.append(optGroup);
                         optGroup.append($('<option/>')
-                            .val('all|all|all|' + supportedServices)
+                            .val('all|all|all|' + supportedServices + '|')
                             .text('All Devices'));
 
                         // Service in this context means e.g. alarm system, presence simulation,
@@ -134,7 +134,7 @@
                             const roomGroup = $('<optgroup label="' + roomName + '"></optgroup>');
                             selectDevice.append(roomGroup);
                             deviceList.reduce((parent, device) => {
-                                parent.append(format(device));
+                                parent.append(format(device, roomName));
                                 return parent;
                             }, roomGroup);
                         }, this);

diff --git a/nodes/shc-device.js b/nodes/shc-device.js
@@ -13,6 +13,7 @@ module.exports = function (RED) {
             this.deviceName = config.device.split('|')[0];
             this.deviceId = config.device.split('|')[1];
             this.deviceModel = config.device.split('|')[2];
+            this.roomName = config.device.split('|')[4];
             this.serviceId = config.service;
             this.state = config.state;
             this.poll = config.poll;
@@ -100,7 +101,7 @@ module.exports = function (RED) {
         }
 
         setMsgObject(data) {
-            const msg = {topic: (this.name || this.deviceName)};
+            const msg = {topic: (this.name || this.deviceName), room: this.roomName};
             if (this.serviceId && this.state) {
                 if (data.state && Object.prototype.hasOwnProperty.call(data.state, this.state)) {
                     msg.payload = this.convertState(data.state[this.state]);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-bosch-shc",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "description": "Bosch Smart Home Controller (SHC) nodes for Node-Red",
   "repository": "https://github.com/hxmelab/node-red-contrib-bosch-shc",
   "main": "none",