wice_grid 3.5.0 → 3.6.0.pre1

data/lib/wice/columns/column_float.rb

@@ -1,13 +1,9 @@
+# encoding: utf-8
 module Wice #:nodoc:
-
-
   module Columns #:nodoc:
-
     class ViewColumnFloat < ViewColumnInteger #:nodoc:
     end
 
     ConditionsGeneratorColumnFloat = ConditionsGeneratorColumnInteger #:nodoc:
-
   end
-
-end
+end

data/lib/wice/columns/column_html5_datepicker.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    class ViewColumnHtml5Datepicker < ViewColumn #:nodoc:
+
+      include Wice::Columns::CommonDateDatetimeMixin
+      include Wice::Columns::CommonJsDateDatetimeMixin
+
+      def do_render(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 wg-html5-datepicker">' +
+          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 has_auto_reloading_calendar? #:nodoc:
+        # To be implemented
+        false
+      end
+
+    end
+
+    class ConditionsGeneratorColumnHtml5Datepicker < ConditionsGeneratorColumn  #:nodoc:
+
+      include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
+
+    end
+  end
+end

data/lib/wice/columns/column_integer.rb

@@ -1,15 +1,13 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
     class ViewColumnInteger < ViewColumn #:nodoc:
-
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
 
         @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(eq: '')
 
-        opts = {size: 3, id: @dom_id, class: 'range-start'}
+        opts = { size: 3, id: @dom_id, class: 'range-start' }
 
         opts[:class] += ' form-control input-sm'
 
@@ -32,14 +30,13 @@ module Wice
       end
     end
 
-
     class ConditionsGeneratorColumnInteger < ConditionsGeneratorColumn  #:nodoc:
-      def get_op_and_value(val)
+      def get_op_and_value(val) #:nodoc:
         num = nil
         op  = nil
 
         # remove spaces
-        val = val.gsub(' ','')
+        val = val.gsub(' ', '')
 
         first_digit_or_dot_index = val =~ /[0-9.]/
         if first_digit_or_dot_index
@@ -47,21 +44,21 @@ module Wice
           op = '=' if op == ''
           num = Float(val[first_digit_or_dot_index..-1]) rescue nil
 
-          op = nil unless ['<','>','<=','>=','='].include?(op)
+          op = nil unless ['<', '>', '<=', '>=', '='].include?(op)
         end
         [op, num]
       end
 
-      def  generate_conditions(table_alias, opts)   #:nodoc:
-        unless opts.kind_of? Hash
-          Wice.log "invalid parameters for the grid integer filter - must be a hash"
+      def generate_conditions(table_alias, opts)   #:nodoc:
+        unless opts.is_a? Hash
+          Wice.log 'invalid parameters for the grid integer filter - must be a hash'
           return false
         end
         conditions = [[]]
         if opts[:eq]
           op, num = get_op_and_value(opts[:eq])
           if op && num
-            conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} " + op + " ? "
+            conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} " + op + ' ? '
             conditions << num
           else
             opts.delete(:eq)
@@ -77,6 +74,5 @@ module Wice
         conditions
       end
     end
-
   end
 end

