X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=d0ebcc5e5ff911f62a478ada30302b03babc607e;hb=0195c1278f56643867bda7378d66f26f82cef43b;hp=e1cadb7a26964d9e18db8c7822d93b7e53fa38e0;hpb=5b59e936923885cb375cb7d540f5b8ad754d848d;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index e1cadb7..d0ebcc5 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -26,7 +26,8 @@ function team($, teamName) {
 	"last": $.now()
     };
     var m_paz; // will be initialised below
-    var m_template = {};
+    var m_tempateText = {}; // widgets can register tempates to be compiled
+    var m_template = {}; // compiled templates, from any source
     var m_config = mkws.objectInheritingFrom(mkws.config);
     var m_widgets = {}; // Maps widget-type to object
 
@@ -40,7 +41,7 @@ function team($, teamName) {
     that.currentPage = function() { return m_currentPage; };
     that.currentRecordId = function() { return m_currentRecordId; };
     that.currentRecordData = function() { return m_currentRecordData; };
-    that.filters = function() { return m_filterSet.list(); };
+    that.filters = function() { return m_filterSet; };
     that.config = function() { return m_config; };
 
     // Accessor methods for individual widgets: writers
@@ -169,40 +170,43 @@ function team($, teamName) {
 
     that.limitTarget = function(id, name) {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filterSet.add(filter(id, name));
-	triggerSearch();
+	m_filterSet.add(targetFilter(id, name));
+	if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitQuery = function(field, value) {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.add(filter(null, null, field, value));
-	triggerSearch();
+	m_filterSet.add(fieldFilter(field, value));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitCategory = function(id) {
 	log("limitCategory(id=" + id + ")");
-	// ### Add a filter
-	// ### triggerSearch() if there's a query
+        // Only one category filter at a time
+	m_filterSet.removeMatching(function(f) { return f.type === 'category' });
+        if (id !== '') m_filterSet.add(categoryFilter(id));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitTarget = function(id) {
 	log("delimitTarget(id=" + id + ")");
-	m_filterSet.removeMatching(function(f) { return f.id });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type === 'target' });
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitQuery = function(field, value) {
 	log("delimitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.removeMatching(function(f) { return f.field && field == f.field && value == f.value });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
+                                                 field == f.field && value == f.value });
+        if (m_query) triggerSearch();
 	return false;
     };
 
@@ -248,7 +252,7 @@ function team($, teamName) {
 	    return;
 	}
 
-	m_filterSet = filterSet(that);
+	m_filterSet.removeMatching(function(f) { return f.type !== 'category' });
 	triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
@@ -260,15 +264,18 @@ function team($, teamName) {
 	resetPage();
 	queue("navi").publish();
 
-
 	// Continue to use previous query/sort-order unless new ones are specified
 	if (query) m_query = query;
 	if (sortOrder) m_sortOrder = sortOrder;
 	if (perpage) m_perpage = perpage;
-	if (targets) m_filterSet.add(filter(id, id));
+	if (targets) m_filterSet.add(targetFilter(targets, targets));
 
 	var pp2filter = m_filterSet.pp2filter();
 	var pp2limit = m_filterSet.pp2limit(limit);
+        var pp2catLimit = m_filterSet.pp2catLimit();
+	if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
 	var params = {};
 	if (pp2limit) params.limit = pp2limit;
@@ -279,7 +286,7 @@ function team($, teamName) {
 	    params.torusquery = torusquery;
 	}
 
-	log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filterSet.list()) + ", " +
+	log("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " +
 	    "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
 	m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params);
@@ -405,8 +412,6 @@ function team($, teamName) {
         ranking_data += '</form>';
 	findnode(".mkwsRanking").html(ranking_data);
 
-	mkwsHtmlSwitch();
-
 	findnode('.mkwsSearchForm').submit(function() {
 	    var val = widgetNode('Query').val();
 	    newSearch(val);
@@ -414,7 +419,10 @@ function team($, teamName) {
 	});
 
 	// on first page, hide the termlist
-	$(document).ready(function() { widgetNode("Termlists").hide(); });
+	$(document).ready(function() {
+            var t = widgetNode("Termlists");
+            if (t) t.hide();
+        });
         var container = findnode(".mkwsMOTDContainer");
 	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
@@ -435,7 +443,27 @@ function team($, teamName) {
 	return m_config.lang;
     }
 
+    // set or re-set "lang" URL parameter
+    function lang_url(lang) {
+	var query = location.search;
+	// no query parameters? done
+	if (!query) {
+	    return "?lang=" + lang;
+	}
 
+	// parameter does not exists
+	if (!query.match(/[\?&]lang=/)) {
+            return query + "&lang=" + lang;
+        }
+
+	// replace existing parameter
+	query = query.replace(/\?lang=([^&#;]*)/, "?lang=" + lang);
+	query = query.replace(/\&lang=([^&#;]*)/, "&lang=" + lang);
+
+	return query;
+    }
+   
+	// dynamic URL or static page? /path/foo?query=test
     /* create locale language menu */
     function mkwsHtmlLang() {
 	var lang_default = "en";
@@ -471,7 +499,7 @@ function team($, teamName) {
 	    if (lang == l) {
 		data += ' <span>' + l + '</span> ';
 	    } else {
-		data += ' <a href="?lang=' + l + '">' + l + '</a> '
+		data += ' <a href="' + lang_url(l) + '">' + l + '</a> '
 	    }
 	}
 
@@ -519,24 +547,6 @@ function team($, teamName) {
     }
 
 
-    function mkwsHtmlSwitch() {
-	log("HTML switch for team " + m_teamName);
-
-	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>'));
-
-	log("HTML targets");
-	var node = findnode(".mkwsTargets");
-	node.html('\
-<div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
-  No information available yet.\
-</div>');
-	node.css("display", "none");
-    }
-
-
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
     // want to make it per-team so different teams can operate in
@@ -587,6 +597,11 @@ function team($, teamName) {
     that.renderDetails = renderDetails;
 
 
+    that.registerTemplate = function(name, text) {
+        m_tempateText[name] = text;
+    };
+
+
     function loadTemplate(name) {
 	var template = m_template[name];
 
@@ -602,6 +617,9 @@ function team($, teamName) {
             }
 
 	    if (!source) {
+                source = m_tempateText[name];
+            }
+	    if (!source) {
 		source = defaultTemplate(name);
 	    }