Status line implemented using pub/sub

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ae26ff1..60b9388 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -179,9 +179,60 @@ function widget($, team, type, node) {
        node: node
     };
 
+    var M = mkws.M;
+
+    if (type === 'Targets') {
+       promoteTargets();
+    } else if (type === 'Stat') {
+       promoteStat();
+    } else {
+       // Unsupported widget type: call an extension?
+    }
+
     // ### More to do here, surely: e.g. wiring into the team
     mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
 
+
+    function promoteTargets() {
+       mkws.queue("targets").subscribe(function(data) {
+           if (node.length === 0) alert("huh?!");
+
+           var table ='<table><thead><tr>' +
+               '<td>' + M('Target ID') + '</td>' +
+               '<td>' + M('Hits') + '</td>' +
+               '<td>' + M('Diags') + '</td>' +
+               '<td>' + M('Records') + '</td>' +
+               '<td>' + M('State') + '</td>' +
+               '</tr></thead><tbody>';
+
+           for (var i = 0; i < data.length; i++) {
+               table += "<tr><td>" + data[i].id +
+                   "</td><td>" + data[i].hits +
+                   "</td><td>" + data[i].diagnostic +
+                   "</td><td>" + data[i].records +
+                   "</td><td>" + data[i].state + "</td></tr>";
+           }
+           
+           table += '</tbody></table>';
+           var subnode = $(node).children('.mkwsBytarget');
+           subnode.html(table);
+       });
+    }
+
+
+    function promoteStat() {
+       mkws.queue("stat").subscribe(function(data) {
+           if (node.length === 0)  alert("huh?!");
+
+           $(node).html('<span class="head">' + M('Status info') + '</span>' +
+               ' -- ' +
+               '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
+               ' -- ' +
+               '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+       });
+    }
+
+
     return that;
 }
 
@@ -258,40 +309,13 @@ function team($, teamName) {
 
     function onBytarget(data, teamName) {
        debug("target");
-       var node = findnode('.mkwsBytarget');
-       if (node.length === 0) return;
-
-       var table ='<table><thead><tr>' +
-           '<td>' + M('Target ID') + '</td>' +
-           '<td>' + M('Hits') + '</td>' +
-           '<td>' + M('Diags') + '</td>' +
-           '<td>' + M('Records') + '</td>' +
-           '<td>' + M('State') + '</td>' +
-           '</tr></thead><tbody>';
-
-       for (var i = 0; i < data.length; i++) {
-            table += "<tr><td>" + data[i].id +
-               "</td><td>" + data[i].hits +
-               "</td><td>" + data[i].diagnostic +
-               "</td><td>" + data[i].records +
-               "</td><td>" + data[i].state + "</td></tr>";
-       }
-
-       table += '</tbody></table>';
-       node.html(table);
+       mkws.queue("targets").publish(data);
     }
 
 
     function onStat(data, teamName) {
        debug("stat");
-       var node = findnode('.mkwsStat');
-       if (node.length === 0) return;
-
-       node.html('<span class="head">' + M('Status info') + '</span>' +
-           ' -- ' +
-           '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
-           ' -- ' +
-           '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+       mkws.queue("stat").publish(data);
     }
 
 
@@ -855,21 +879,46 @@ function team($, teamName) {
     }
 
 
-    function mkwsHtmlSwitch() {
-       debug("HTML switch for team " + m_teamName);
+    /* create locale language menu */
+    function mkwsHtmlLang() {
+       var lang_default = "en";
+       var lang = mkws_config.lang || lang_default;
+       var list = [];
 
-       var node = findnode(".mkwsSwitch");
-       node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'records\')">' + M('Records') + '</a>'));
-       node.append($("<span/>", { text: " | " }));
-       node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'targets\')">' + M('Targets') + '</a>'));
+       /* display a list of configured languages, or all */
+       var lang_options = mkws_config.lang_options || [];
+       var toBeIncluded = {};
+       for (var i = 0; i < lang_options.length; i++) {
+           toBeIncluded[lang_options[i]] = true;
+       }
 
-       debug("HTML targets");
-       var node = findnode(".mkwsTargets");
-       node.html('\
-<div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
-  No information available yet.\
-</div>');
-       node.css("display", "none");
+       for (var k in mkws.locale_lang) {
+           if (toBeIncluded[k] || lang_options.length == 0)
+               list.push(k);
+       }
+
+       // add english link
+       if (lang_options.length == 0 || toBeIncluded[lang_default])
+            list.push(lang_default);
+
+       debug("Language menu for: " + list.join(", "));
+
+       /* the HTML part */
+       var data = "";
+       for(var i = 0; i < list.length; i++) {
+           var l = list[i];
+
+           if (data)
+               data += ' | ';
+
+           if (lang == l) {
+               data += ' <span>' + l + '</span> ';
+           } else {
+               data += ' <a href="?lang=' + l + '">' + l + '</a> '
+           }
+       }
+
+       findnode(".mkwsLang").html(data);
     }
 
 
@@ -913,46 +962,21 @@ function team($, teamName) {
     }
 
 
-    /* create locale language menu */
-    function mkwsHtmlLang() {
-       var lang_default = "en";
-       var lang = mkws_config.lang || lang_default;
-       var list = [];
-
-       /* display a list of configured languages, or all */
-       var lang_options = mkws_config.lang_options || [];
-       var toBeIncluded = {};
-       for (var i = 0; i < lang_options.length; i++) {
-           toBeIncluded[lang_options[i]] = true;
-       }
-
-       for (var k in mkws.locale_lang) {
-           if (toBeIncluded[k] || lang_options.length == 0)
-               list.push(k);
-       }
-
-       // add english link
-       if (lang_options.length == 0 || toBeIncluded[lang_default])
-            list.push(lang_default);
-
-       debug("Language menu for: " + list.join(", "));
-
-       /* the HTML part */
-       var data = "";
-       for(var i = 0; i < list.length; i++) {
-           var l = list[i];
-
-           if (data)
-               data += ' | ';
+    function mkwsHtmlSwitch() {
+       debug("HTML switch for team " + m_teamName);
 
-           if (lang == l) {
-               data += ' <span>' + l + '</span> ';
-           } else {
-               data += ' <a href="?lang=' + l + '">' + l + '</a> '
-           }
-       }
+       var node = findnode(".mkwsSwitch");
+       node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'records\')">' + M('Records') + '</a>'));
+       node.append($("<span/>", { text: " | " }));
+       node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'targets\')">' + M('Targets') + '</a>'));
 
-       findnode(".mkwsLang").html(data);
+       debug("HTML targets");
+       var node = findnode(".mkwsTargets");
+       node.html('\
+<div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
+  No information available yet.\
+</div>');
+       node.css("display", "none");
     }