clark_kent 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad8b557d6a6b7c6149b375a68363a5288240cc6
-  data.tar.gz: 7f9501da997f69055dd159907b737da46debe077
+  metadata.gz: fe22bd3faedb9def5b87a6d211ad636b4a19d205
+  data.tar.gz: d29d05f7cd1eef5d5d51ea3571a97ab214f1235e
 SHA512:
-  metadata.gz: 859a397f8ae84eda1465d38918e51cc23af9e5b4168a9bd81f272891dd9f72ac0ea6222adf0bbb1495e3e0178fd32af813d7d8c267521bf3a22751ee40e6fa83
-  data.tar.gz: 0d2480f4860f2f3d1b147dc22653b7d8e118347731da9bf21c639fd98eaae656f91b39a0651ec227c3032aa95e8765be75cbee8c12a69d81b42f1364c7d19a14
+  metadata.gz: 0a3af043dddd9aa010e65f75b9c2d4ced95a4fe36d0b7cf8df68a9568f058c2e054968872a47d65cead3fb8f30d3e507cf439c5e14d007cb257e36336bcf35e8
+  data.tar.gz: 7a9fb1a4648833e2e73e99692806a5b16966a786931df1c7660d8e2cc31c01b48f6c6d3b624126a85dec59a358a76e9636402be747cddf58ccf7e44dc2e9da4f

data/app/helpers/clark_kent/application_helper.rb

@@ -33,11 +33,20 @@ module ClarkKent
       (value =~ /\d/) && (value =~ /\./) && !(value =~ /[a-zA-Z]/)
     end
 
-    def display_for_value(value, column=nil)
+    def display_for_value(value, column, row)
       ##TODO, genericize this link display. link info must come from model config.
       return link_to(value, main_app.send(column.link, id: value)) if column.try(:link) && value.present?
       return value.join(', ') if value.is_a? Array
       return value.to_formatted_s(:datepicker) if value.is_a? Date
+      if [DateTime,Time,ActiveSupport::TimeWithZone].any?{|k| value.class <= k}
+        if column.try(:time_zone_column) && row[column.time_zone_column].present?
+          time_zone = row[column.time_zone_column]
+          display_time = value.in_time_zone(time_zone)
+        else
+          display_time = value
+        end
+        return display_time.to_s(column.try :time_format)
+      end
       return number_to_currency(value) if value.is_a? Float or value.is_a? BigDecimal or is_decimal?(value)
       return '&#10003;'.html_safe if 't' == value or true == value
       return '' if 'f' == value or false == value

data/app/models/clark_kent/report.rb

@@ -26,7 +26,7 @@ module ClarkKent
       report = ('ClarkKent::ReportEmail' == report_class.name) ? reportable.report : reportable
       query = reportable.get_query(params)
       row_count = reportable.get_query(params, true)
-      bucket = AWS::S3::Bucket.new(ClarkKent::ReportUploaderBucketName)
+      bucket = Aws::S3::Bucket.new(ClarkKent::ReportUploaderBucketName)
       report_destination = bucket.objects[params[:report_result_name]]
       byte_count = 0
       temp_buffer = report.headers.to_csv

data/app/models/clark_kent/report_column.rb

@@ -32,6 +32,14 @@ module ClarkKent
     def link
       report.column_options_for(self.name.to_sym).link
     end
+
+    def time_zone_column
+      report.column_options_for(self.name.to_sym).time_zone_column
+    end
+
+    def time_format
+      report.column_options_for(self.name.to_sym).time_format
+    end
 	end
 
 	class AbstractCalculator

data/app/models/clark_kent/report_config.rb

@@ -16,7 +16,7 @@ module ClarkKent
     end
   end
   class ReportColumnConfig
-    attr_accessor :name, :order_sql, :custom_select, :link, :summarizable, :includes, :joins, :extra_scopes, :where, :group
+    attr_accessor :name, :order_sql, :custom_select, :link, :time_zone_column, :time_format, :summarizable, :includes, :joins, :extra_scopes, :where, :group
     def initialize params = {}
       params.each { |key, value| send "#{key}=", value }
     end

data/app/views/clark_kent/reports/show.html.erb

@@ -33,7 +33,7 @@
 			<% @rows.each do |row| %>
 				<tr>
 					<% @report.report_columns.each do |column| %>
-						<td><%= display_for_value(row[column.column_name], column) %></td>
+						<td><%= display_for_value(row[column.column_name], column, row) %></td>
 					<% end %>
 				</tr>
 			<% end %>

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end