wice_grid 3.4.11 → 3.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f365e429574298ed3b586c2517491ec3df7513
-  data.tar.gz: 9e662dc2095c9885feb230952f881f3705cc12ee
+  metadata.gz: 413aebde3b5db88a0344afa85967a8cc20bf8b93
+  data.tar.gz: e5fb12b067ae1ab6f2b300be40c28ad5dc7b9b8e
 SHA512:
-  metadata.gz: a47a53ef05c4a51972399a7f0d5adb74788a03637b2f334642d4e07fe5e8d418e665cb00b37e037d5e36d0548269ce8220f46f39e9cc9e779c7067a0958895d7
-  data.tar.gz: a9160aef46162410f9420264c2fc102eb92ea23fa2f054cb1b5e8a7dec2a077f865a5ef8a3ea6d71998cad63fb08f59f7aeb6a0d9abb8af48e1307b5c29d9d27
+  metadata.gz: 583884d003c2c0f4c37337431576de5c0864aca77ee4599032aaf1906c5a863d58279ef9b9158650790ae6728eee65a08a494edf19bcc68ccdc3dfbeb559c4f9
+  data.tar.gz: 29520324979eadf2d8d3fa91a4ad3467630a4975e62ed17f498ae775e747956e49086d3ca7e9def66bb06d73f7b3a34d917ccc0eabeb02b488e260c02ceca09a

data/lib/wice/columns/column_date.rb

@@ -5,7 +5,9 @@ module Wice
 
     class ViewColumnDate < ViewColumnDatetime #:nodoc:
 
-      @@datetime_chunk_names = %w(year month day)
+      def chunk_names
+        %w(year month day)
+      end
 
       def render_standard_filter_internal(params) #:nodoc:
         '<div class="date-filter">' +
@@ -16,7 +18,27 @@ module Wice
 
     end
 
-    ConditionsGeneratorColumnDate = ConditionsGeneratorColumnDatetime #:nodoc:
+
+    class ConditionsGeneratorColumnDate < ConditionsGeneratorColumn  #:nodoc:
+
+      def generate_conditions(table_alias, opts)   #:nodoc:
+        conditions = [[]]
+        if opts[:fr]
+          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} >= ? "
+          conditions << opts[:fr].to_date
+        end
+
+        if opts[:to]
+          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} < ? "
+          conditions << (opts[:to].to_date + 1)
+        end
+
+        return false if conditions.size == 1
+
+        conditions[0] = conditions[0].join(' and ')
+        conditions
+      end
+    end
 
   end
 

data/lib/wice/columns/column_datetime.rb

@@ -15,11 +15,13 @@ module Wice
         options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
       end
 
-      @@datetime_chunk_names = %w(year month day hour minute)
+      def chunk_names
+        %w(year month day hour minute)
+      end
 
       def prepare_for_standard_filter #:nodoc:
         x = lambda{|sym|
-          @@datetime_chunk_names.collect{|datetime_chunk_name|
+          chunk_names.map{|datetime_chunk_name|
             triple = form_parameter_name_id_and_query(sym => {datetime_chunk_name => ''})
             [triple[0], triple[3]]
           }
@@ -122,12 +124,12 @@ module Wice
         conditions = [[]]
         if opts[:fr]
           conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} >= ? "
-          conditions << opts[:fr].to_date
+          conditions << opts[:fr]
         end
 
         if opts[:to]
           conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} < ? "
-          conditions << (opts[:to].to_date + 1)
+          conditions << (opts[:to])
         end
 
         return false if conditions.size == 1

data/lib/wice/helpers/wice_grid_view_helpers.rb

@@ -494,15 +494,17 @@ module Wice
 
       grid.output_buffer << '</div>'
 
+
+
       if Rails.env.development?
-        grid.output_buffer  <<  javascript_tag(%/ window.onload = function(){ \n/ +
+        grid.output_buffer  <<  javascript_tag(%/ $(document).ready(function(){ \n/ +
           %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
           %$   alert("wice_grid.js not loaded, WiceGrid cannot proceed!\\n" +\n$ +
           %$     "Make sure that you have loaded wice_grid.js.\\n" +\n$ +
           %$     "Add line\\n//= require wice_grid.js\\n" +\n$ +
           %$     "to app/assets/javascripts/application.js")\n$ +
           %$ }\n$ +
-          %$ } $)
+          %$ }) $)
       end
 
       grid.output_buffer

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.11'
+  s.version       = '3.4.12'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2014-11-20'
+  s.date          = '2014-12-31'
   s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
   s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
                     'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.11
+  version: 3.4.12
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari