turn off all the dataTables options in queryeditor - columns are properly aligned now

[myslice.git] / plugins / query_editor / static / js / query_editor.js

diff --git a/plugins/query_editor/static/js/query_editor.js b/plugins/query_editor/static/js/query_editor.js
index 1e15a01..90d113d 100644 (file)
--- a/plugins/query_editor/static/js/query_editor.js
+++ b/plugins/query_editor/static/js/query_editor.js
@@ -16,10 +16,16 @@
         event_filter_added: function(op, suffix) {
             suffix = (typeof suffix === 'undefined') ? '' : manifold.separator + suffix;
             var self = this;
-            return function(e) {
+            return function(e, ui) {
                 var array = self.array_from_id(e.target.id);
                 var key   = self.field_from_id(array); // No need to remove suffix...
-                var value = e.target.value;
+
+                // using autocomplete ui
+                if(typeof(ui) != "undefined"){
+                    var value = ui.item.value;
+                }else{
+                    var value = e.target.value;
+                }
 
                 if (value) {
                     // XXX This should be handled by manifold
@@ -34,7 +40,6 @@
 
         init: function(options, element) {
             this._super(options, element);
-
             this.listen_query(options.query_uuid);
 
             this.elts('queryeditor-auto-filter').change(this.event_filter_added('='));
@@ -67,22 +72,23 @@
             // We are currently using a DataTable display, but another browsing component could be better
             //jQuery('#'+this.options.plugin_uuid+'-table').dataTable...
             var  metaTable = this.elmt('table').dataTable({
-                bFilter     : false,
-                bPaginate   : false,
-                bInfo       : false,
-                sScrollX    : '100%',         // Horizontal scrolling
-                sScrollY    : '200px',
-                //bJQueryUI   : true,           // Use jQuery UI
-                bProcessing : true,           // Loading
-                aaSorting   : [[ 1, "asc" ]], // sort by column fields on load
-                aoColumnDefs: [
-                    { 'bSortable': false, 'aTargets': [ 0 ]},
-                    { 'sWidth': '8px', 'aTargets': [ 0 ] },
-                    { 'sWidth': '8px', 'aTargets': [ 4 ] } // XXX NB OF COLS
-                ]
+// Thierry : I'm turning off all the dataTables options for now, so that
+// the table displays more properly again, might need more tuning though
+//                bFilter     : false,
+//                bPaginate   : false,
+//                bInfo       : false,
+//                sScrollX    : '100%',         // Horizontal scrolling
+//                sScrollY    : '200px',
+//                //bJQueryUI   : true,           // Use jQuery UI
+//                bProcessing : true,           // Loading
+//                aaSorting   : [[ 1, "asc" ]], // sort by column fields on load
+//                aoColumnDefs: [
+//                    { 'bSortable': false, 'aTargets': [ 0 ]},
+//                    { 'sWidth': '8px', 'aTargets': [ 0 ] },
+//                    { 'sWidth': '8px', 'aTargets': [ 4 ] } // XXX NB OF COLS
+//                ]
             });
 
-            var self = this;
             // Actions on the newly added fields
             this.elmt('table tbody td span').on('click', function() {
                 var nTr = this.parentNode.parentNode;
@@ -105,6 +111,9 @@
                 'padding-top'   : '0em',
                 'padding-bottom': '0em'
             });
+            
+            // autocomplete list of tags
+            this.availableTags = {};
 
         }, // init
 
@@ -162,6 +171,7 @@
 
         on_field_added: function(field)
         {
+            console.log("on_field_added : "+field);
             this.check_field(field);
         },
 
@@ -170,6 +180,30 @@
             this.uncheck_field(field);
         },
 
+        /* RECORD HANDLERS */
+        on_query_done: function()
+        {
+            //console.log("Query_Editor: query_done!");
+            //console.log(this.availableTags);
+        },
+        on_new_record: function(record)
+        {
+            //console.log("Query_Editor: new_record!");
+            //console.log(record);
+            availableTags = this.availableTags;           
+            jQuery.each(record,function(key,value){
+                value = unfold.get_value(value);
+                if(!availableTags.hasOwnProperty(key)){availableTags[key]=new Array();}
+                //availableTags[key].push(value);
+                var currentArray = availableTags[key];
+                if(value!=null){
+                    if(jQuery.inArray(value,currentArray)==-1){availableTags[key].push(value);}
+                }
+           });
+           this.availableTags = availableTags;
+           this.update_autocomplete(availableTags);
+        },
+
         /* Former code not used at the moment */
 
         print_field_description: function(field_header, div_id) 
@@ -236,6 +270,23 @@
             return output;
         },
 
+        update_autocomplete: function(availableTags)
+        {
+            var self = this;
+            var domid = this.options.plugin_uuid;
+            
+            jQuery.each(availableTags, function(key, value){
+                value.sort();
+                jQuery("#"+domid+"__field__"+key).autocomplete({
+                            source: value,
+                            selectFirst: true,
+                            minLength: 0, // allows to browse items with no value typed in
+                            select: self.event_filter_added('=')
+                });
+            });                
+        }, // update_autocomplete     
+
+/*
         update_autocomplete: function(e, rows, current_query)
         {
             var d = data;
@@ -243,7 +294,7 @@
             var availableTags={};
             jQuery.each (rows, function(index, obj) {                    
                 jQuery.each(obj,function(key,value){                       
-                    value = get_value(value); 
+                    value = unfold.get_value(value); 
                     if(!availableTags.hasOwnProperty(key)){availableTags[key]=new Array();}
                     //availableTags[key].push(value);
                     var currentArray=availableTags[key];
@@ -272,7 +323,7 @@
                 });
             });                
         }, // update_autocomplete     
-
+*/
         fnFormatDetails: function( metaTable, nTr, div_id ) 
         {
             var aData = metaTable.fnGetData( nTr );