From aacdef70bf1eaacb9ec334a8b81b926c5aec57a9 Mon Sep 17 00:00:00 2001 From: theautomation Date: Fri, 22 Mar 2024 20:14:16 +0100 Subject: [PATCH] Fix Guestmode message is wrong close #33 --- src/data/flows/scene_home_leaving.json | 284 ++++++++++++------------- 1 file changed, 142 insertions(+), 142 deletions(-) diff --git a/src/data/flows/scene_home_leaving.json b/src/data/flows/scene_home_leaving.json index d68eb62..208f4a3 100644 --- a/src/data/flows/scene_home_leaving.json +++ b/src/data/flows/scene_home_leaving.json @@ -7,7 +7,7 @@ "info": "" }, { - "id": "14187342a7b09482", + "id": "cc3f4f06d9ee1050", "type": "group", "z": "8aa6edec.5a013", "name": "notify", @@ -15,18 +15,16 @@ "label": true }, "nodes": [ - "19cfd22b49a2e356", - "8aa74b4cb48558f8", - "3bdaf73ce37b7397", - "d512fe1ba0adbf42", - "83e460c17170065f", - "1b8772493fd3aa94", - "c8db6380b138fd4e" + "8bd431aac8edba25", + "1d9212ada487b166", + "2d9c5a51a0d3d65a", + "934778f06d5ff810", + "11441b9d4ec597d9" ], "x": 1594, - "y": 239, + "y": 459, "w": 412, - "h": 202 + "h": 162 }, { "id": "9c946ef945c199e5", @@ -49,7 +47,7 @@ "h": 162 }, { - "id": "cc3f4f06d9ee1050", + "id": "14187342a7b09482", "type": "group", "z": "8aa6edec.5a013", "name": "notify", @@ -57,30 +55,30 @@ "label": true }, "nodes": [ - "8bd431aac8edba25", - "1d9212ada487b166", - "2d9c5a51a0d3d65a", - "934778f06d5ff810", - "11441b9d4ec597d9" + "19cfd22b49a2e356", + "8aa74b4cb48558f8", + "3bdaf73ce37b7397", + "d512fe1ba0adbf42", + "83e460c17170065f", + "1b8772493fd3aa94", + "c8db6380b138fd4e" ], "x": 1594, - "y": 459, + "y": 239, "w": 412, - "h": 162 + "h": 202 }, { - "id": "83e460c17170065f", + "id": "11441b9d4ec597d9", "type": "junction", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", + "g": "cc3f4f06d9ee1050", "x": 1620, - "y": 320, + "y": 540, "wires": [ [ - "8aa74b4cb48558f8", - "19cfd22b49a2e356", - "1b8772493fd3aa94", - "c8db6380b138fd4e" + "1d9212ada487b166", + "8bd431aac8edba25" ] ] }, @@ -99,64 +97,109 @@ ] }, { - "id": "11441b9d4ec597d9", + "id": "83e460c17170065f", "type": "junction", "z": "8aa6edec.5a013", - "g": "cc3f4f06d9ee1050", + "g": "14187342a7b09482", "x": 1620, + "y": 320, + "wires": [ + [ + "8aa74b4cb48558f8", + "19cfd22b49a2e356", + "1b8772493fd3aa94", + "c8db6380b138fd4e" + ] + ] + }, + { + "id": "934778f06d5ff810", + "type": "join", + "z": "8aa6edec.5a013", + "g": "cc3f4f06d9ee1050", + "name": "", + "mode": "custom", + "build": "merged", + "property": "notify", + "propertyType": "msg", + "key": "topic", + "joiner": "\\n", + "joinerType": "str", + "accumulate": false, + "timeout": "", + "count": "3", + "reduceRight": false, + "reduceExp": "", + "reduceInit": "", + "reduceInitType": "", + "reduceFixup": "", + "x": 1870, "y": 540, "wires": [ [ - "1d9212ada487b166", - "8bd431aac8edba25" + "2d9c5a51a0d3d65a" ] ] }, { - "id": "c8db6380b138fd4e", + "id": "2d9c5a51a0d3d65a", + "type": "link out", + "z": "8aa6edec.5a013", + "g": "cc3f4f06d9ee1050", + "name": "link_out_notify_3", + "mode": "link", + "links": [ + "8ed3b0974336e55b" + ], + "x": 1965, + "y": 540, + "wires": [] + }, + { + "id": "1d9212ada487b166", "type": "template", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", - "name": "message", - "field": "notify.message", + "g": "cc3f4f06d9ee1050", + "name": "title", + "field": "notify.title", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.", + "template": "Beveiliging", "output": "str", - "x": 1720, - "y": 320, + "x": 1710, + "y": 500, "wires": [ [ - "d512fe1ba0adbf42" + "934778f06d5ff810" ] ] }, { - "id": "1b8772493fd3aa94", + "id": "8bd431aac8edba25", "type": "template", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", - "name": "notification id", - "field": "notify.notification_id", + "g": "cc3f4f06d9ee1050", + "name": "icon", + "field": "notify.icon", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "lights", + "template": "", "output": "str", - "x": 1730, - "y": 360, + "x": 1710, + "y": 580, "wires": [ [ - "d512fe1ba0adbf42" + "934778f06d5ff810" ] ] }, { - "id": "d512fe1ba0adbf42", + "id": "f7c20be07a75c04e", "type": "join", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", + "g": "9c946ef945c199e5", "name": "", "mode": "custom", "build": "merged", @@ -167,59 +210,59 @@ "joinerType": "str", "accumulate": false, "timeout": "", - "count": "4", + "count": "3", "reduceRight": false, "reduceExp": "", "reduceInit": "", "reduceInitType": "", "reduceFixup": "", "x": 1870, - "y": 320, + "y": 120, "wires": [ [ - "3bdaf73ce37b7397" + "37c73ac2e71d9a61" ] ] }, { - "id": "3bdaf73ce37b7397", + "id": "37c73ac2e71d9a61", "type": "link out", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", - "name": "link_out_notify_2", + "g": "9c946ef945c199e5", + "name": "link_out_notify_1", "mode": "link", "links": [ - "a97f87cfab413716" + "8ed3b0974336e55b" ], "x": 1965, - "y": 320, + "y": 120, "wires": [] }, { - "id": "8aa74b4cb48558f8", + "id": "254201c717321a67", "type": "template", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", + "g": "9c946ef945c199e5", "name": "title", "field": "notify.title", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "Verlichting", + "template": "Beveiliging", "output": "str", "x": 1710, - "y": 280, + "y": 80, "wires": [ [ - "d512fe1ba0adbf42" + "f7c20be07a75c04e" ] ] }, { - "id": "19cfd22b49a2e356", + "id": "60a9200995b666e2", "type": "template", "z": "8aa6edec.5a013", - "g": "14187342a7b09482", + "g": "9c946ef945c199e5", "name": "icon", "field": "notify.icon", "fieldType": "msg", @@ -228,18 +271,18 @@ "template": "", "output": "str", "x": 1710, - "y": 400, + "y": 160, "wires": [ [ - "d512fe1ba0adbf42" + "f7c20be07a75c04e" ] ] }, { - "id": "60a9200995b666e2", + "id": "19cfd22b49a2e356", "type": "template", "z": "8aa6edec.5a013", - "g": "9c946ef945c199e5", + "g": "14187342a7b09482", "name": "icon", "field": "notify.icon", "fieldType": "msg", @@ -248,52 +291,52 @@ "template": "", "output": "str", "x": 1710, - "y": 160, + "y": 400, "wires": [ [ - "f7c20be07a75c04e" + "d512fe1ba0adbf42" ] ] }, { - "id": "254201c717321a67", + "id": "8aa74b4cb48558f8", "type": "template", "z": "8aa6edec.5a013", - "g": "9c946ef945c199e5", + "g": "14187342a7b09482", "name": "title", "field": "notify.title", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "Beveiliging", + "template": "Verlichting", "output": "str", "x": 1710, - "y": 80, + "y": 280, "wires": [ [ - "f7c20be07a75c04e" + "d512fe1ba0adbf42" ] ] }, { - "id": "37c73ac2e71d9a61", + "id": "3bdaf73ce37b7397", "type": "link out", "z": "8aa6edec.5a013", - "g": "9c946ef945c199e5", - "name": "link_out_notify_1", + "g": "14187342a7b09482", + "name": "link_out_notify_2", "mode": "link", "links": [ - "8ed3b0974336e55b" + "a97f87cfab413716" ], "x": 1965, - "y": 120, + "y": 320, "wires": [] }, { - "id": "f7c20be07a75c04e", + "id": "d512fe1ba0adbf42", "type": "join", "z": "8aa6edec.5a013", - "g": "9c946ef945c199e5", + "g": "14187342a7b09482", "name": "", "mode": "custom", "build": "merged", @@ -304,100 +347,57 @@ "joinerType": "str", "accumulate": false, "timeout": "", - "count": "3", + "count": "4", "reduceRight": false, "reduceExp": "", "reduceInit": "", "reduceInitType": "", "reduceFixup": "", "x": 1870, - "y": 120, + "y": 320, "wires": [ [ - "37c73ac2e71d9a61" + "3bdaf73ce37b7397" ] ] }, { - "id": "8bd431aac8edba25", + "id": "1b8772493fd3aa94", "type": "template", "z": "8aa6edec.5a013", - "g": "cc3f4f06d9ee1050", - "name": "icon", - "field": "notify.icon", + "g": "14187342a7b09482", + "name": "notification id", + "field": "notify.notification_id", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "", + "template": "lights", "output": "str", - "x": 1710, - "y": 580, + "x": 1730, + "y": 360, "wires": [ [ - "934778f06d5ff810" + "d512fe1ba0adbf42" ] ] }, { - "id": "1d9212ada487b166", + "id": "c8db6380b138fd4e", "type": "template", "z": "8aa6edec.5a013", - "g": "cc3f4f06d9ee1050", - "name": "title", - "field": "notify.title", + "g": "14187342a7b09482", + "name": "message", + "field": "notify.message", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "Gastmodus", + "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.", "output": "str", - "x": 1710, - "y": 500, - "wires": [ - [ - "934778f06d5ff810" - ] - ] - }, - { - "id": "2d9c5a51a0d3d65a", - "type": "link out", - "z": "8aa6edec.5a013", - "g": "cc3f4f06d9ee1050", - "name": "link_out_notify_3", - "mode": "link", - "links": [ - "8ed3b0974336e55b" - ], - "x": 1965, - "y": 540, - "wires": [] - }, - { - "id": "934778f06d5ff810", - "type": "join", - "z": "8aa6edec.5a013", - "g": "cc3f4f06d9ee1050", - "name": "", - "mode": "custom", - "build": "merged", - "property": "notify", - "propertyType": "msg", - "key": "topic", - "joiner": "\\n", - "joinerType": "str", - "accumulate": false, - "timeout": "", - "count": "3", - "reduceRight": false, - "reduceExp": "", - "reduceInit": "", - "reduceInitType": "", - "reduceFixup": "", - "x": 1870, - "y": 540, + "x": 1720, + "y": 320, "wires": [ [ - "2d9c5a51a0d3d65a" + "d512fe1ba0adbf42" ] ] },