iobroker.telegram-menu 0.7.2 → 0.8.0

package/README.md

@@ -33,6 +33,14 @@ You can create different groups with separate menus, and then assign users to th
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.8.0 (2023-10-22)
+
+-   text blocks created as a selection list, including the selection of the ID
+-   text in submenus is now editable in the textfield in the navigation
+-   set ID by open a menu
+-   get status
+-   small fixes
+
 ### 0.7.2 (2023-10-15)
 
 -   submenu Number fixed

package/admin/css/color.css

@@ -88,3 +88,6 @@ li.tab:has(.active) {
 	background-color: #575757;
 	border-color: #2a2a2a;
 }
+#newText {
+	border-top: 3px solid white;
+}

package/admin/css/style.css

@@ -96,6 +96,15 @@ h1 {
 	top: 100px !important;
 	z-index: 100;
 }
+#dialog-add-textToInput {
+	min-width: 400px !important;
+	width: 70% !important;
+	height: 90% !important;
+	max-height: 90% !important;
+	overflow: visible !important;
+	top: 0px !important;
+	z-index: 100;
+}
 #dialog-confirm div.modal-content {
 	width: 100% !important;
 }
@@ -229,3 +238,42 @@ p[data-name="newline_checkbox"] {
 .warning {
 	text-align: center;
 }
+/* Btn add Text to Input */
+.add-text {
+	display: inline-block;
+	width: calc(100% - 26px) !important;
+	margin: 0 1px !important;
+}
+.add-Text ~ a {
+	display: inline-block;
+	width: 20px;
+	margin: 0 1px 0 3px;
+}
+.add-text ~ a i {
+	font-size: 1.2rem;
+	margin: 1px 0 0 0;
+	color: white;
+}
+/* Popup add Text to input field */
+#editedTextRow {
+	position: relative;
+	bottom: -40px;
+}
+.btn-addText {
+	margin: 0.3rem;
+}
+#dialog-add-textToInput .info-text {
+	font-size: 0.8rem;
+}
+#link-github {
+	font-size: 1rem;
+	margin: 0.9rem;
+	text-decoration: underline;
+}
+.getId {
+	width: 95% !important;
+}
+.getId ~ a {
+	width: 5%;
+	display: inline-block !important;
+}

package/admin/index_m.html

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="./js/component.js"></script>
 	<script type="text/javascript" src="./js/emit.js"></script>
 	<script type="text/javascript" src="./js/global.js"></script>
+	<script type="text/javascript" src="./js/helper.js"></script>
 	<script type="text/javascript" src="../../js/translate.js"></script>
 	<script type="text/javascript" src="../../lib/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/adapter-settings.js"></script>
@@ -227,10 +228,8 @@
 				_onChange()
 				$("#dialog-confirm").hide()
 			})
-			// Confirm Dialog Btn Abort
-			$("#dialog-confirm a.btn-close").on("click", function () {
-				$("#dialog-confirm").hide()
-			})
+
+
 			// ----------------------------------------//
 			// Popup Edit Menu                         //
 			//-----------------------------------------// 
@@ -264,10 +263,6 @@
 				$("#dialog-change-groupname").hide()
 				_onChange()
 			})
-			// Abort Edit Username
-			$("#dialog-change-groupname .btn-close").click(function () {
-				$("#dialog-change-groupname").hide()
-			})
 
 			// ----------------------------------------//
 			// Navigation                              //
@@ -345,12 +340,31 @@
 			// ----------------------------------------//
 			// Dialog get ID Iobroker                  //
 			//-----------------------------------------// 	
-
+			//ANCHOR - Dialog get ID Iobroker in Action
 			$(".adapter-container").on("click", ".btn_getID", function () {
-				let $element = $(this).parent().prev().children("input")
+				let $element
+				let replaceStringWhitIdOrAddIt = false
+				if ($(this).prev().hasClass("getId")) {
+					$element = $(this).prev()
+					replaceStringWhitIdOrAddIt = true
+				} else {
+					$element = $(this).parent().prev().children("input")
+
+				}
 				showSelectIdDialog($element.val(), function (newID) {
-					$element.val(newID)
+					if (replaceStringWhitIdOrAddIt) {
+						if ($element.val().includes("id':'")) {
+							const startindex = $element.val().indexOf("id':'") + 5
+							const endindex = $element.val().indexOf("'", startindex)
+							const elementToChange = $element.val().substring(startindex, endindex)
+
+							$element.val($element.val().replace(elementToChange, newID))
+						}
+						else $element.val($element.val() + newID)
+					}
+					else $element.val(newID)
 				})
+
 			});
 
 			// ----------------------------------------//