data/lib/wice/columns/column_jquery_datepicker.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    class ViewColumnJqueryDatepicker < ViewColumn #:nodoc:
+
+      include Wice::JsCalendarHelpers
+      include Wice::Columns::CommonDateDatetimeMixin
+      include Wice::Columns::CommonJsDateDatetimeMixin
+
+      def do_render(params) #:nodoc:
+        calendar_data_from = prepare_data_for_calendar(
+          initial_date: params[:fr],
+          title:        NlMessage['date_selector_tooltip_from'],
+          name:         @name1,
+          fire_event:   auto_reload,
+          grid_name:    self.grid.name
+        )
+
+        calendar_data_to = prepare_data_for_calendar(
+          initial_date: params[:to],
+          title:        NlMessage['date_selector_tooltip_to'],
+          name:         @name2,
+          fire_event:   auto_reload,
+          grid_name:    self.grid.name
+        )
+
+        calendar_data_from.the_other_datepicker_id_to   = calendar_data_to.dom_id
+        calendar_data_to.the_other_datepicker_id_from   = calendar_data_from.dom_id
+
+        html1 = date_calendar_jquery calendar_data_from
+
+        html2 = date_calendar_jquery calendar_data_to
+
+        %(<div class="date-filter wg-jquery-datepicker">#{html1}<br/>#{html2}</div>)
+      end
+
+      def has_auto_reloading_calendar? #:nodoc:
+        auto_reload
+      end
+
+    end
+
+    class ConditionsGeneratorColumnJqueryDatepicker < ConditionsGeneratorColumn  #:nodoc:
+
+      include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
+
+    end
+  end
+end

data/lib/wice/columns/column_processor_index.rb

@@ -1,18 +1,23 @@
+# encoding: utf-8
 module Wice #:nodoc:
   module Columns #:nodoc:
+    require 'active_support'
+
     COLUMN_PROCESSOR_INDEX = ActiveSupport::OrderedHash[ #:nodoc:
-      :action   , 'column_action', # Special processor for action column, columns with checkboxes
-      :text     , 'column_string',
-      :string   , 'column_string',
-      :timestamp, 'column_datetime',
-      :datetime , 'column_datetime',
-      :date     , 'column_date',
-      :integer  , 'column_integer',
-      :range    , 'column_range',
-      :float    , 'column_float',
-      :decimal  , 'column_float',
-      :custom   , 'column_custom_dropdown',  # Special processor for custom filter columns
-      :boolean  , 'column_boolean'
+      :action,                 'column_action',               # Special processor for action column, columns with checkboxes
+      :text,                   'column_string',
+      :string,                 'column_string',
+      :rails_datetime_helper,  'column_rails_datetime_helper',       # standard Rails datepicker helper
+      :rails_date_helper,      'column_rails_date_helper',           # standard Rails date helper
+      :jquery_datepicker,      'column_jquery_datepicker',
+      :bootstrap_datepicker,   'column_bootstrap_datepicker',
+      :html5_datepicker,       'column_html5_datepicker',     # not ready
+      :integer,                'column_integer',
+      :range,                  'column_range',
+      :float,                  'column_float',
+      :decimal,                'column_float',
+      :custom,                 'column_custom_dropdown',      # Special processor for custom filter columns
+      :boolean,                'column_boolean'
     ]
   end
-end
+end

data/lib/wice/columns/column_rails_date_helper.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    class ViewColumnRailsDateHelper < ViewColumn #:nodoc:
+
+      include ActionView::Helpers::DateHelper
+      include Wice::Columns::CommonDateDatetimeMixin
+      include Wice::Columns::CommonStandardDateDatetimeMixin
+
+      def chunk_names #:nodoc:
+        %w(year month day)
+      end
+
+      def do_render(params) #:nodoc:
+        '<div class="date-filter">' +
+          select_date(params[:fr], include_blank: true, prefix: @name1, id: @dom_id) + '<br/>' +
+          select_date(params[:to], include_blank: true, prefix: @name2, id: @dom_id2) +
+          '</div>'
+      end
+
+      # name_and_id_from_options in Rails Date helper does not substitute '.' with '_'
+      # like all other simpler form helpers do. Thus, overriding it here.
+      def name_and_id_from_options(options, type)  #:nodoc:
+        options[:name] = (options[:prefix] || DEFAULT_PREFIX) + (options[:discard_type] ? '' : "[#{type}]")
+        options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
+      end
+
+
+      def has_auto_reloading_calendar? #:nodoc:
+        false
+      end
+
+    end
+
+    class ConditionsGeneratorColumnRailsDateHelper < ConditionsGeneratorColumn  #:nodoc:
+
+      include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
+
+    end
+  end
+end

data/lib/wice/columns/column_rails_datetime_helper.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    class ViewColumnRailsDatetimeHelper < ViewColumn #:nodoc:
+
+      include ActionView::Helpers::DateHelper
+      include Wice::Columns::CommonDateDatetimeMixin
+      include Wice::Columns::CommonStandardDateDatetimeMixin
+
+      def chunk_names #:nodoc:
+        %w(year month day hour minute)
+      end
+
+      def do_render(params) #:nodoc:
+        '<div class="date-filter">' +
+          select_datetime(params[:fr], include_blank: true, prefix: @name1) + '<br/>' +
+          select_datetime(params[:to], include_blank: true, prefix: @name2) +
+          '</div>'
+      end
+
+      # name_and_id_from_options in Rails Date helper does not substitute '.' with '_'
+      # like all other simpler form helpers do. Thus, overriding it here.
+      def name_and_id_from_options(options, type)  #:nodoc:
+        options[:name] = (options[:prefix] || DEFAULT_PREFIX) + (options[:discard_type] ? '' : "[#{type}]")
+        options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
+      end
+
+      def has_auto_reloading_calendar? #:nodoc:
+        false
+      end
+
+    end
+
+    class ConditionsGeneratorColumnRailsDatetimeHelper < ConditionsGeneratorColumn  #:nodoc:
+
+      include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
+
+    end
+  end
+end

data/lib/wice/columns/column_range.rb

@@ -1,17 +1,15 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
     class ViewColumnRange < ViewColumn #:nodoc:
-
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
 
         @query,  _, parameter_name,  @dom_id  = form_parameter_name_id_and_query(fr: '')
         @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(to: '')
 
-        opts1 = {size: 2, id: @dom_id,  class: 'form-control input-sm range-start'}
-        opts2 = {size: 2, id: @dom_id2, class: 'form-control input-sm range-end'}
+        opts1 = { size: 2, id: @dom_id,  class: 'form-control input-sm range-start' }
+        opts2 = { size: 2, id: @dom_id2, class: 'form-control input-sm range-end' }
 
         if auto_reload
           opts1[:class] += ' auto-reload'
@@ -36,12 +34,10 @@ module Wice
       end
     end
 
-
     class ConditionsGeneratorColumnRange < ConditionsGeneratorColumn  #:nodoc:
-
-      def  generate_conditions(table_alias, opts)   #:nodoc:
-        unless opts.kind_of? Hash
-          Wice.log "invalid parameters for the grid integer filter - must be a hash"
+      def generate_conditions(table_alias, opts)   #:nodoc:
+        unless opts.is_a? Hash
+          Wice.log 'invalid parameters for the grid integer filter - must be a hash'
           return false
         end
         conditions = [[]]
@@ -73,4 +69,4 @@ module Wice
       end
     end
   end
-end
+end

data/lib/wice/columns/column_string.rb

@@ -1,10 +1,13 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
     class ViewColumnString < ViewColumn #:nodoc:
 
-      attr_accessor :negation, :auto_reloading_input_with_negation_checkbox
+      # whether the filter contains a negation checkbox
+      attr_accessor :negation
+
+      # whether the filter contains a negation checkbox and autoreloading is necessary
+      attr_accessor :auto_reloading_input_with_negation_checkbox
 
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
@@ -18,15 +21,15 @@ module Wice
 
           '<div class="text-filter-container">' +
             text_field_tag(parameter_name, params[:v], size: 8, id: @dom_id, class: css_class) +
-            if defined?(Wice::Defaults::NEGATION_CHECKBOX_LABEL) && ! Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL).blank?
+            if defined?(Wice::Defaults::NEGATION_CHECKBOX_LABEL) && !Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL).blank?
               Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL)
             else
               ''
             end +
             check_box_tag(parameter_name2, '1', (params[:n] == '1'),
-              id: @dom_id2,
-              title: NlMessage['negation_checkbox_title'],
-              class: "negation-checkbox #{css_class}") +
+                          id: @dom_id2,
+                          title: NlMessage['negation_checkbox_title'],
+                          class: "negation-checkbox #{css_class}") +
             '</div>'
         else
           @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query('')
