X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2Fstatic%2Fjs%2Fquerytable.js;h=6fc65617ab210e44103fd5b43fd4bb35a144d801;hb=5e315adb266ab4a89e885f8c2eef2e3eb8301ae3;hp=42dfee5eb27a7044e44826c6a18337d6c6ef3068;hpb=c18db44fd7a666c17c60769db57a4e23e64bc7ea;p=myslice.git

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 42dfee5e..6fc65617 100644
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -7,7 +7,9 @@
 (function($) {
 
     var debug=false;
-//    debug=true
+    debug=true
+    var debug_deep=false;
+//    debug_deep=true;
 
     var QueryTable = Plugin.extend({
 
@@ -63,7 +65,7 @@
 
         on_show: function(e) {
             var self = e.data;
-            self.table.fnAdjustColumnSizing()
+            self.redraw_table();
         }, // on_show
 
         /* GUI EVENTS */
@@ -74,21 +76,34 @@
 	    // 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 
 	    this.slick_options = {
 		enableCellNavigation: false,
 		enableColumnReorder: true,
+		showHeaderRow: true,
+		syncColumnCellResize: true,
 	    };
 
-	    this.slick_data=[];
+	    this.slick_data = [];
+	    this.slick_dataview = new Slick.Data.DataView();
+	    var self=this;
+	    this.slick_dataview.onRowCountChanged.subscribe ( function (e,args) {
+		self.slick_grid.updateRowCount();
+		self.slick_grid.autosizeColumns();
+		self.slick_grid.render();
+	    });
 	    
 	    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];
@@ -102,66 +117,41 @@
 		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 = new Slick.Grid(selector, this.slick_dataview, 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
 
-	// Determine index of key in the table columns 
-        getColIndex: function(key, cols) {
-            var tabIndex = $.map(cols, function(x, i) { if (x.sTitle == key) return i; });
-            return (tabIndex.length > 0) ? tabIndex[0] : -1;
-        }, // getColIndex
-
-        checkbox_html : function (key, value) {
-//	    if (debug) messages.debug("checkbox_html, value="+value);
-            var result="";
-            // Prefix id with plugin_uuid
-            result += "<input";
-            result += " class='querytable-checkbox'";
-            result += " id='" + this.flat_id(this.id('checkbox', value)) + "'";
-            result += " name='" + key + "'";
-            result += " type='checkbox'";
-            result += " autocomplete='off'";
-	    if (value === undefined) {
-		messages.warning("querytable.checkbox_html - undefined value");
-	    } else {
-		result += " value='" + value + "'";
-	    }
-            result += "></input>";
-            return result;
-        }, 
+        }, // initialize_table
 
         new_record: function(record) {
 	    this.slick_data.push(record);
         },
 
         clear_table: function() {
-	    console.log("clear_table not implemented");
+	    this.slick_data=[];
+	    this.slick_dataview.setItems(this.slick_data,this.key);
         },
 
         redraw_table: function() {
-            this.table.fnDraw();
+	    this.slick_grid.autosizeColumns();
+            this.slick_grid.render();
         },
 
         show_column: function(field) {
-            var oSettings = this.table.fnSettings();
-            var cols = oSettings.aoColumns;
-            var index = this.getColIndex(field,cols);
-            if (index != -1)
-                this.table.fnSetColumnVis(index, true);
+	    console.log ("querytable.show_column not yet implemented with slickgrid - field="+field);
         },
 
         hide_column: function(field) {
-	    console.log("hide_column not implemented - field="+field);
+	    console.log("querytable.hide_column not implemented with slickgrid - field="+field);
         },
 
         set_checkbox: function(record, checked) {
-	    console.log("set_checkbox not implemented");
-	    return;
             /* Default: checked = true */
             if (checked === undefined) checked = true;
 
@@ -185,15 +175,13 @@
 		messages.warning("querytable.set_checkbox record has no id to figure which line to tick");
 		return;
 	    }
-            var checkbox_id = this.flat_id(this.id('checkbox', id));
-            // function escape_id(myid) is defined in portal/static/js/common.functions.js
-            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) 
-                messages.debug("set_checkbox checked=" + checked
-                               + " id=" + checkbox_id + " matches=" + element.length);
-            element.attr('checked', checked);
+	    var index = this.slick_dataview.getIdxById(id);
+	    var selectedRows=this.slick_grid.getSelectedRows();
+	    if (checked) // add index in current list
+		selectedRows=selectedRows.concat(index);
+	    else
+		selectedRows=selectedRows.filter(function(idx) {return idx!=index;});
+	    this.slick_grid.setSelectedRows(selectedRows);
         },
 
         /*************************** QUERY HANDLER ****************************/
@@ -333,10 +321,15 @@
 
         on_all_query_done: function() {
 	    if (debug) messages.debug("1-shot initializing dataTables content with " + this.slick_data.length + " lines");
-	    this.slick_grid.setData (this.slick_data, true);
-	    if (debug) 
+	    var start=new Date();
+	    // use this.key as the key for identifying rows
+	    this.slick_dataview.setItems (this.slick_data, this.key);
+	    var duration=new Date()-start;
+	    if (debug) messages.debug("setItems " + 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]);
-	    this.slick_grid.render();
+	    }
 	    
             var self = this;
 	    // if we've already received the slice query, we have not been able to set 
@@ -403,35 +396,6 @@
             return ret;
         },
 
-        _querytable_draw_callback: function() {
-            /* 
-             * Handle clicks on checkboxes: reassociate checkbox click every time
-             * the table is redrawn 
-             */
-            this.elts('querytable-checkbox').unbind('click').click(this, this._check_click);
-
-            if (!this.table)
-                return;
-
-            /* Remove pagination if we show only a few results */
-            var wrapper = this.table; //.parent().parent().parent();
-            var rowsPerPage = this.table.fnSettings()._iDisplayLength;
-            var rowsToShow = this.table.fnSettings().fnRecordsDisplay();
-            var minRowsPerPage = this.table.fnSettings().aLengthMenu[0];
-
-            if ( rowsToShow <= rowsPerPage || rowsPerPage == -1 ) {
-                $('.querytable_paginate', wrapper).css('visibility', 'hidden');
-            } else {
-                $('.querytable_paginate', wrapper).css('visibility', 'visible');
-            }
-
-            if ( rowsToShow <= minRowsPerPage ) {
-                $('.querytable_length', wrapper).css('visibility', 'hidden');
-            } else {
-                $('.querytable_length', wrapper).css('visibility', 'visible');
-            }
-        },
-
         _check_click: function(e) {
             e.stopPropagation();