Business intelligence made simple
Better tooltips
Andrew Kaneb483bc2cc070
diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 79c16da4..4e1981bc 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -40,7 +40,13 @@<% chart_id = SecureRandom.hex %><% column_types = @result.column_types %><% chart_type = @result.chart_type %>- <% chart_options = {id: chart_id, min: nil} %>+ <% chart_options = {id: chart_id} %>+ <% if ["line", "line2"].include?(chart_type) %>+ <% chart_options.merge!(min: nil) %>+ <% end %>+ <% if !["scatter"].include?(chart_type) %>+ <% chart_options.merge!(library: {tooltips: {mode: "index", intersect: false, position: "nearest"}}) %>+ <% end %><% series_library = {} %><% target_index = @columns.index { |k| k.downcase == "target" } %><% if target_index %>@@ -80,7 +86,7 @@<% elsif chart_type == "line2" %><%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options %><% elsif chart_type == "bar" %>- <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, id: chart_id %>+ <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, chart_options %><% elsif chart_type == "bar2" %><% first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1) %><% labels = first_20.map { |r| r[0] }.uniq %>@@ -90,9 +96,9 @@<% first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s } %><% end %><% end %>- <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, id: chart_id %>+ <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, chart_options %><% elsif chart_type == "scatter" %>- <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], id: chart_id %>+ <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options %><% elsif @only_chart %><% if @rows.size == 1 && @rows.first.size == 1 %><% v = @rows.first.first %>