effective_datatables 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8245b3e64597822fd3608577b0d198b645743bbf
-  data.tar.gz: 2bab04a7e1dbacbb782c78084c5122e8297cf28e
+  metadata.gz: 3a4540891ea565b13ae981a76c6f66cab9db27dc
+  data.tar.gz: 2f9bdac71e4ebe1633a4155e2e80f6f1c7108d16
 SHA512:
-  metadata.gz: 8e57129d7124e7096e47b90260ed6fb6d9393c90cc863ccac05f26df52c6a38219badd9ad0a0b88392f391ad8f0438b302594586d14852b6f243a894cfd168e9
-  data.tar.gz: dde278cf7dcb86fefab899db6c8f234698cdb22f71ea51fa797cadcef2999324c13e17fab7ddea71d315514ad33ae15fe7f81b58f2e0e7be21ea7551cb95667a
+  metadata.gz: f4ac68ad4047dc1fb880a5f605d446fa64919cb5a0613f6531b3899028cb216b245c2f9de60b692099550792fdd9cdb9d443f50b8b9425a6bbef4233b6605677
+  data.tar.gz: a5eaf8683a46485d5dbd3d80967fa21ed32280dad8223284cf1cefbdf3633ae129bd71d2619567fb233b01c68c960a5c002228a746647f7c7f893d85458c2e17

data/app/helpers/effective_datatables_private_helper.rb

@@ -71,6 +71,15 @@ module EffectiveDatatablesPrivateHelper
         date_linked: false,
         input_js: { useStrict: true, keepInvalid: true }
         # Keep invalid format like "2015-11" so we can still search by year, month or day
+    when :time
+      form.input name, label: false, required: false, value: value,
+        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_time_picker) ? :effective_time_picker : :string),
+        placeholder: placeholder,
+        wrapper_html: wrapper_html,
+        input_group: false,
+        input_html: input_html,
+        date_linked: false,
+        input_js: { useStrict: false, keepInvalid: true }
     when :select, :boolean
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :select),

data/app/models/effective/datatable_value_tool.rb

@@ -112,6 +112,8 @@ module Effective
             end
           )
           obj >= term && obj <= end_at
+        when :time
+          (obj.hour == term.hour) && (term.min == 0 ? true : (obj.min == term.min))
         when :decimal, :currency
           if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
             if term < 0
@@ -176,6 +178,8 @@ module Effective
         raise 'unsupported'
       elsif obj.respond_to?(column[:name])
         obj.send(column[:name])
+      elsif column[:as] == :time && obj.respond_to?(:strftime)
+        (@_column_as_time ||= Time.zone.now.beginning_of_day) + ((1.hour * obj.hour) + (1.minute * obj.min)) # For search/order by time
       else
         obj
       end

data/app/models/effective/effective_datatable/format.rb

@@ -94,6 +94,8 @@ module Effective
           when Integer    ; view.number_to_currency(value / 100.0) # an Integer representing the number of cents
           when Numeric    ; view.number_to_currency(value)
           end
+        when :time
+          (value.strftime('%H:%M') rescue BLANK)
         else
           value.to_s
         end

data/app/models/effective/effective_datatable/resource.rb

@@ -39,6 +39,7 @@ module Effective
 
               if opts[:resource].column(field)
                 opts[:as] ||= opts[:resource].sql_type(field)
+                opts[:as] = :integer if opts[:resource].sql_type(field) == :belongs_to && field.end_with?('_id')
                 opts[:sql_column] = opts[:resource].sql_column(field) if opts[:sql_column].nil?
 
                 opts[:resource].sort_column = field

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.3'.freeze
+  VERSION = '3.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails