wice_grid 3.4.10 → 3.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c917326faf115ba71d1c1e156815fa05cfc0ac71
-  data.tar.gz: 7db7696c87a0a9d8171044b5145337da821141ae
+  metadata.gz: 19f365e429574298ed3b586c2517491ec3df7513
+  data.tar.gz: 9e662dc2095c9885feb230952f881f3705cc12ee
 SHA512:
-  metadata.gz: ccab35cfcc8952ec2992fda26dc6ea8b332ec82476d81ea141e0625fe7351730c80833c494ac433c594b3e4a99d91b499d8fc52abb59f4143c1fbd7bdc611ad6
-  data.tar.gz: ee71fd6c9196446d51e22ee25763d78df102e768f36363972d11504f0daecfe4b53e90f288b646bc368f4b1026b5f2ba926f4487ff83a3ae0d9b69751576aa45
+  metadata.gz: a47a53ef05c4a51972399a7f0d5adb74788a03637b2f334642d4e07fe5e8d418e665cb00b37e037d5e36d0548269ce8220f46f39e9cc9e779c7067a0958895d7
+  data.tar.gz: a9160aef46162410f9420264c2fc102eb92ea23fa2f054cb1b5e8a7dec2a077f865a5ef8a3ea6d71998cad63fb08f59f7aeb6a0d9abb8af48e1307b5c29d9d27

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.4.10
+Version:: 3.4.11
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://wicegrid.herokuapp.com
@@ -677,27 +677,36 @@ with value <tt>:range</tt>:
   end
 
 
-=== Javascript Calendar for Date and DateTime Filters.
+=== Date and DateTime Filters
 
-WiceGrid uses jQuery datepicker[http://jqueryui.com/demos/datepicker/] for Date and DateTime filters by default.
-Because this is part of the standard jQuery codebase, it is not bundled together with the plugin,
-and it is the responsibility of the programmer to include all necessary assets including
-localization files if the application is multilingual.
-
-
-jQuery datepicker does not have any time related controls, and when dealing with DateTime filters, the time value is ignored.
-
-Another option is standard Rails helpers. It's possible to change between the two styles of Date/DateTime
-filters in <tt>config/initializers/wice_grid_config.rb</tt> using constant HELPER_STYLE, or set it on per-column basis:
+WiceGrid provides three ways of selecting dates and times. The default style is
+set in <tt>config/initializers/wice_grid_config.rb</tt> using the HELPER_STYLE
+constant. The available options are <tt>:calendar</tt> (jQueryUI datepicker),
+<tt>:html5</tt> and <tt>:standard</tt>. The style can also be individually
+configured via the <tt>helper_style</tt> option on a Date/DateTime filter
+column configuration:
 
   g.column name: 'Due Date', attribute: 'due_date', helper_style: :calendar do |task|
     task.due_date.to_s(:short) if task.due_date
   end
 
+  g.column name: 'Created', attribute: 'created_at', helper_style: :html5 do |task|
+    task.created_at.to_s(:short)
+  end
+
   g.column name: 'Updated', attribute: 'updated_at', helper_style: :standard do |task|
     task.created_at.to_s(:short)
   end
 
+==== jQueryUI DatePicker
+
+By default WiceGrid uses jQueryUI datepicker[http://jqueryui.com/demos/datepicker/] for Date and DateTime filters.
+Because this is part of the standard jQueryUI codebase, it is not bundled together with the plugin,
+and it is the responsibility of the programmer to include all necessary assets including
+localization files if the application is multilingual.
+
+jQueryUI datepicker does not have any time related controls, and when dealing with DateTime filters, the time value is ignored.
+
 Constants +DATE_FORMAT+ and +DATETIME_FORMAT+ in the configuration file define the format of dates the user will see, as well as the
 format of the string sent in a HTTP parameter. If you change the formats,  make sure that lamdbas defined
 in +DATETIME_PARSER+ and +DATE_PARSER+ return valid DateTime and Date objects.
@@ -712,7 +721,24 @@ you can always change this range dynamically with the following javascript:
 
   $( ".hasDatepicker" ).datepicker( "option", "yearRange", "2000:2042" );
 
+==== HTML5 input[type=date] DatePicker
+
+In stead of the jQueryUI version of the datepicker some Browsers implement
+their own datepicker which can be used as well without having to rely on
+jQueryUI.
+
+This helper_style actually also lets you use other javascript datepickers as
+well. For example if you want to use the
+bootstrap-datetimepicker[https://github.com/Eonasdan/bootstrap-datetimepicker]
+with a timepicker, you would do this:
+
+  $('input[type=date]').attr("type","text").datetimepicker();
+
+==== Rails standard input fields
 
+Another option is standard Rails helpers for date fields, these are separate
+select fields for years, months and days (also for hour and minute if it is a
+datetime field).
 
 == Detached Filters
 

data/lib/generators/wice_grid/templates/wice_grid_config.rb

@@ -112,6 +112,7 @@ if defined?(Wice::Defaults)
 
   # The default style of the date and datetime helper
   # * <tt>:calendar</tt> - JS calendar
+  # * <tt>:html5</tt> - HTML5 date input field
   # * <tt>:standard</tt> - standard Rails date and datetime helpers
   Wice::Defaults::HELPER_STYLE = :calendar
 

data/lib/wice/columns/column_datetime.rb

@@ -47,6 +47,16 @@ module Wice
         '</div>'
       end
 
+
+      def render_html5_filter_internal(params) #:nodoc:
+        css_class = 'form-control input-sm native-datepicker ' + (auto_reload ? 'auto-reload' : '')
+        date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
+        '<div class="date-filter">' +
+        date_field_tag(@name1, params[:fr].try(:strftime, date_format), {class: css_class, id: @dom_id}) + '<br/>' +
+        date_field_tag(@name2, params[:to].try(:strftime, date_format), {class: css_class, id: @dom_id2}) +
+        '</div>'
+      end
+
       def render_calendar_filter_internal(params) #:nodoc:
 
         calendar_data_from = prepare_data_for_calendar(
@@ -80,7 +90,10 @@ module Wice
         if helper_style == :standard
           prepare_for_standard_filter
           render_standard_filter_internal(params)
-        else
+        elsif helper_style == :html5
+          prepare_for_calendar_filter
+          render_html5_filter_internal(params)
+        else # :calendar
           prepare_for_calendar_filter
           render_calendar_filter_internal(params)
         end

data/lib/wice_grid.rb

@@ -71,9 +71,9 @@ module Wice
       @controller = controller
 
       @relation = klass_or_relation
-      @klass = klass_or_relation.is_a?(ActiveRecord::Relation) ?
-        klass_or_relation.klass :
-        klass_or_relation
+      @klass = @relation.kind_of?(Class) && @relation.ancestors.index(ActiveRecord::Base) ?
+        klass_or_relation :
+        klass_or_relation.klass
 
       unless @klass.kind_of?(Class) && @klass.ancestors.index(ActiveRecord::Base)
         raise WiceGridArgumentError.new("ActiveRecord model class (second argument) must be a Class derived from ActiveRecord::Base")

data/vendor/assets/javascripts/wice_grid_init.js.coffee

@@ -179,7 +179,7 @@ focusElementIfNeeded = (focusId) ->
 
 # autoreload for internal filters
 setupAutoreloadsForInternalFilters = (wiceGridContainer, gridProcessor) ->
-  $('select.auto-reload', wiceGridContainer).change ->
+  $('select.auto-reload, input.native-datepicker.auto-reload', wiceGridContainer).change ->
     gridProcessor.process()
 
   $('input.auto-reload', wiceGridContainer).keyup (event)->
@@ -203,7 +203,7 @@ setupAutoreloadsForExternalFilters =  ->
   $('.wg-detached-filter').each (index, detachedFilterContainer) ->
     gridProcessor = getGridProcessorForElement(detachedFilterContainer)
     if gridProcessor
-      $('select.auto-reload', detachedFilterContainer).change ->
+      $('select.auto-reload, input.native-datepicker.auto-reload', detachedFilterContainer).change ->
         gridProcessor.process()
 
       $('input.auto-reload', detachedFilterContainer).keyup (event)->

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.10'
+  s.version       = '3.4.11'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2014-08-26'
+  s.date          = '2014-11-20'
   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.10
+  version: 3.4.11
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -141,4 +141,3 @@ specification_version: 3
 summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically
   generated) filters.
 test_files: []
-has_rdoc: