Business intelligence made simple
Improved variable name
Andrew Kane34bcaa8b848c
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 910aa86f..92760908 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -243,7 +243,7 @@ module Blazer@min_width_types = @columns.each_with_index.select { |c, i| @first_row[i].is_a?(Time) || @first_row[i].is_a?(String) || @data_source.smart_columns[c] }.map(&:last)- @boom = @result.boom if @result+ @smart_values = @result.smart_values if @result@linked_columns = @data_source.linked_columnsdiff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 934c173b..633f5a9b 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -85,11 +85,11 @@<% chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} } %><%= line_chart chart_data, **chart_options %><% 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 %>+ <%= line_chart @rows.group_by { |r| v = r[1]; (@smart_values[@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 == "pie" %>- <%= pie_chart @rows.map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **chart_options %>+ <%= pie_chart @rows.map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **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]] } } }, **chart_options %>+ <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@smart_values[@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 %>@@ -99,7 +99,7 @@<% 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]] }} }, **chart_options %>+ <%= column_chart first_20.group_by { |r| v = r[1]; (@smart_values[@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]; [(@smart_values[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, **chart_options %><% elsif chart_type == "scatter" %><%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options %><% elsif @only_chart %>@@ -156,7 +156,7 @@<% end %><% end %>- <% if v2 = (@boom[k] || {})[v.nil? ? v : v.to_s] %>+ <% if v2 = (@smart_values[k] || {})[v.nil? ? v : v.to_s] %><div class="text-muted"><%= v2 %></div><% end %></td>diff --git a/lib/blazer/result.rb b/lib/blazer/result.rbindex bd38b713..58458cfe 100644--- a/lib/blazer/result.rb+++ b/lib/blazer/result.rb@@ -20,9 +20,9 @@ module Blazercached_at.present?end- def boom- @boom ||= begin- boom = {}+ def smart_values+ @smart_values ||= begin+ smart_values = {}columns.each_with_index do |key, i|smart_columns_data_source =([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_columns[key] }@@ -38,10 +38,10 @@ module Blazerresult.rowsend- boom[key] = res.to_h { |k, v| [k.nil? ? k : k.to_s, v] }+ smart_values[key] = res.to_h { |k, v| [k.nil? ? k : k.to_s, v] }endend- boom+ smart_valuesendend@@ -49,7 +49,7 @@ module Blazer@column_types ||= begincolumns.each_with_index.map do |k, i|v = (rows.find { |r| r[i] } || {})[i]- if boom[k]+ if smart_values[k]"string"elsif v.is_a?(Numeric)"numeric"@@ -140,7 +140,7 @@ module Blazerseries << {name: k, data: rows.map{ |r| [r[0], r[i + 1]] }}endelse- rows.group_by { |r| v = r[1]; (boom[columns[1]] || {})[v.to_s] || v }.each_with_index.map do |(name, v), i|+ rows.group_by { |r| v = r[1]; (smart_values[columns[1]] || {})[v.to_s] || v }.each_with_index.map do |(name, v), i|series << {name: name, data: v.map { |v2| [v2[0], v2[2]] }}endend