X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fstatic%2Fjs%2Fsimplelist.js;h=78622119ff57438ed7b67ffa58957affa2ed53e0;hb=71472094d1731a15d9bf76832ae48ba2a1c0072c;hp=c49456b09d27d8df639ba0e2b418e83e8bb92d3a;hpb=058958cdd4f1d5f2f5da50e8dd988c5e623f41d8;p=unfold.git

diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js
index c49456b0..78622119 100644
--- a/plugins/static/js/simplelist.js
+++ b/plugins/static/js/simplelist.js
@@ -9,7 +9,7 @@
  * License: GPLv3
  */
 
-simplelist_debug=false;
+simplelist_debug=true;
 
 (function($){
     var methods = {
@@ -24,7 +24,7 @@ simplelist_debug=false;
 		    /* Subscribe to query updates */
 		    var channel='/results/' + options.query_uuid + '/changed';
 		    /* passing $this as 2nd arg: callbacks will retrieve $this as e.data */
-		    $.subscribe(channel, $this, update_list);
+		    $.subscribe(channel, $this, update_plugin);
 		    if (simplelist_debug) window.console.log('subscribing to ' + channel);
 		    $this.data('SimpleList', {options: options, SimpleList : SimpleList});
 		}
@@ -53,43 +53,77 @@ simplelist_debug=false;
     };
 
     /* Private methods */
-    function update_list(e, rows) {
+    function update_plugin(e, rows) {
+	// e.data is what we passed in second argument to subscribe
+	// so here it is the jquery object attached to the plugin <div>
+	var $this=e.data;
+	// locate the <table> element; with datatables in the way,
+	// this might not be a direct son of the div-plugin
+	var $table=$this.find("table.simplelist").first();
+	// also we may or may not have a header
+	var $tbody=$table.find("tbody.simplelist").first();
+	var use_datatables = $table.hasClass("with-datatables");
+	if (simplelist_debug) console.log($this.attr('id') + " udt= " + use_datatables);
+	
+	// clear the spinning wheel: look up an ancestor that has the need-spin class
+	// do this before we might return
+	$this.closest('.need-spin').spin(false);
+
         if (rows.length == 0) {
-            e.data.html('No result !');
+	    if (use_datatables) datatables_set_message ("No result");
+	    else		regular_set_message ("No result");
             return;
         }
         if (typeof rows[0].error != 'undefined') {
-            e.data.html('ERROR: ' + rows[0].error);
+	    var error="ERROR: " + rows[0].error;
+	    if (use_datatables) datatables_set_message (error);
+	    else		regular_set_message (error);
             return;
         }
         var options = e.data.data().SimpleList.options;
-        var is_cached = options.query.timestamp != 'now' ? true : false;
-	// here is where we use 'key' and 'value' from the SimpleList (python) constructor
-	html_code=myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>";
-        e.data.html(html_code);
-	var $elt = e.data;
-	if (simplelist_debug) console.log("about to unspin with elt #" + $elt.attr('id') + " class " + $elt.attr('class'));
-	$elt.closest('.need-spin').spin(false);
-    }
+	if (use_datatables)	datatables_update_table ($table,$tbody,rows,options.key);
+	else			regular_update_table ($table,$tbody,rows,options.key);
 
-    function myslice_html_ul(data, key, value, is_cached) {
-        var out = "<ul>";
-        for (var i = 0; i < data.length; i++) {
-            out += myslice_html_li(key, data[i][value], is_cached);
-        }
-        out += "</ul>";
-        return out;
     }
-    
-    function myslice_html_li(key, value,is_cached) {
-        var cached = is_cached ? "(cached)" : "";
+
+    // hard-wire a separate presentation depending on the key being used....
+    function cell(key, value) {
         if (key == 'slice_hrn') {
-            return "<li class='slice-hrn'><i class='icon-play-circle'></i><a href='/slice/" + value + "'>" + value + cached + "</a></li>";
+            return "<i class='icon-play-circle'></i><a href='/slice/" + value + "'>" + value + "</a>";
         } else if (key == 'network_hrn') {
-            return "<li class='network-hrn'><i class='icon-play-circle'></i>" + value + cached + "</li>";
+            return "<i class='icon-play-circle'></i>" + value ;
         } else {
-            return "<li>" + value + "</li>";
+            return value;
         }
     }
+
+    function regular_set_message ($table, $tbody, message) {
+	$tbody.html("<tr><td>"+message+"</td></tr>");
+    }
+
+    function regular_update_table ($table, $tbody, rows, key) {
+	console.log('regular_update_table ' + rows.length + " rows");
+	var html=$.map(rows, function (row) { return html_row ( cell (key, row[key])); }).join();
+	console.log("html="+html);
+	$tbody.html(html);
+    }
+    
+    function datatables_set_message ($table, $tbody, message) {
+	$table.dataTable().fnClearTable();
+	$table.dataTable().fnAddData( [ message ] );
+	$table.dataTable().fnDraw();
+    }
+
+    function datatables_update_table ($table, $tbody, rows, key) {
+	console.log('datatables_update_table ' + rows.length + " rows");
+	$table.dataTable().fnClearTable();
+	// the lambda here returns a [[]] because $.map is kind of broken; as per the doc:
+	// The function can return any value to add to the array. A returned array will be flattened into the resulting array.
+	// this is wrong indeed so let's work around that
+	$table.dataTable().fnAddData( $.map(rows, function (row) { return [[ cell (key,row[key]) ]] }) );
+	$table.dataTable().fnDraw();
+    }	
+    
+    function html_row (cell) { return "<tr><td class='simplelist'>"+cell+"</td></tr>"; }
     
 })( jQuery );