@@ -5,16 +5,16 @@ class DemoController < ApplicationController end def simple_example - @report = ActiveWarehouse::Report::TableReport.new( + @view = ActiveWarehouse::Report::TableReport.new( :title => "Simple Report", :cube_name => :regional_sales, :column_dimension_name => :date, :row_dimension_name => :store - ) + ).view(params) end def example1 - @report = ActiveWarehouse::Report::TableReport.new( + @view = ActiveWarehouse::Report::TableReport.new( :title => "Example 1", :cube_name => :regional_sales, :column_dimension_name => :date, @@ -25,10 +25,10 @@ class DemoController < ApplicationController :row_dimension_name => :store, :row_hierarchy => :region, :format => {:gross_margin => Proc.new {|value| sprintf("%.2f", value) }} - ) + ).view(params) end def example2 - @report = ActiveWarehouse::Report::TableReport.new( + @view = ActiveWarehouse::Report::TableReport.new( :title => "Example 2", :cube_name => :regional_sales, :column_dimension_name => :date, @@ -36,10 +36,10 @@ class DemoController < ApplicationController :row_dimension_name => :store, :row_hierarchy => :location, :format => {:gross_margin => Proc.new {|value| sprintf("%.2f", value) }} - ) + ).view(params) end def example3 - @report = ActiveWarehouse::Report::TableReport.new( + @view = ActiveWarehouse::Report::TableReport.new( :title => "Example 3", :cube_name => :product_sales, :column_dimension_name => :date, @@ -47,7 +47,7 @@ class DemoController < ApplicationController :row_dimension_name => :product, :row_hierarchy => :product, :format => {:gross_margin => Proc.new {|value| sprintf("%.2f", value) }} - ) + ).view(params) end def example4 # TODO: this is ugly as sin right now. I need to clean it up and put it into a helper @@ -83,7 +83,7 @@ class DemoController < ApplicationController params[:rd] = @row_dimension = @row_dimension.to_sym params[:rh] = @row_hierarchy = @row_hierarchy.to_sym - @report = ActiveWarehouse::Report::TableReport.new( + @view = ActiveWarehouse::Report::TableReport.new( :title => "Example 4", :cube_name => :product_sales, :column_dimension_name => @col_dimension, @@ -91,7 +91,7 @@ class DemoController < ApplicationController :row_dimension_name => @row_dimension, :row_hierarchy => @row_hierarchy, :format => {:gross_margin => Proc.new {|value| sprintf("%.2f", value) }} - ) + ).view(params) end def fact_list app/controllers/demo_controller.rb @@ -3,4 +3,4 @@ <%= link_to 'Top of Report', :action => 'example1'%> </p> -<%= render_report(@report, :report_class => 'report') %> \ No newline at end of file +<%= render_report_from(@view, :report_class => 'report') %> app/views/demo/example1.rhtml @@ -3,4 +3,4 @@ <%= link_to 'Top of Report', :action => 'example2'%> </p> -<%= render_report(@report, :report_class => 'report') %> \ No newline at end of file +<%= render_report_from(@view, :report_class => 'report') %> app/views/demo/example2.rhtml @@ -3,4 +3,4 @@ <%= link_to 'Top of Report', :action => 'example3'%> </p> -<%= render_report(@report, :report_class => 'report') %> \ No newline at end of file +<%= render_report_from(@view, :report_class => 'report') %> app/views/demo/example3.rhtml @@ -1,7 +1,7 @@ <div style="float:right;"> - <%= form_tag %> + <% form_tag '/demo/example4' do -%> <div>Column: <%= select_tag :col_pivot, options_for_select(@pivots.collect {|pivot| [pivot[:name], pivot[:index]] }) %> Row: <%= select_tag :row_pivot, options_for_select(@pivots.collect {|pivot| [pivot[:name], pivot[:index]] }) %> <%= submit_tag 'Refresh' %></div> - <%= end_form_tag %> + <% end -%> </div> <p> @@ -9,4 +9,4 @@ <%= link_to 'Top of Report', :action => 'example4'%> </p> -<%= render_report(@report, :report_class => 'report') %> \ No newline at end of file +<%= render_report_from(@view, :report_class => 'report') %> app/views/demo/example4.rhtml @@ -1 +1 @@ -<%= render_report @report %> \ No newline at end of file +<%= render_report_from @view %> app/views/demo/simple_example.rhtml 0618185cac128e256fac450bd6b70367fa969b77 Bob Cotton bob.cotton@rallydev.com http://github.com/bcotton/activewarehouse-demo/commit/622071bed499232cf67b418fcc929b541ced8be5 622071bed499232cf67b418fcc929b541ced8be5 2008-05-12T06:35:43-07:00 2008-05-12T06:35:43-07:00 Use new render_report_from to use the view, not the report 2b0691f3a60e37c3c875452a3608db26c8988ba9 Bob Cotton bob.cotton@rallydev.com