@@ -436,7 +450,10 @@
 			// ----------------------------------------//
 			// Global                                  //
 			//-----------------------------------------// 	
-
+			//  btn-close			
+			$(".btn-close").on("click", function () {
+				$(this).parent().parent().hide()
+			})
 
 
 
@@ -644,6 +661,37 @@
 				getNewValues(socket, this, $(this).val(), usersInMenus, menus)
 				_onChange()
 			})
+
+			// ----------------------------------------//
+			// Popup add Text                          //
+			//-----------------------------------------//
+			//TODO - Add Text
+			let $htmlElement;
+			$(".adapter-container").on("click", (".add-text ~ a"), function () {
+				$("#dialog-add-textToInput").show()
+				$("#dialog-add-textToInput table").show()
+				$("#dialog-add-textToInput tbody").empty()
+				const inputGroup = $(this).data("name")
+
+				if (inputGroup === "navText" || inputGroup === "setText") {
+					$("#newText").addClass("getId")
+				} else $("#newText").removeClass("getId")
+				$htmlElement = $(this).prev()
+				helperText[inputGroup].forEach(element => {
+					$("#dialog-add-textToInput tbody").append(addTextToInputField(element))
+				});
+				$("#newText").val($($htmlElement).val())
+			})
+			$(".adapter-container").on("click", (".btn-addText"), function () {
+				$("#newText").val($("#newText").val() + " " + $(this).parent().prevAll(".data-text").children().html())
+				// $($htmlElement).val($("#newText").val())
+			})
+			$(".btn-setText").on("click", function () {
+				$($htmlElement).val($("#newText").val().trim())
+				$(this).parent().parent().hide()
+				_onChange()
+			})
+
 		})
 
 	</script>
@@ -736,8 +784,10 @@
 												type="text" value="">
 										</td>
 										<td>
-											<input class="returnText resetInput " spellcheck="false" type="text"
-												value="">
+											<input class="returnText resetInput add-text " spellcheck="false"
+												type="text" value=""><a data-name="setText"
+												class="waves-effect waves-light blue"><i
+													class="material-icons">add_circle</i></a>
 										</td>
 										<td>
 											<input type="checkbox" class="filled-in confirm_checkbox resetCheckbox" />
@@ -778,8 +828,10 @@
 										<td><a class="btn-floating btn-small waves-effect waves-light blue btn_getID"
 												title="Get ID"><i class="material-icons">edit</i></a></td>
 										<td>
-											<input class="get_text resetInput checkValue" spellcheck="false"
-												type="text">
+											<input class="get_text resetInput checkValue add-text" spellcheck="false"
+												type="text"><a data-name="getText"
+												class="waves-effect waves-light blue"><i
+													class="material-icons">add_circle</i></a>
 										</td>
 										<td><label>
 												<input type="checkbox" class="filled-in newline_checkbox" checked />
@@ -1048,7 +1100,55 @@
 					<a class="modal-action modal-close waves-effect waves-green btn btn-set"><i
 							class="large material-icons left">check</i><span class="translate">Ok</span></a>
 					<a class="modal-action modal-close waves-effect waves-green btn btn-close"><i
