Improved tagging dialog.

Ylian Saint-Hilaire committed Aug 9, 2021 at 20:24 UTC a9f95f0da736e7bec635b02fb9018e9ebce8e818
1 file changed +26
views/default.handlebars
+26
@@ -5152,6 +5152,14 @@
5152 var x = "Perform batch device tag operation" + '<br /><br />';
5153 x += addHtmlValue("Operation", '<select id=d2deviceop style=float:right;width:250px><option value=1>' + "Add tags" + '</option><option value=2>' + "Set tags" + '</option><option value=3>' + "Remove tags" + '</option></select>');
5154 x += addHtmlValue("Tags", '<input id=dp10devicevalue maxlength=4096 placeholder="' + "Tag1, Tag2, Tag3" + '" />');
5155 + // Get a list of all possible device tags
5156 + var allTags = [], y = '';
5157 + for (var i in nodes) { if (nodes[i].tags) { for (var j in nodes[i].tags) { if (allTags.indexOf(nodes[i].tags[j]) == -1) { allTags.push(nodes[i].tags[j]); } } } }
5158 + if (allTags.length > 0) {
5159 + allTags.sort();
5160 + for (var i in allTags) { y += '<span style=padding:4px;background-color:#BBB;border-radius:3px;margin:3px;cursor:pointer onclick=showEditNodeValueDialogAddTag("' + encodeURIComponentEx(allTags[i]) + '")>' + EscapeHtml(allTags[i]) + '</span>'; }
5161 + x += '<div style=height:4px></div>' + addHtmlValue("Existing Tags", y);
5162 + }
5163 setDialogMode(2, "Edit Device Tags", 3, d2groupActionFunctionTagsExec, x);
5164 } else if (op == 108) {
5165 // Device notification
@@ -7675,6 +7683,16 @@
7683 function showEditNodeValueDialog(mode) {
7684 if (xxdialogMode) return;
7685 var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue maxlength=' + showEditNodeValueDialog_modes4[mode] + ' placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) />');
7686 + if (mode == 3) {
7687 + // Get a list of all possible device tags
7688 + var allTags = [], y = '';
7689 + for (var i in nodes) { if (nodes[i].tags) { for (var j in nodes[i].tags) { if (allTags.indexOf(nodes[i].tags[j]) == -1) { allTags.push(nodes[i].tags[j]); } } } }
7690 + if (allTags.length > 0) {
7691 + allTags.sort();
7692 + for (var i in allTags) { y += '<span style=padding:4px;background-color:#BBB;border-radius:3px;margin:3px;cursor:pointer onclick=showEditNodeValueDialogAddTag("' + encodeURIComponentEx(allTags[i]) + '")>' + EscapeHtml(allTags[i]) + '</span>'; }
7693 + x += '<div style=height:4px></div>' + addHtmlValue("Existing Tags", y);
7694 + }
7695 + }
7696 setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode);
7697 var v = currentNode[showEditNodeValueDialog_modes2[mode]];
7698 if (v == null) v = '';
@@ -7684,6 +7702,14 @@
7702 Q('dp10devicevalue').focus();
7703 }
7704
7705 + function showEditNodeValueDialogAddTag(t) {
7706 + var tt = Q('dp10devicevalue').value.split(','), t2 = [];
7707 + for (var i in tt) { t2.push(tt[i].trim()); }
7708 + if (t2.indexOf(t) >= 0) return;
7709 + Q('dp10devicevalue').value += ((Q('dp10devicevalue').value.length == 0)?'':', ') + decodeURIComponent(t);
7710 + p10editdevicevalueValidate();
7711 + }
7712 +
7713 function showEditNodeValueDialogEx(button, mode) {
7714 var x = { action: 'changedevice', nodeid: currentNode._id };
7715 x[showEditNodeValueDialog_modes2[mode]] = Q('dp10devicevalue').value;