--- sql-editor.js 2009/04/15 18:42:41 15 +++ sql-editor.js 2009/04/19 00:02:11 28 @@ -49,7 +49,7 @@ .addClass('changed') .attr('options').selectedIndex = col_nr ; - $('form#sql input[name=add_group_by]') + $('form#sql input[name=lookup_col]') .addClass('changed') .attr('value', column) .css('display','block') @@ -63,44 +63,54 @@ console.error('unknown click on ', tag, e); } - $('form#sql').addClass('visible'); + $('form#sql').addClass('visible').addClass('fixed'); }; $('table#results').bind('mouseup', click_on_cell); $('#status').bind('click', function() { - $('form#sql').toggleClass('visible'); + $('form#sql').toggleClass('visible').addClass('fixed'); }); - $('input[name=add_group_by]').bind('click', function(e) { + $('input[name=lookup_col]').bind('click', function(e) { var l = $('div#lookup'); - var column = $('form#sql input[name=add_group_by]').attr('value'); + var column = $('form#sql input[name=lookup_col]').attr('value'); var col_nr = $('form#sql select[name=where_column]').attr('options').selectedIndex; + var operator = $('select[name=where_operator]').attr('options').selectedIndex; - l.html('...loading '+column+'...').css('display','block'); + l.html('...loading lookup for '+column+'...').css('display','block').scrollTop(0); console.debug( this, e, column, col_nr, l ); - $('input[name=add_group_by]') + $('input[name=lookup_col]') .removeClass('changed') .attr('disabled', 1); - $.get('', { add_group_by: column }, function(data,textStatus) { + var where_parts = []; + $('input[name=where_parts]').each(function(){ if (this.checked) where_parts.push(this.value) }); + var args = { + table: $('input[name=from]').val(), + lookup_col: column, + where_parts: where_parts, + }; + console.debug( 'get', args ); + $.get('', args, function(data,textStatus) { console.debug( data, textStatus ); l.addClass('changed'); l.html( data ); $('div#lookup a') .bind('click', function(e) { - console.debug( e ); + console.debug( 'lookup click', e ); $('form#sql input[name=where_value]') - .addClass('changed') .attr('value', e.target.text ) ; $('form#sql select[name=where_column]') - .addClass('changed') .attr('options').selectedIndex = col_nr ; + $('select[name=where_operator]') + .attr('options').selectedIndex = operator + 1 // remove not + ; return false; }); });