-							class="large material-icons left ">close</i><span class="translate">Cancel</span></a>
+							class="large material-icons left ">close</i><span class="translate">Close</span></a>
+				</div>
+			</div>
+			<!-- //!SECTION -->
+			<!-- //SECTION - Popup Add Text to Input Field -->
+			<div id="dialog-add-textToInput" class="modal modal-fixed-footer">
+				<div class="modal-content ">
+					<div class="row">
+						<div class="col12">
+							<h5 class="translate center-align">Add text to input field!</h5>
+							<a id="link-github" href="https://github.com/MiRo1310/ioBroker.telegram-menu/tree/main"
+								target="_blank">Weitere
+								Information!</a><br>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col s12">
+
+							<table>
+								<thead>
+									<tr>
+										<th style="width: 50%;">
+											<p>Text</p>
+										</th>
+										<th>
+											<p>Info</p>
+										</th>
+										<th style="width: 3%;"></th>
+									</tr>
+								</thead>
+								<tbody class="table-lines table-values">
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="row" id="editedTextRow">
+						<div class="col12">
+							<input id="newText" class="getId" spellcheck="false" type="text" class="validate"><a
+								class="btn-floating btn-small waves-effect waves-light blue btn_getID" title="Get ID"
+								style="display: none;"><i class="material-icons">edit</i></a>
+							<label for="newText">Editable Text</label>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a class="modal-action modal-close waves-effect waves-green btn btn-setText"><i
+							class="large material-icons left">check</i><span class="translate">Ok</span></a>
+					<a class="modal-action modal-close waves-effect waves-green btn btn-close"><i
+							class="large material-icons left ">close</i><span class="translate">Close</span></a>
 				</div>
 			</div>
 			<!-- //!SECTION -->

package/admin/js/component.js

