Update MQTT.js

lunarok · Jun 24, 2020 · 61890d1 · 61890d1
1 parent 102e462
commit 61890d1
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/desktop/js/MQTT.js b/desktop/js/MQTT.js
@@ -185,24 +185,22 @@ function addCmdToTable(_cmd) {
 		var tr = '<tr class="cmd" data-cmd_id="' + init(_cmd.id) + '">';
 		tr += '<td>';//1
 		tr += '<span class="cmdAttr" data-l1key="id"></span>';
-		tr += '</td>';
-		tr += '<td>';//2
-		tr += '<input class="cmdAttr form-control input-sm" data-l1key="name" style="width : 140px;" placeholder="{{Nom de l\'info}}"></td>';
-		tr += '<td>';//3
+		tr += '</td><td>';//2
+		tr += '<input class="cmdAttr form-control input-sm" data-l1key="name" style="width : 140px;" placeholder="{{Nom de l\'info}}">';
+		tr += '</td><td>';//3
 		tr += '<input class="cmdAttr form-control type input-sm" data-l1key="type" value="info" disabled style="margin-bottom : 5px;" />';
 		tr += '<span class="subType" subType="' + init(_cmd.subType) + '"></span>';
 		tr += '</td><td>';//4
 		tr += '<span class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="topic" style="height : 33px;" ' + disabled + ' placeholder="{{Topic}}" readonly=true>';
 		tr += '</td><td>';//5
 		tr += '</td><td>';//6
-        tr += '<input class="cmdAttr form-control input-sm" data-l1key="unite" style="width : 90px;" placeholder="{{Unité}}"></td><td>';
+        	tr += '<input class="cmdAttr form-control input-sm" data-l1key="unite" style="width : 90px;" placeholder="{{Unité}}">';
 		tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isHistorized" checked/>{{Historiser}}</label></span> ';
 		tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isVisible" checked/>{{Afficher}}</label></span> ';
 		tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="display" data-l2key="invertBinary" checked/>{{Inverser}}</label></span> ';
 		tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="minValue" placeholder="{{Min}}" title="{{Min}}" style="width : 40%;display : inline-block;"> ';
 		tr += '<input class="tooltips cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="maxValue" placeholder="{{Max}}" title="{{Max}}" style="width : 40%;display : inline-block;">';
-		tr += '</td>';
-		tr += '<td>';//7
+		tr += '</td><td>';//7
 		if (is_numeric(_cmd.id)) {
 			tr += '<a class="btn btn-default btn-xs cmdAction" data-action="configure"><i class="fas fa-cogs"></i></a> ';
 			tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fas fa-rss"></i> {{Tester}}</a>';
@@ -235,24 +233,19 @@ function addCmdToTable(_cmd) {
 		tr += '<select class="cmdAttr form-control tooltips input-sm" data-l1key="value" style="display : none;margin-top : 5px;margin-right : 10px;" title="{{La valeur de la commande vaut par défaut la commande}}">';
 		tr += '<option value="">Aucune</option>';
 		tr += '</select>';
-		tr += '</td>';
-		tr += '<td>';//3
+		tr += '</td><td>';//3
 		tr += '<input class="cmdAttr form-control type input-sm" data-l1key="type" value="action" disabled style="margin-bottom : 5px;" />';
 		tr += '<span class="subType" subType="' + init(_cmd.subType) + '" style=""></span>';
-		//tr += '<input class="cmdAttr" data-l1key="configuration" data-l2key="virtualAction" value="1" style="display:none;" >';
-		tr += '</td>';
-		tr += '<td>';//4
+		tr += '</td><td>';//4
 		tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="topic" style="height : 33px;" ' + disabled + ' placeholder="{{Topic}}"><br/>';
-        tr += '</td>';
-		tr += '<td>';//5
+		tr += '</td><td>';//5
 		tr += '<input class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="request" style="height : 33px;" ' + disabled + ' placeholder="{{Payload}}">';
 		tr += '<a class="btn btn-default btn-sm cursor listEquipementInfo" data-input="request" style="margin-left : 5px;"><i class="fas fa-list-alt "></i> {{Rechercher équipement}}</a>';
 		tr +='</select></span>';
 		tr += '</td><td>';//6
 		tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="isVisible" checked/>{{Afficher}}</label></span><br> ';
 		tr += '<span><label class="checkbox-inline"><input type="checkbox" class="cmdAttr checkbox-inline" data-l1key="configuration" data-l2key="retain" checked/>{{Retain flag}}</label></span><br> ';
-		tr += '</td>';
-		tr += '<td>';//7
+		tr += '</td><td>';//7
 		if (is_numeric(_cmd.id)) {
 			tr += '<a class="btn btn-default btn-xs cmdAction" data-action="configure"><i class="fas fa-cogs"></i></a> ';
 			tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fas fa-rss"></i> {{Tester}}</a>';
@@ -261,7 +254,6 @@ function addCmdToTable(_cmd) {
 		tr += '</tr>';
 
 		$('#table_cmd tbody').append(tr);
-		//$('#table_cmd tbody tr:last').setValues(_cmd, '.cmdAttr');
 		var tr = $('#table_cmd tbody tr:last');
 		jeedom.eqLogic.builSelectCmd({
 			id: $(".li_eqLogic.active").attr('data-eqLogic_id'),