Business intelligence made simple
Added local_time_suffix setting
Andrew Kane985f3c901a0c
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 0d379bc8..3de55eda 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -212,9 +212,15 @@ module Blazercsv << rows.first.keysendrows.each do |row|- csv << row.values.map { |v| v.is_a?(Time) ? v.in_time_zone(Blazer.time_zone) : v }+ csv << row.map { |k, v| v.is_a?(Time) ? blazer_time_value(k, v) : v }endendend++ def blazer_time_value(k, v)+ # yuck, instance var+ @data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)+ end+ helper_method :blazer_time_valueendenddiff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex dfbbd05b..2a96ffd3 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -98,7 +98,7 @@<% row.each do |k, v| %><td><% if v.is_a?(Time) %>- <% v = v.in_time_zone(Blazer.time_zone) %>+ <% v = blazer_time_value(k, v) %><% end %><% unless v.nil? %>diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 05892051..11bfb8f2 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -40,6 +40,10 @@ module Blazersettings["cache"]end+ def local_time_suffix+ @local_time_suffix ||= Array(settings["local_time_suffix"])+ end+def use_transaction?settings.key?("use_transaction") ? settings["use_transaction"] : trueend