X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=6d03d07296f656ed3a390e2e91f2f047b7b18536;hp=a98c59034696702e23bc46b1a2e58241f1a36829;hb=2681321da7a6c02655b92fc46832c5d80f90e6c1;hpb=5e4943f76f8185f368589dbe9ac8600e5ca1b3fc diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index a98c590..6d03d07 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -158,17 +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(); + 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; @@ -178,8 +184,6 @@ function widget($, team, type, node) { function promoteTargets() { team.queue("targets").subscribe(function(data) { - if (node.length === 0) alert("huh?!"); - var table ='' + '' + '' + @@ -276,6 +280,120 @@ function widget($, team, type, node) { } }); } + + + function promotePager() { + team.queue("pager").subscribe(function(data) { + $(node).html(drawPager(data)) + + function drawPager(data) { + 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(team.totalRecordCount() / team.perpage()); + var currentPage = 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 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 + '
'; + + return s; + } + }); + } + + + 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); + }); + } } @@ -290,7 +408,6 @@ function widget($, team, type, node) { function team($, teamName) { var that = {}; var m_teamName = teamName; - that.name = function() { return m_teamName; } var m_submitted = false; var m_query; // initially undefined var m_sortOrder; // will be set below @@ -308,6 +425,13 @@ function team($, teamName) { var m_paz; // will be initialised below var m_template = {}; + that.name = function() { return m_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(); @@ -316,6 +440,7 @@ function team($, teamName) { mkws.debug(m_teamName + ": " + timestamp + s); } + that.debug = debug; debug("start running MKWS"); @@ -371,28 +496,8 @@ function team($, teamName) { function onShow(data, teamName) { debug("show"); m_totalRecordCount = data.merged; - - var pager = findnode(".mkwsPager"); - if (pager.length) { - pager.html(drawPager(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("pager").publish(data); + queue("records").publish(data); } @@ -422,60 +527,6 @@ function team($, teamName) { } - function drawPager (data) - { - 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(m_totalRecordCount / m_perpage); - - var firstClkbl = (m_currentPage - onsides > 0) - ? m_currentPage - onsides - : 1; - - var lastClkbl = firstClkbl + 2*onsides < pages - ? firstClkbl + 2*onsides - : pages; - - var prev = '<< ' + M('Prev') + ' | '; - if (m_currentPage > 1) - prev = '' - +'<< ' + M('Prev') + ' | '; - - var middle = ''; - for(var i = firstClkbl; i <= lastClkbl; i++) { - var numLabel = i; - if(i == m_currentPage) - numLabel = '' + i + ''; - - middle += ' ' - + numLabel + ' '; - } - - var next = ' | ' + M('Next') + ' >>'; - if (pages - m_currentPage > 0) - next = ' | ' - + M('Next') + ' >>'; - - var predots = ''; - if (firstClkbl > 1) - predots = '...'; - - var postdots = ''; - if (lastClkbl < pages) - postdots = '...'; - - s += '
' - + prev + predots + middle + postdots + next + '
'; - - return s; - } - - //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// @@ -499,47 +550,29 @@ 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; - - 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); + m_perpage = findnode('.mkwsPerpage').val(); + if (!m_submitted) return false; + resetPage(); + m_paz.show(0, m_perpage, m_sortOrder); + return false; } @@ -550,27 +583,15 @@ 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) { + resetPage(); + queue("navi").publish(); + var pp2filter = ""; var pp2limit = ""; - // Re-use previous query/sort-order if new ones are not specified + // Continue to use previous query/sort-order unless new ones are specified if (query) { m_query = query; } @@ -617,9 +638,6 @@ function team($, teamName) { { debug("limitTarget(id=" + id + ", name=" + name + ")"); m_filters.push({ id: id, name: name }); - redrawNavi(); - resetPage(); - loadSelect(); triggerSearch(); return false; } @@ -630,9 +648,6 @@ function team($, teamName) { { debug("limitQuery(field=" + field + ", value=" + value + ")"); m_filters.push({ field: field, value: value }); - redrawNavi(); - resetPage(); - loadSelect(); triggerSearch(); return false; } @@ -653,9 +668,6 @@ function team($, teamName) { } m_filters = newFilters; - redrawNavi(); - resetPage(); - loadSelect(); triggerSearch(); return false; } @@ -678,9 +690,6 @@ function team($, teamName) { } m_filters = newFilters; - redrawNavi(); - resetPage(); - loadSelect(); triggerSearch(); return false; } @@ -820,8 +829,7 @@ function team($, teamName) { var node = findnode(".mkwsRanking"); if (node.length) { - var ranking_data = ''; - ranking_data += ''; + var ranking_data = ''; if (mkws_config.show_sort) { ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' '; } @@ -841,10 +849,10 @@ function team($, teamName) { node.submit(onFormSubmitEventHandler); node = findnode('.mkwsSort'); if (node.length) - node.change(onSelectDdChange); + node.change(onSortChange); node = findnode('.mkwsPerpage'); if (node.length) - node.change(onSelectDdChange); + node.change(onPerpageChange); // on first page, hide the termlist $(document).ready(function() { findnode(".mkwsTermlists").hide(); }); @@ -1038,21 +1046,13 @@ function team($, teamName) { } - function renderSummary(hit) - { - var template = loadTemplate("Summary"); - hit._id = "mkwsRec_" + hit.recid; - hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;" - return template(hit); - } - - function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); return '
' + details + '
'; } + that.renderDetails = renderDetails; function loadTemplate(name) @@ -1078,6 +1078,7 @@ function team($, teamName) { return template; } + that.loadTemplate = loadTemplate; // The following PubSub code is modified from the jQuery manual: @@ -1475,7 +1476,7 @@ function team($, teamName) { } }); - // Find all nodes with an class, and determine their team from + // Find all nodes with an MKWS class, and determine their team from // the mkwsTeam_* class. Make all team objects. var then = $.now(); $('[class^="mkws"],[class*=" mkws"]').each(function () { @@ -1489,7 +1490,7 @@ function team($, teamName) { // Second pass: make the individual widget objects. This has // to be done separately, and after the team-creation, since // that sometimes makes new widget nodes (e.g. creating - // mkwsTermlists instead mkwsResults. + // mkwsTermlists inside mkwsResults. $('[class^="mkws"],[class*=" mkws"]').each(function () { mkws.handleNodeWithTeam(this, function(tname, type) { var myTeam = mkws.teams[tname];
' + M('Target ID') + '' + M('Hits') + '