@@ -34,7 +37,6 @@ module Wice
         end
       end
 
-
       def yield_declaration_of_column_filter #:nodoc:
         if negation
           {
@@ -49,7 +51,6 @@ module Wice
         end
       end
 
-
       def has_auto_reloading_input? #:nodoc:
         auto_reload
       end
@@ -57,17 +58,14 @@ module Wice
       def auto_reloading_input_with_negation_checkbox? #:nodoc:
         self.auto_reloading_input_with_negation_checkbox
       end
-
     end
 
-
     class ConditionsGeneratorColumnString < ConditionsGeneratorColumn  #:nodoc:
-
       def generate_conditions(table_alias, opts)   #:nodoc:
-        if opts.kind_of? String
+        if opts.is_a? String
           string_fragment = opts
           negation = ''
-        elsif (opts.kind_of? Hash) && opts.has_key?(:v)
+        elsif (opts.is_a? Hash) && opts.key?(:v)
           string_fragment = opts[:v]
           negation = opts[:n] == '1' ? 'NOT' : ''
         else
@@ -77,12 +75,18 @@ module Wice
         if string_fragment.empty?
           return false
         end
-        [
-          " #{negation}  #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} #{::Wice.get_string_matching_operators(@column_wrapper.model)} ?",
-          '%' + string_fragment + '%'
-        ]
-      end
 
+        string_matching_operator = ::Wice.get_string_matching_operators(@column_wrapper.model)
+
+        comparator = if string_matching_operator == 'CI_LIKE'
+          " #{negation}  UPPER(#{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name}) LIKE  UPPER(?)"
+        else
+          " #{negation}  #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} #{string_matching_operator} ?"
+        end
+
+        [ comparator, '%' + string_fragment + '%' ]
+
+      end
     end
   end
-end
+end

data/lib/wice/columns/common_date_datetime_mixin.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    module CommonDateDatetimeMixin #:nodoc:
+
+      def render_filter_internal(params) #:nodoc:
+        prepare
+        do_render(params)
+      end
+
+      def yield_declaration_of_column_filter #:nodoc:
+        {
+          templates: @queris_ids.collect { |tuple|  tuple[0] },
+          ids:       @queris_ids.collect { |tuple|  tuple[1] }
+        }
+      end
+
+    end
+  end
+end