@@ -21,8 +21,8 @@ function navElement(user) {
   <tbody id="${user}"name="${user}" data-name="nav" data-nosave="true" class="user_${user} table_switch_user table_entry value table-lines table-values visibilityArrowBtn" style="display:none">
     <tr class="startRow">
       <td><input type="text" data-name="call" spellcheck="false" class="isString nav-call translateV startside" value="Startside" ></td>
-      <td><input type="text" data-name="value" spellcheck="false" class="isString nav-value " value="Licht, Steckdose && Iobroker, Heizung"></td>
-      <td><input type="text" data-name="text" spellcheck="false" class="isString nav-text" value="Wähle eine Aktion"></td>
+      <td><input type="text" data-name="value" spellcheck="false" class="isString nav-value add-text" value="Licht, Steckdose && Iobroker, Heizung"><a data-name="nav" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>
+      <td><input type="text" data-name="text" spellcheck="false" class="isString nav-text add-text" value="Wähle eine Aktion"><a data-name="navText" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>
       <td></td>
       <td></td>    
       <td></td>
@@ -50,8 +50,8 @@ function newTableRow_Nav(activuser, users, array) {
 	return /*html*/ `
   <tr>
     <td><input type="text" data-name="call" spellcheck="false" class="isString nav-call" value="${call}"></td>
-    <td><input type="text" data-name="value" spellcheck="false" class="isString nav-value" value="${value}"></td>
-    <td><input type="text" data-name="text" spellcheck="false" class="isString nav-text" value="${text}"></td>    
+    <td><input type="text" data-name="value" spellcheck="false" class="isString nav-value add-text" value="${value}"><a data-name="nav" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>
+    <td><input type="text" data-name="text" spellcheck="false" class="isString nav-text add-text" value="${text}"><a data-name="navText" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>    
     <td><a class="deleteRow btn-floating btn-small waves-effect waves-light red"><i	class="material-icons">delete</i></a></td>
     <td><a class="btn-floating btn-small waves-effect waves-light blue btn_down"><i	class="material-icons" name="down">arrow_downward</i></a></td>
     <td><a class="btn-floating btn-small waves-effect waves-light blue btn_up"><i	class="material-icons" name="up">arrow_upward</i></a></td>
@@ -85,7 +85,7 @@ function createSelectTrigger(list) {
 	return element;
 }
 //SECTION - Save
-// Row in Action Popup
+// Since Second Row in Action Popup
 function newTrInAction(val, array, rows) {
 	if (!array) {
 		array = ["", "", "checked", "", "", 5000, `grafana${rows + 1}.png`, "", ""];
@@ -94,7 +94,7 @@ function newTrInAction(val, array, rows) {
 		return /*html*/ `<tr class="onResetDelete">
   <td> <input  class="get_id checkValue" spellcheck="false" value="${array[0]}" type="text"></td>
   <td><a class="btn-floating btn-small waves-effect waves-light blue btn_getID" title="Get ID"><i class="material-icons">edit</i></a></td>
-  <td><input class="get_text" spellcheck="false" type="text" value="${array[1]}"></td>
+  <td><input class="get_text add-text" spellcheck="false" type="text" value="${array[1]}"><a data-name="getText" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>
   <td><label><input type="checkbox" class="filled-in newline_checkbox" ${array[2]} /><span></span></label></td>
   <td><a class="deleteRow btn-floating btn-small waves-effect waves-light red" ><i class="material-icons">delete</i></a></td>	
   <td><a class="btn-floating btn-small waves-effect waves-light blue btn_down"><i	class="material-icons" name="down">arrow_downward</i></a></td>
@@ -105,7 +105,7 @@ function newTrInAction(val, array, rows) {
   <td> <input  class="set_id checkValue" spellcheck="false" type="text" value="${array[0]}"></td>
   <td><a class="btn-floating btn-small waves-effect waves-light blue btn_getID" title="Get ID"><i class="material-icons">edit</i></a></td>
   <td><input class="set_value checkValueSwitch" spellcheck="false" type="text" value="${array[3]}"></td>
-  <td><input class="returnText resetInput " spellcheck="false" type="text" value="${array[8]}"></td>
+  <td><input class="returnText resetInput add-text" spellcheck="false" type="text" value="${array[8]}"><a data-name="setText" class="waves-effect waves-light blue"><i	class="material-icons">add_circle</i></a></td>
 	<td><label><input type="checkbox" class="filled-in confirm_checkbox" ${array[7]}/><span></span></label></td>
   <td><label><input type="checkbox" class="filled-in switch_checkbox" ${array[4]}/><span></span></label></td>
   <td><a class="deleteRow btn-floating btn-small waves-effect waves-light red"><i	class="material-icons">delete</i></a></td>
@@ -271,3 +271,14 @@ function insertVal(result, entry) {
 function newSelectInstanceRow(id) {
 	return `<option value="${id}">${id}</option>`;
 }
+
+function addTextToInputField(element) {
+	let btn = "";
+	if (element.text != "")
+		btn = /*html*/ `<a class="btn-floating btn-small waves-effect waves-light blue btn-addText"><i class="material-icons">add</i></a>`;
+	return /*html*/ `<tr>
+                      <td class="data-text"><p >${element.text}</p></td>
+                      <td><p class="info-text">${element.info}</p></td>
+                      <td>${btn}</td>
+                  </tr>`;
+}

package/admin/js/emit.js

@@ -37,7 +37,7 @@ function getAllTelegramInstances(socket, _this) {
 			function (err, doc) {
 				if (!err && doc.rows.length) {
 					for (let i = 0; i < doc.rows.length; i++) {
-						console.log(doc.rows[i]);
+						// console.log(doc.rows[i]);
 						if (
 							(doc.rows[i].value &&
 								doc.rows[i].value.common &&

package/admin/js/helper.js

@@ -0,0 +1,61 @@
+/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "helperText"}]*/
+
+const globalText = {
+	text1: "TRIGGER durch einen eindeutigen Wert ersetzen.",
+	textID: "Um eine ID einzufügen, einfach erst den Block einfügen, ID auswählen diese wird dann automatisch an der passenden Stelle eingefügt, auch wenn die ID geändert werden soll. Wenn der Code den Block nicht erkennt, wird die ID am Ende angehängt.",
+};
+const helperText = {
+	nav: [
+		{
+			text: "menu:percent10:TRIGGER:",
+			info:
+				"<strong>Submenu Prozent</strong><br> 10 kann ersetzt werden und gibt die Schrittweite an 0%, 10%, 20%...! " +
+				globalText.text1 +
+				" Dieser wird in Aktion unter SetState genutzt. Die gewünschte ID eintragen. Unter Wert ein ! einfügen",
+		},
+		{
+			text: "menu:number0-6-1-UNIT:TRIGGER:",
+			info:
+				"<strong>Submenu Number</strong><br> Die Zahlen können komplett ausgetauscht werden. 0-6 gibt die Spanne an, und 1 die Schrittweite, UNIT wird durch eine Einheit ersetzt, kann aber auch leer bleiben. " +
+				globalText.text1,
+		},
+		{
+			text: "menu:switch-ein.true-aus.false:TRIGGER:",
+			info:
+				"<strong>Submenu Switch</strong><br> Generiert zwei Buttons, in diesem Fall ein und aus mit den jeweiligen Werten true und false. " +
+				globalText.text1,
+		},
+		{ text: "menu:back", info: "Beim Betätigen springt man in das vorherige Menu zurück." },
+	],
+	navText: [
+		{
+			text: "{status:'id':'ID'}",
+			info: "Fragt den Wert der ID ab, und wird dann durch den Wert ersetzt, so kann Text runtherum geschrieben werden.",
+		},
+		{
+			text: "{set:'id':'ID',val,ack}",
+			info: "Setzt den Wert der ID auf den val, mit ack(bestätigt)",
+		},
+		{ text: "", info: globalText.textID },
+	],
+	getText: [
+		{ text: "{math:/10}", info: "Rechnet den Wert um, /10 kann ersetzt werden" },
+		{ text: "{time}", info: "Wandelt einen Unix-Zeitstempel zu einer lokalen Zeit um" },
+		{ text: "{common.name}", info: "Gibt den Namen des Datenpunkts aus" },
+		{ text: "&&", info: "Platzhalter für das Value" },
+	],
+	setText: [
+		{ text: "{novalue}", info: "Das Value wird im Rückgabetext nicht angegeben" },
+		{ text: "ack:true", info: "Bestätigt den Wert" },
+		{
+			text: 'change{"true":"an","false":"aus"}',
+			info: "Ändert den Wert in dem RückgabeText, in diesem Fall von true zu an und false zu aus",
+		},
+		{ text: "&&", info: "Platzhalter für das Value" },
+		{
+			text: "{'id':'ID','text':'Wert wurde gesetzt:'}",
+			info: "Wenn man die Änderung eines anderen Datenpunkts mitgeteilt bekommmen möchte nachdem man den Datenpunkt im ID Input Feld gesetzt hat. Die Änderung wird nur dann mit geteilt wenn diese mit ack:true gesetzt wird. Es muss zwingend ein Text ausserhalb der {} angegeben werden, ansonsten wird dieser automatisch hinzugefügt.",
+		},
+		{ text: "", info: globalText.textID },
+	],
+};

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "telegram-menu",
-    "version": "0.7.2",
+    "version": "0.8.0",
     "news": {
+      "0.8.0": {
+        "en": "text blocks created as a selection list, including the selection of the ID\ntext in submenus is now editable in the textfield in the navigation\nset ID by open a menu\nget status\nsmall fixes",
+        "de": "als Auswahlliste erstellte Textblöcke, einschließlich der Auswahl der ID\ntext in untermenü ist nun im textfeld in der navigation editierbar\niD durch Menü öffnen\nstatus\nkleine fixierungen",
+        "ru": "текстовые блоки, созданные как список отбора, включая подбор ID\nтекст в подменю теперь редактируем в текстовом поле в навигации\nустановите ID, откройте меню\nполучить статус\nнебольшие исправления",
+        "pt": "blocos de texto criados como uma lista de seleção, incluindo a seleção do ID\ntexto no submenus agora é editável no campo de texto na navegação\nset ID por abrir um menu\nobter status\npequenas correções",
+        "nl": "vertaling:\nsms in submenus is nu editabel in het sms in de navigatie\niD van een menukaart\nsta op\nkleine fixes",
+        "fr": "blocs texte créés comme liste de sélection, y compris la sélection de l'ID\ntext in submenus is now editable in the textfield in the navigation\nset ID by open a menu\nobtenir le statut\npetites corrections",
+        "it": "blocchi di testo creati come elenco di selezione, inclusa la selezione dell'ID\ntesto in submenus è ora modificabile nel campo di testo nella navigazione\nset ID per aprire un menu\nottenere stato\npiccole correzioni",
+        "es": "bloques de texto creados como lista de selección, incluyendo la selección del ID\ntexto en submenú es ahora editable en el campo de texto en la navegación\nestablecer ID por abrir un menú\nobtener el estado\npequeños accesorios",
+        "pl": "bloki tekstowe tworzone jako lista wyborcza, w tym wybór ID\ntekst w podmenu jest obecnie edytowany w polu tekstowym w nawigacji\nzademonstrowany przez otwarte menu\nmieć status\ndrobne rozwiązanie",
+        "uk": "текстові блоки, створені в списку вибору, включаючи вибір ID\nтекст в підменю тепер редагований в текстовому полі на навігацію\nвстановіть ID за допомогою меню\nотримати статус\nмаленькі кріплення",
+        "zh-cn": "选择名单,包括选择裁研所的案文\n导航场案文现在可归入。\n开 门\n身份\n小型配件"
+      },
       "0.7.2": {
         "en": "submenu Number fixed\ntext is lost when editing #63\nconvert milliseconds value to a local time specification\nsetstate and get result of another state with text adjusted",
         "de": "unterpositionen Anzahl fest\ntext wird beim editieren von #63 verloren\nmillisekunden-wert in eine lokale zeitvorgabe umwandeln\nsetstate und erhalten ergebnis eines anderen staates mit text angepasst",
@@ -80,19 +93,6 @@
         "pl": "chat Id w UI\nwykorzystywanie nie jest wyświetlane, gdy edytacja się poprawnie",
         "uk": "увійти Id в УІ\nтригер не відображається при монтажі, фіксованому",
         "zh-cn": "混乱 Id\n在编辑、固定固定的固定编辑时,没有出现引擎。"
-      },
-      "0.6.7": {
-        "en": "fixed, send menu with error",
-        "de": "fest, menü mit fehler senden",
-        "ru": "фиксированное, отправить меню с ошибкой",
-        "pt": "fixo, enviar menu com erro",
-        "nl": "vertaling:",
-        "fr": "fixe, envoyer le menu avec erreur",
-        "it": "fisso, inviare menu con errore",
-        "es": "fijo, enviar menú con error",
-        "pl": "zastosowano menu z błędem",
-        "uk": "виправлено, відправте меню з помилкою",
-        "zh-cn": "a. 固定状态,向男子发出错误的通知"
       }
     },
     "titleLang": {

package/lib/js/action.js

@@ -14,7 +14,8 @@ function calcValue(_this, textToSend, val) {
 	try {
 		val = eval(val + mathvalue);
 	} catch (e) {
-		_this.log.error("Error Eval" + JSON.stringify(e));
+		_this.log.error("Error Eval" + JSON.stringify(e.message));
+		_this.log.error(JSON.stringify(e.stack));
 	}
 	textToSend = textToSend.replace(substring, "");
 	return { textToSend: textToSend, val: val };
@@ -68,7 +69,8 @@ async function editArrayButtons(val, _this) {
 		});
 		return val;
 	} catch (err) {
-		_this.log.error("Error EditArray: " + err);
+		_this.log.error("Error EditArray: " + JSON.stringify(err.message));
+		_this.log.error(JSON.stringify(err.stack));
 	}
 }
 // ID by Selctor Auswerten
@@ -101,33 +103,29 @@ const idBySelector = async (
 				enums = result["enum.functions"][`enum.functions.${functions}`].common.members;
 				if (enums) {
 					const promises = enums.map(async (id) => {
-						try {
-							const value = await _this.getForeignStateAsync(id);
-							if (value && value.val) {
-								_this.log.debug("Value " + JSON.stringify(value.val));
-								_this.log.debug("text " + JSON.stringify(text));
-								let newtext = text;
-								let name;
-								if (text.includes("{common.name}")) {
-									_this.log.debug("test ");
-									name = await _this.getForeignObjectAsync(id);
-									_this.log.debug("Name " + JSON.stringify(name));
-									// _this.log.debug("Name " + JSON.stringify(await _this.getForeignObjectAsync(id)));
-									if (name && name.common.name)
-										newtext = newtext.replace("{common.name}", name.common.name);
-								}
-								if (text.includes("&&")) text2Send += newtext.replace("&&", value.val);
-								else {
-									text2Send += newtext;
-									text2Send += " " + value.val;
-								}
+						const value = await _this.getForeignStateAsync(id);
+						if (value && value.val) {
+							_this.log.debug("Value " + JSON.stringify(value.val));
+							_this.log.debug("text " + JSON.stringify(text));
+							let newtext = text;
+							let name;
+							if (text.includes("{common.name}")) {
+								_this.log.debug("test ");
+								name = await _this.getForeignObjectAsync(id);
+								_this.log.debug("Name " + JSON.stringify(name));
+								// _this.log.debug("Name " + JSON.stringify(await _this.getForeignObjectAsync(id)));
+								if (name && name.common.name)
+									newtext = newtext.replace("{common.name}", name.common.name);
+							}
+							if (text.includes("&&")) text2Send += newtext.replace("&&", value.val);
+							else {
+								text2Send += newtext;
+								text2Send += " " + value.val;
 							}
-							if (newline == "true") text2Send += "\n";
-							else text2Send += " ";
-							_this.log.debug("text2send " + JSON.stringify(text2Send));
-						} catch (e) {
-							_this.log.error("Error idBySelector: " + JSON.stringify(e));
 						}
+						if (newline == "true") text2Send += "\n";
+						else text2Send += " ";
+						_this.log.debug("text2send " + JSON.stringify(text2Send));
 					});
 					Promise.all(promises)
 						.then(() => {
@@ -146,13 +144,15 @@ const idBySelector = async (
 							);
 						})
 						.catch((e) => {
-							_this.log.debug("Error " + JSON.stringify(e));
+							_this.log.error("Error Promise: " + JSON.stringify(e.message));
+							_this.log.error(JSON.stringify(e.stack));
 						});
 				}
 			}
 		}
 	} catch (error) {
-		_this.log.error("Error " + JSON.stringify(error));
+		_this.log.error("Error " + JSON.stringify(error.message));
+		_this.log.error(JSON.stringify(error.stack));
 	}
 };
 
@@ -175,7 +175,8 @@ async function generateNewObjectStructure(_this, val) {
 		});
 		return obj;
 	} catch (err) {
-		_this.log.error("Error GenerateNewObjectStructure " + err);
+		_this.log.error("Error GenerateNewObjectStructure " + JSON.stringify(err.message));
+		_this.log.error(JSON.stringify(err.stack));
 	}
 }
 
@@ -241,7 +242,8 @@ function generateActions(_this, action, userObject) {
 		});
 		return { obj: userObject, ids: listOfSetStateIds };
 	} catch (err) {
-		console.log("Error generateActions: " + err);
+		_this.log.error("Error generateActions" + JSON.stringify(err.message));
+		_this.log.error(JSON.stringify(err.stack));
 	}
 }
 

