X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2Fstatic%2Fjs%2Fquerytable.js;h=98fc5b45d4e45dde7e13578398c971571d16836b;hb=0f24a662889e18d5d7407d4b57ab26fcf018021e;hp=45d12aaeceef84570a1cb542b9964bee0af9c591;hpb=120979bd0e438477dfeb702ed99d06a3d257b9af;p=myslice.git

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 45d12aae..98fc5b45 100644
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -8,6 +8,8 @@
 
     var debug=false;
     debug=true
+    var debug_deep=false;
+//    debug_deep=true;
 
     var QueryTable = Plugin.extend({
 
@@ -74,9 +76,13 @@
 	    // compute columns based on columns and hidden_columns
 	    this.slick_columns = [];
 	    var all_columns = this.options.columns; // .concat(this.options.hidden_columns)
+	    // xxx would be helpful to support a column_renamings options arg
+	    // for redefining some labels like 'network_hrn' that really are not meaningful
 	    for (c in all_columns) {
 		var column=all_columns[c];
-		this.slick_columns.push ( {id:column, name:column, field:column });
+		this.slick_columns.push ( {id:column, name:column, field:column, 
+					   cssClass: "querytable-column-"+column,
+					   width:100, minWidth:40, });
 	    }
 
 	    // xxx should be extensible from caller with this.options.slickgrid_options 
@@ -88,7 +94,7 @@
 	    this.slick_data=[];
 	    
 	    var selector="#grid-"+this.options.domid;
-	    if (debug) {
+	    if (debug_deep) {
 		messages.debug("slick grid selector is " + selector);
 		for (c in this.slick_columns) {
 		    var col=this.slick_columns[c];
@@ -97,7 +103,19 @@
 		    messages.debug("slick_column["+c+"]:"+msg);
 		}
 	    }
+	    // add a checkbox column
+	    var checkbox_selector = new Slick.CheckboxSelectColumn({
+		cssClass: "slick-cell-checkboxsel"
+	    });
+	    this.slick_columns.push(checkbox_selector.getColumnDefinition());
 	    this.slick_grid = new Slick.Grid(selector, this.slick_data, this.slick_columns, this.slick_options);
+	    this.slick_grid.setSelectionModel (new Slick.RowSelectionModel ({selectActiveRow: false}));
+	    this.slick_grid.registerPlugin (checkbox_selector);
+	    // autotooltips: for showing the full column name when ellipsed
+	    var auto_tooltips = new Slick.AutoTooltips ({ enableForHeaderCells: true });
+	    this.slick_grid.registerPlugin (auto_tooltips);
+	    
+	    this.columnpicker = new Slick.Controls.ColumnPicker (this.slick_columns, this.slick_grid, this.slick_options)
 
         }, // initialize_table
 
@@ -108,7 +126,7 @@
         }, // getColIndex
 
         checkbox_html : function (key, value) {
-//	    if (debug) messages.debug("checkbox_html, value="+value);
+	    if (debug_deep) messages.debug("checkbox_html, value="+value);
             var result="";
             // Prefix id with plugin_uuid
             result += "<input";
@@ -151,7 +169,7 @@
         },
 
         set_checkbox: function(record, checked) {
-	    console.log("set_checkbox not implemented");
+	    console.log("set_checkbox not yet implemented with slickgrid");
 	    return;
             /* Default: checked = true */
             if (checked === undefined) checked = true;
@@ -181,7 +199,7 @@
             checkbox_id = escape_id(checkbox_id);
             // using dataTables's $ to search also in nodes that are not currently displayed
             var element = this.table.$(checkbox_id);
-            if (debug) 
+            if (debug_deep) 
                 messages.debug("set_checkbox checked=" + checked
                                + " id=" + checkbox_id + " matches=" + element.length);
             element.attr('checked', checked);
@@ -324,10 +342,15 @@
 
         on_all_query_done: function() {
 	    if (debug) messages.debug("1-shot initializing dataTables content with " + this.slick_data.length + " lines");
+	    var start=new Date();
 	    this.slick_grid.setData (this.slick_data, true);
-	    if (debug) 
-		for (k in this.slick_data[0]) messages.debug("slick_data[0]["+k+"]="+this.slick_data[0][k]);
 	    this.slick_grid.render();
+	    var duration=new Date()-start;
+	    if (debug) messages.debug("setData+render took " + duration + " ms");
+	    if (debug_deep) {
+		// show full contents of first row app
+		for (k in this.slick_data[0]) messages.debug("slick_data[0]["+k+"]="+this.slick_data[0][k]);
+	    }
 	    
             var self = this;
 	    // if we've already received the slice query, we have not been able to set