X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2Fstatic%2Fjs%2Fquerytable.js;h=7686e194e5f66b5d0fbbdb817413046d1d337ac4;hb=d8b349aeaca7af55f020f7344863003a1a478c0a;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..7686e194 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({
 
@@ -76,7 +78,7 @@
 	    var all_columns = this.options.columns; // .concat(this.options.hidden_columns)
 	    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, width:100, minWidth:40, });
 	    }
 
 	    // xxx should be extensible from caller with this.options.slickgrid_options 
@@ -88,7 +90,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 +99,16 @@
 		    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);
+	    
+	    this.columnpicker = new Slick.Controls.ColumnPicker (this.slick_columns, this.slick_grid, this.slick_options)
 
         }, // initialize_table
 
@@ -108,7 +119,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 +162,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 +192,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 +335,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