@@ -27,7 +27,7 @@ module ActiveOLAP::Helpers
end
case options[:for]
- when :line_chart; end_time
+ when :line_chart; begin_time
else; "#{begin_time} - #{end_time}"
end
end
lib/active_olap/helpers/display_helper.rb
@@ -11,19 +11,19 @@ module ActiveOLAP::Helpers
raise "Only suitable for 2D cubes" unless cube.depth == 2
raise "Only 1 aggregate supported" if cube.aggregates.length > 1
- content_tag(:table, html_options.merge(:class => "active-olap table 2d")) do
+ html = content_tag(:table, html_options.merge(:class => "active-olap table 2d")) do
content_tag(:thead) do
- content_tag(:tr) do
+ content_tag(:tr, :class => 'category') do
content_tag(:th, ' ') + "\n\t" +
cube.dimensions[1].categories.map do |category|
- content_tag(:th, show_active_olap_category(category, :for => :matrix), :class => 'category', :id => "category-#{category.label}")
+ content_tag(:th, show_active_olap_category(category, :for => :matrix), :class => 'column', :id => "category-#{category.label}")
end.join
end
end << "\n" <<
content_tag(:tbody) do
cube.map do |category, sub_cube|
- content_tag(:tr, :class => 'category', :id => "category-#{category.label}") do
- "\t\n" + content_tag(:th, show_active_olap_category(category, :for => :matrix)) +
+ content_tag(:tr) do
+ "\t\n" + content_tag(:th, show_active_olap_category(category, :class => 'category row', :id => "category-#{category.label}", :for => :matrix)) +
sub_cube.map do |category, value|
content_tag(:td, show_active_olap_value(category, cube.aggregates.first, value, :for => :matrix), :class => 'value')
end.join
@@ -31,6 +31,16 @@ module ActiveOLAP::Helpers
end
end
end
+
+ if options[:totals]
+ html << content_tag(:tr, :class => 'totals') do
+ "\t\n" + content_tag(:th, ' ') +
+ cube.map do |sub_cube, value|
+ content_tag(:td, show_active_olap_value(sub_cube.category, cube.aggregates.first, cube.sum, :for => :matrix), :class => 'value')
+ end.join
+ end
+
+ end
end
def active_olap_table(cube, options = {}, html_options = {})
lib/active_olap/helpers/table_helper.rb
3146c8ae87a3a9adf84a52947ef3cb35a3f345aa
Willem van Bergen
willem@vanbergen.org
http://github.com/wvanbergen/active_olap/commit/875a8113379dfad9006043e19d020cd317f02071
875a8113379dfad9006043e19d020cd317f02071
2008-12-23T08:26:36-08:00
2008-12-23T08:26:36-08:00
Tweaking some helpers
6187334e571641e67a6402173ac8a46c091ecb70
Willem van Bergen
willem@vanbergen.org