@@ -14,16 +14,29 @@ module Yui4Rails end def yui_datatable(statistics, div_id, options = {}) - return 'No data found.' if statistics.rows.empty? - model = statistics.rows.first.class - - data = statistics.rows.map(&:to_hash) - footer = "<tr class =\"totals_row\">#{statistics.footer_row_fields.map { |field| "<td><div class=\"yui-dt-liner\">#{field.to_s}</div></td>" }.join('')}</tr>" - Yui4Rails::Widgets::DataTable.new(:col_defs => model.table_def, - :data_rows => data, - :footer_row => footer, - :table_div_id => div_id, - :table_id => 'yui_table').render + rows = options[:data_array] || statistics.rows + return 'No data found.' if rows.empty? + model = rows.first.class + + data = rows.map(&:to_hash) + + table_def = model.table_def + table_options = {} + + unless table_def.first.delete(:skip_footer) + footer = "<tr class =\"totals_row\">#{statistics.footer_row_fields.map { |field| "<td><div class=\"yui-dt-liner\">#{field.to_s}</div></td>" }.join('')}</tr>" + table_options[:footer_row] = footer + end + + table_options[:row_formatter] = table_def.first.delete(:row_formatter) if table_def.first[:row_formatter] + table_options[:head_script] = table_def.first.delete(:head_script) if table_def.first[:head_script] + + table_options[:col_defs] = table_def + table_options[:data_rows] = data + table_options[:table_div_id] = div_id + table_options[:table_id] = 'yui_table' + + Yui4Rails::Widgets::DataTable.new(table_options).render end lib/yui4rails/helpers_extension.rb @@ -1,31 +1,31 @@ module Yui4Rails - module Widgets - - class Formatter; end + module Widgets + + class Formatter; end - class NumberFormatter < Formatter - def self.to_s - "number" - end - end + class NumberFormatter < Formatter + def self.to_s + "number" + end + end - class CurrencyFormatter < Formatter - def self.to_s - "currency" - end - end + class CurrencyFormatter < Formatter + def self.to_s + "currency" + end + end - def self.extract_keys(data_rows) - keys = [] - return keys if data_rows.empty? + def self.extract_keys(data_rows) + keys = [] + return keys if data_rows.empty? - data_rows.first.each do |k, v| - keys << { :key => k.to_s } - end - keys - end + data_rows.first.each do |k, v| + keys << { :key => k.to_s } + end + keys + end - class DataTable + class DataTable # Initialize new DataTable object # accepts either a list of arguments for backward compatability # or a hash of options. @@ -35,6 +35,8 @@ module Yui4Rails # * <tt>:col_defs</tt>: Hash of column definitions # * <tt>:data_rows</tt>: Hash of data rows # * <tt>:footer_row</tt>: footer div id. -See ActiveWarehouse for the yui_adapter than uses this + # * <tt>:row_formatter</tt>: string containing a Javascript function for row formatting + # * <tt>:head_script</tt>: string containing Javascript to push into the head of the page # * <tt>:options</tt>: additional hash of options, including :table_id, the # DOM element ID for the HTML table # @@ -74,6 +76,8 @@ module Yui4Rails if @data_rows and !@data_keys @data_keys = Widgets.extract_keys(@data_rows) end + @row_formatter = options.delete(:row_formatter) + head_script = options.delete(:head_script) @configs = options when String @table_div_id = args[0] @@ -83,7 +87,8 @@ module Yui4Rails @footer_row = args[3] || '' @configs = args[4] || {} end - Yui4Rails::AssetManager.manager.add_components :datatable + Yui4Rails::AssetManager.manager.add_components :datatable + Yui4Rails::AssetManager.manager.add_script head_script if head_script end # Add pagination to YUI datatable. @@ -111,18 +116,16 @@ module Yui4Rails self.send(meth) end - def render_from_html - <<-PAGE + def render_from_html + <<-PAGE <script type="text/javascript"> - #{get_configs} + #{get_configs} YAHOO.util.Event.addListener(window, "load", function() { YAHOO.example.EnhanceFromMarkup = new function() { var myColumnDefs = #{col_defs_to_json}; this.parseNumberFromCurrency = function(sString) { - //remove commas - sString = sString.replace(/,/, ''); - // Remove dollar sign and make it a float - return parseFloat(sString.substring(1)); + sString = sString.replace(/,/, ''); //remove commas + return parseFloat(sString.substring(1)); // Remove dollar sign and make it a float }; this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("#{@table_id}")); this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; @@ -131,32 +134,33 @@ module Yui4Rails }; this.myDataTable = new YAHOO.widget.DataTable("#{@table_div_id}", myColumnDefs, this.myDataSource, myConfigs); - }; }); </script> PAGE end - def render_from_json - <<-PAGE - <div id="#{@table_div_id}" class="yui-skin-sam"></div> - <script type="text/javascript"> - YAHOO.util.Event.addListener(window, "load", function() { - var myData = #{@data_rows.to_json}; - var myColumnDefs = #{@col_defs.to_json}; - myDataSource = new YAHOO.util.DataSource(myData); - myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY; - myDataSource.responseSchema = { - fields: #{@data_keys.to_json} - }; - this.myDataTable = new YAHOO.widget.DataTable("#{@table_div_id}", myColumnDefs, myDataSource); - $(myDataTable.getTableEl()).createTFoot().innerHTML = '#{@footer_row}'; - - }); - </script> - PAGE - end + def render_from_json + <<-PAGE + <div id="#{@table_div_id}" class="yui-skin-sam"></div> + <script type="text/javascript"> + #{@row_formatter.values.first if @row_formatter} + YAHOO.util.Event.addListener(window, "load", function() { + var myData = #{@data_rows.to_json}; + var myColumnDefs = #{@col_defs.to_json}; + myDataSource = new YAHOO.util.DataSource(myData); + myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY; + myDataSource.responseSchema = { + fields: #{@data_keys.to_json} + }; + this.myDataTable = new YAHOO.widget.DataTable("#{@table_div_id}", + myColumnDefs, + myDataSource#{", {formatRow: #{@row_formatter.keys.first}}" if @row_formatter}); + $(myDataTable.getTableEl()).createTFoot().innerHTML = '#{@footer_row}'; + }); + </script> + PAGE + end private # Constructs the myConfigs JavaScript variable if pagination or intial sort is used @@ -196,6 +200,6 @@ module Yui4Rails gsub(/FromCurrency\"/, 'FromCurrency'). gsub(/\"this\./, 'this.') end - end - end + end + end end lib/yui4rails/widgets/datatable.rb a0198b2d558bc5a84d5cf981e1f88988c0c64fdc Marty Haught mghaught@gmail.com http://github.com/mghaught/yui4rails/commit/927a5ec7f2ce36a5238e252c4d6c5bcd12efd190 927a5ec7f2ce36a5238e252c4d6c5bcd12efd190 2008-11-21T15:36:27-08:00 2008-11-21T15:36:27-08:00 SMC enhancements to datatable 6363f75f9eecde2bfdd10f6352268b818d3d4159 Marty Haught mghaught@gmail.com