X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=0766f51867d31becf31881ddd33f01191a93f774;hb=9d30056b825036d1ff7c6ad324a9218e642b2010;hp=0b0a5099537baaa245333e0cdb79213f2be07958;hpb=4a46b49eca2fe9a7b3bf01c3934215367b7e3050;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0b0a509..0766f51 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -158,19 +158,23 @@ function widget($, team, type, node) {
var M = mkws.M;
- if (type === 'Targets') {
- promoteTargets();
- } else if (type === 'Stat') {
- promoteStat();
- } else if (type === 'Termlists') {
- promoteTermlists();
- } else if (type === 'Pager') {
- promotePager();
+ var type2fn = {
+ Targets: promoteTargets,
+ Stat: promoteStat,
+ Termlists: promoteTermlists,
+ Pager: promotePager,
+ Records: promoteRecords,
+ Navi: promoteNavi
+ };
+
+ var promote = type2fn[type];
+ if (promote) {
+ promote();
+ team.debug("made " + type + " widget(node=" + node + ")");
} else {
- // ### Handle other types here
+ team.debug("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")");
}
- mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
return that;
@@ -180,8 +184,6 @@ function widget($, team, type, node) {
function promoteTargets() {
team.queue("targets").subscribe(function(data) {
- if (node.length === 0) alert("huh?!");
-
var table ='
' +
'' + M('Target ID') + ' | ' +
'' + M('Hits') + ' | ' +
@@ -338,6 +340,60 @@ function widget($, team, type, node) {
}
});
}
+
+
+ function promoteRecords() {
+ team.queue("records").subscribe(function(data) {
+ var html = [];
+ for (var i = 0; i < data.hits.length; i++) {
+ var hit = data.hits[i];
+ html.push('',
+ renderSummary(hit),
+ '
');
+ // ### 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()));
+ }
+ }
+ $(node).html(html.join(''));
+
+ function renderSummary(hit)
+ {
+ var template = team.loadTemplate("Summary");
+ hit._id = "mkwsRec_" + hit.recid;
+ hit._onclick = "mkws.showDetails('" + team.name() + "', this.id);return false;"
+ return template(hit);
+ }
+ });
+ }
+
+
+ function promoteNavi() {
+ team.queue("navi").subscribe(function() {
+ var filters = team.filters();
+ var text = "";
+
+ for (var i in filters) {
+ if (text) {
+ text += " | ";
+ }
+ var filter = filters[i];
+ if (filter.id) {
+ text += M('source') + ': ' + filter.name + '';
+ } else {
+ text += M(filter.field) + ': ' + filter.value + '';
+ }
+ }
+
+ $(node).html(text);
+ });
+ }
}
@@ -373,6 +429,9 @@ function team($, teamName) {
that.perpage = function() { return m_perpage; }
that.totalRecordCount = function() { return m_totalRecordCount; }
that.currentPage = function() { return m_currentPage; }
+ that.currentRecordId = function() { return m_currentRecordId; }
+ that.currentRecordData = function() { return m_currentRecordData; }
+ that.filters = function() { return m_filters; }
var debug = function (s) {
var now = $.now();
@@ -381,6 +440,7 @@ function team($, teamName) {
mkws.debug(m_teamName + ": " + timestamp + s);
}
+ that.debug = debug;
debug("start running MKWS");
@@ -436,25 +496,8 @@ function team($, teamName) {
function onShow(data, teamName) {
debug("show");
m_totalRecordCount = data.merged;
-
queue("pager").publish(data);
-
- var results = findnode(".mkwsRecords");
- if (!results.length)
- return;
-
- var html = [];
- for (var i = 0; i < data.hits.length; i++) {
- var hit = data.hits[i];
- html.push('',
- renderSummary(hit),
- '
');
- if (hit.recid == m_currentRecordId) {
- if (m_currentRecordData)
- html.push(renderDetails(m_currentRecordData));
- }
- }
- results.html(html.join(''));
+ queue("records").publish(data);
}
@@ -507,47 +550,35 @@ function team($, teamName) {
}
m_filters = []
- redrawNavi();
- resetPage();
- loadSelect();
triggerSearch(query, sortOrder, targets);
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
- function onSelectDdChange()
+ function onSortChange()
{
+ m_sortOrder = findnode('.mkwsSort').val();
if (!m_submitted) return false;
resetPage();
- loadSelect();
m_paz.show(0, m_perpage, m_sortOrder);
return false;
}
- function redrawNavi ()
+ function onPerpageChange()
{
- var navi = findnode('.mkwsNavi');
- if (!navi) return;
+ m_perpage = findnode('.mkwsPerpage').val();
+ if (!m_submitted) return false;
+ resetPage();
+ m_paz.show(0, m_perpage, m_sortOrder);
+ return false;
+ }
- var text = "";
- for (var i in m_filters) {
- if (text) {
- text += " | ";
- }
- var filter = m_filters[i];
- if (filter.id) {
- text += M('source') + ': ' + filter.name + '';
- } else {
- text += M(filter.field) + ': ' + filter.value + '';
- }
- }
- navi.html(text);
+ function redrawNavi ()
+ {
+ queue("navi").publish();
}
@@ -558,23 +589,11 @@ function team($, teamName) {
}
- function loadSelect ()
- {
- var node = findnode('.mkwsSort');
- if (node.length && node.val() != m_sortOrder) {
- debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val());
- m_sortOrder = node.val();
- }
- node = findnode('.mkwsPerpage');
- if (node.length && node.val() != m_perpage) {
- debug("changing m_perpage from " + m_perpage + " to " + node.val());
- m_perpage = node.val();
- }
- }
-
-
function triggerSearch (query, sortOrder, targets)
{
+ redrawNavi();
+ resetPage();
+
var pp2filter = "";
var pp2limit = "";
@@ -625,9 +644,6 @@ function team($, teamName) {
{
debug("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
- redrawNavi();
- resetPage();
- loadSelect();
triggerSearch();
return false;
}
@@ -638,9 +654,6 @@ function team($, teamName) {
{
debug("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
- redrawNavi();
- resetPage();
- loadSelect();
triggerSearch();
return false;
}
@@ -661,9 +674,6 @@ function team($, teamName) {
}
m_filters = newFilters;
- redrawNavi();
- resetPage();
- loadSelect();
triggerSearch();
return false;
}
@@ -686,9 +696,6 @@ function team($, teamName) {
}
m_filters = newFilters;
- redrawNavi();
- resetPage();
- loadSelect();
triggerSearch();
return false;
}
@@ -828,8 +835,7 @@ function team($, teamName) {
var node = findnode(".mkwsRanking");
if (node.length) {
- var ranking_data = '';
- ranking_data += '