X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=be2f588853c5686ccced5497910447246ea95e14;hb=462ef80604c5f016f8a70e3a87ecbc90f33cc5d9;hp=650ed91c8f51c6a3fda7ca49c5049f6310cdf688;hpb=1c08c02c5646499abb70f025e374ceb4517df311;p=mkws-moved-to-github.git
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 650ed91..be2f588 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -4,46 +4,38 @@
mkws.registerWidgetType('Targets', function() {
+ if (!this.config.show_switch) return;
var that = this;
- var M = mkws.M;
- $(this.node).html('No information available yet.');
- $(this.node).css("display", "none");
+ this.node.html('No information available yet.');
+ this.node.css("display", "none");
this.team.queue("targets").subscribe(function(data) {
- var table ='
' +
- '' + M('Target ID') + ' ' +
- '' + M('Hits') + ' ' +
- '' + M('Diags') + ' ' +
- '' + M('Records') + ' ' +
- '' + M('State') + ' ' +
- ' ';
-
+ // There is a bug in pz2.js wherein it makes each data object an array but
+ // simply assigns properties to it.
+ // TODO: remove this when PAZ-946 is addressed.
+ var cleandata = [];
for (var i = 0; i < data.length; i++) {
- table += "" + data[i].id +
- " " + data[i].hits +
- " " + data[i].diagnostic +
- " " + data[i].records +
- " " + data[i].state + " ";
+ var cur = {};
+ cur.id = data[i].id;
+ cur.hits = data[i].hits;
+ cur.diagnostic = data[i].diagnostic;
+ cur.records = data[i].records;
+ cur.state = data[i].state;
+ cleandata.push(cur);
}
- table += '
';
- $(that.node).html(table);
+ var template = that.team.loadTemplate(that.config.template || "Targets");
+ that.node.html(template({data: cleandata}));
});
});
mkws.registerWidgetType('Stat', function() {
var that = this;
- var M = mkws.M;
-
this.team.queue("stat").subscribe(function(data) {
- if (that.node.length === 0) alert("huh?!");
-
- $(that.node).html(' -- ' +
- '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + ' ' +
- ' -- ' +
- '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ' ');
+ var template = that.team.loadTemplate(that.config.template || "Stat");
+ that.node.html(template(data));
});
});
@@ -53,61 +45,44 @@ mkws.registerWidgetType('Pager', function() {
var M = mkws.M;
this.team.queue("pager").subscribe(function(data) {
- $(that.node).html(drawPager(data))
-
- function drawPager(data) {
- var teamName = that.team.name();
- var s = '' + M('Displaying') + ': '
- + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
- ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
- + data.total + ')
';
-
- //client indexes pages from 1 but pz2 from 0
- var onsides = 6;
- var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
- var currentPage = that.team.currentPage();
-
- var firstClkbl = (currentPage - onsides > 0)
- ? currentPage - onsides
- : 1;
-
- var lastClkbl = firstClkbl + 2*onsides < pages
- ? firstClkbl + 2*onsides
- : pages;
-
- var prev = '<< ' + M('Prev') + ' | ';
- if (currentPage > 1)
- prev = ''
- +'<< ' + M('Prev') + ' | ';
-
- var middle = '';
- for(var i = firstClkbl; i <= lastClkbl; i++) {
- var numLabel = i;
- if(i == currentPage)
- numLabel = '' + i + ' ';
-
- middle += ' '
- + numLabel + ' ';
+ var teamName = that.team.name();
+ var output = {};
+ output.first = data.start + 1;
+ output.last = data.start + data.num;
+ output.count = data.merged;
+ output.found = data.total;
+
+ //client indexes pages from 1 but pz2 from 0
+ var onsides = 6;
+ var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
+ var currentPage = that.team.currentPage();
+
+ var firstClkbl = (currentPage - onsides > 0)
+ ? currentPage - onsides
+ : 1;
+ var lastClkbl = firstClkbl + 2*onsides < pages
+ ? firstClkbl + 2*onsides
+ : pages;
+
+ if (firstClkbl > 1) output.morePrev = true;
+ if (lastClkbl < pages) output.moreNext = true;
+
+ if (currentPage > 1) output.prevClick = "mkws.pagerPrev(\'" + teamName + "\');";
+
+ output.pages = [];
+ for(var i = firstClkbl; i <= lastClkbl; i++) {
+ var o = {};
+ o.number = i;
+ if (i !== currentPage) {
+ o.click = "mkws.showPage(\'" + teamName + "\', " + i + ");";
}
+ output.pages.push(o);
+ }
- var next = ' | ' + M('Next') + ' >> ';
- if (pages - currentPage > 0)
- next = ' | '
- + M('Next') + ' >> ';
-
- var predots = '';
- if (firstClkbl > 1)
- predots = '...';
-
- var postdots = '';
- if (lastClkbl < pages)
- postdots = '...';
-
- s += ''
- + prev + predots + middle + postdots + next + '
';
+ if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
- return s;
- }
+ var template = that.team.loadTemplate(that.config.template || "Pager");
+ that.node.html(template(output));
});
});
@@ -117,31 +92,29 @@ mkws.registerWidgetType('Records', function() {
var team = this.team;
this.team.queue("records").subscribe(function(data) {
- var html = [];
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
that.team.queue("record").publish(hit);
- var divId = team.recordElementId(hit.recid[0]);
- html.push('', renderSummary(hit), '
');
+ hit.detailLinkId = team.recordElementId(hit.recid[0]);
+ hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
+ hit.containerClass = "mkwsSummary mkwsTeam_" + team.name();
+ hit.containerClass += " " + hit.detailLinkId;
// ### At some point, we may be able to move the
// m_currentRecordId and m_currentRecordData members
// from the team object into this widget.
if (hit.recid == team.currentRecordId()) {
- if (team.currentRecordData())
- html.push(team.renderDetails(team.currentRecordData()));
+ if (team.currentRecordData()) {
+ hit.renderedDetails = team.renderDetails(team.currentRecordData());
+ console.log(hit.renderedDetails);
+ }
}
}
- $(that.node).html(html.join(''));
-
- function renderSummary(hit) {
- var template = team.loadTemplate(that.config.template || "Summary");
- hit._id = team.recordElementId(hit.recid[0]);
- hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
- return template(hit);
- }
+ var template = team.loadTemplate(that.config.template || "Records");
+ var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
+ that.node.html(template(targs));
});
- widget.autosearch(that);
+ that.autosearch();
});
@@ -167,7 +140,7 @@ mkws.registerWidgetType('Navi', function() {
');return false;">' + value + '';
});
- $(that.node).html(text);
+ that.node.html(text);
});
});
@@ -178,8 +151,8 @@ mkws.registerWidgetType('Navi', function() {
mkws.registerWidgetType('Sort', function() {
var that = this;
- $(this.node).change(function() {
- that.team.set_sortOrder($(that.node).val());
+ this.node.change(function() {
+ that.team.set_sortOrder(that.node.val());
if (that.team.submitted()) {
that.team.reShow();
}
@@ -191,8 +164,8 @@ mkws.registerWidgetType('Sort', function() {
mkws.registerWidgetType('Perpage', function() {
var that = this;
- $(this.node).change(function() {
- that.team.set_perpage($(that.node).val());
+ this.node.change(function() {
+ that.team.set_perpage(that.node.val());
if (that.team.submitted()) {
that.team.reShow();
}
@@ -203,38 +176,37 @@ mkws.registerWidgetType('Perpage', function() {
mkws.registerWidgetType('Done', function() {
var that = this;
-
this.team.queue("complete").subscribe(function(n) {
- $(that.node).html("Search complete: found " + n + " records");
+ var template = that.team.loadTemplate(that.config.template || "Done");
+ that.node.html(template({count: n}));
});
});
mkws.registerWidgetType('Switch', function() {
+ if (!this.config.show_switch) return;
var tname = this.team.name();
- $(this.node).html('\
-Records \
-| \
- Targets ');
- widget.hideWhenNarrow(this);
+ var output = {};
+ output.recordClick = "mkws.switchView(\'" + tname + "\', \'records\')";
+ output.targetClick = "mkws.switchView(\'" + tname + "\', \'targets\')";
+ var template = this.team.loadTemplate(this.config.template || "Switch");
+ this.node.html(template(output));
+ this.hideWhenNarrow();
});
mkws.registerWidgetType('Search', function() {
- var tname = this.team.name();
- var M = mkws.M;
-
- $(this.node).html('\
-');
+ var output = {};
+ output.team = this.team.name();
+ output.queryWidth = this.config.query_width;
+ var template = this.team.loadTemplate(this.config.template || "Search");
+ this.node.html(template(output));
});
mkws.registerWidgetType('SearchForm', function() {
var team = this.team;
- $(this.node).submit(function() {
+ this.node.submit(function() {
var val = team.widget('Query').value();
team.newSearch(val);
return false;
@@ -245,7 +217,7 @@ mkws.registerWidgetType('SearchForm', function() {
mkws.registerWidgetType('Results', function() {
var tname = this.team.name();
- $(this.node).html('\
+ this.node.html('\
\
\
\
@@ -265,7 +237,7 @@ mkws.registerWidgetType('Results', function() {
\
');
- widget.autosearch(this);
+ this.autosearch();
});
@@ -283,13 +255,13 @@ mkws.registerWidgetType('Ranking', function() {
}
s += '';
- $(this.node).html(s);
+ this.node.html(s);
function mkwsHtmlSort() {
var order = that.team.sortOrder();
- that.log("HTML sort, sortOrder = '" + order + "'");
+ that.log("making sort HTML, sortOrder = '" + order + "'");
var sort_html = '';
for(var i = 0; i < that.config.sort_options.length; i++) {
@@ -311,7 +283,7 @@ mkws.registerWidgetType('Ranking', function() {
function mkwsHtmlPerpage() {
var perpage = that.team.perpage();
- that.log("HTML perpage, perpage = " + perpage);
+ that.log("making perpage HTML, perpage = " + perpage);
var perpage_html = '';
for(var i = 0; i < that.config.perpage_options.length; i++) {
@@ -355,7 +327,7 @@ mkws.registerWidgetType('Lang', function() {
if (lang_options.length == 0 || toBeIncluded[lang_default])
list.push(lang_default);
- this.log("Language menu for: " + list.join(", "));
+ this.log("language menu: " + list.join(", "));
/* the HTML part */
var data = "";
@@ -371,8 +343,8 @@ mkws.registerWidgetType('Lang', function() {
}
}
- $(this.node).html(data);
- widget.hideWhenNarrow(this);
+ this.node.html(data);
+ this.hideWhenNarrow();
// set or re-set "lang" URL parameter
@@ -400,11 +372,46 @@ mkws.registerWidgetType('MOTD', function() {
var container = this.team.widget('MOTDContainer');
if (container) {
// Move the MOTD from the provided element down into the container
- $(this.node).appendTo(container.node);
+ this.node.appendTo(container.node);
}
});
+// This widget has no functionality of its own, but its configuration
+// is copied up into its team, allowing it to affect other widgets in
+// the team.
+//
+mkws.registerWidgetType('Config', function() {
+ var c = this.config;
+ for (var name in c) {
+ if (c.hasOwnProperty(name)) {
+ this.team.config[name] = c[name];
+ this.log(this + " copied property " + name + "='" + c[name] + "' up to team");
+ }
+ }
+});
+
+
+mkws.registerWidgetType('Progress', function() {
+ var that = this;
+
+ this.node.hide();
+ this.team.queue("stat").subscribe(function(data) {
+ var s = '';
+ for (var i = 0; i < data.clients; i++) {
+ if (i == data.clients - data.activeclients) {
+ s += ' ';
+ s += '';
+ }
+ s += '█';
+ }
+ s += ' ';
+ that.node.html(s);
+ that.node.show();
+ });
+});
+
+
// Some elements have mkws* classes that makes them appear as widgets
// -- for example, because we want to style them using CSS -- but have
// no actual functionality. We register these to prevent ignorable
@@ -413,6 +420,5 @@ mkws.registerWidgetType('MOTD', function() {
mkws.registerWidgetType('Query', function() {});
mkws.registerWidgetType('MOTDContainer', function() {});
mkws.registerWidgetType('Button', function() {});
-mkws.registerWidgetType('Popup', function() {});