package/lib/js/getstate.js

@@ -97,8 +97,10 @@ function getstate(_this, part, userToSend, telegramInstance, one_time_keyboard,
 				});
 			}
 		} catch (error) {
-			_this.log.error("Error Getdata: " + JSON.stringify(error));
+			_this.log.error("Error Getdata: " + JSON.stringify(error.message));
+			_this.log.error(JSON.stringify(error.stack));
 		}
 	});
 }
+
 module.exports = { getstate };

package/lib/js/global.js

@@ -30,5 +30,15 @@ function isJSON(_string) {
 		return false;
 	}
 }
+/**
+ * Finds the first index of the searchValue
+ * @param {string} text  Text to search in
+ * @param {string} searchValue Value to search for
+ * @returns  Index of the first occurrence of searchValue
+ */
+
+function startIndex(text, searchValue) {
+	return text.indexOf(searchValue);
+}
 
-module.exports = { deleteDoubleEntrysInArray, replaceAll, isJSON };
+module.exports = { deleteDoubleEntrysInArray, replaceAll, isJSON, startIndex };

package/lib/js/setstate.js

@@ -74,7 +74,8 @@ function setstate(
 						});
 						_this.log.debug("setStateIds" + JSON.stringify(setStateIds));
 					} catch (e) {
-						_this.log.error("Error parsing returnObj: " + JSON.stringify(e));
+						_this.log.error("Error parsing returnObj: " + JSON.stringify(e.message));
+						_this.log.error(JSON.stringify(e.stack));
 					}
 				}
 				if (element.toggle) {
@@ -85,7 +86,8 @@ function setstate(
 							if (val) _this.setForeignStateAsync(element.id, !val.val, ack);
 						})
 						.catch((e) => {
-							console.log(e);
+							_this.log.error(JSON.stringify(e.message));
+							_this.log.error(JSON.stringify(e.stack));
 						});
 				} else {
 					let valueToSet;
@@ -97,7 +99,8 @@ function setstate(
 		);
 		return setStateIds;
 	} catch (error) {
-		_this.log.error("Error Switch" + JSON.stringify(error));
+		_this.log.error("Error Switch" + JSON.stringify(error.message));
+		_this.log.error(JSON.stringify(error.stack));
 	}
 }