wice_grid 3.0.4 → 3.2.0.pre1

data/lib/view_columns/action_view_column.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+module Wice
+
+  class ActionViewColumn < ViewColumn #:nodoc:
+    def initialize(grid_obj, html, param_name, select_all_buttons, object_property, view)  #:nodoc:
+      @view = view
+      @select_all_buttons   = select_all_buttons
+      self.grid             = grid_obj
+      self.html             = html
+      self.html.add_or_append_class_value!('sel')
+      grid_name             = self.grid.name
+      @param_name           = param_name
+      @cell_rendering_block = lambda do |object, params|
+        selected = if params[grid_name] && params[grid_name][param_name] &&
+                      params[grid_name][param_name].index(object.send(object_property).to_s)
+          true
+        else
+          false
+        end
+        check_box_tag("#{grid_name}[#{param_name}][]", object.send(object_property), selected, :id => nil)
+      end
+    end
+
+    def in_html  #:nodoc:
+      true
+    end
+
+    def capable_of_hosting_filter_related_icons?  #:nodoc:
+      false
+    end
+
+    def name  #:nodoc:
+      return '' unless @select_all_buttons
+
+      content_tag(:div, '',
+        :class => 'clickable select-all',
+        :title => NlMessage['select_all']) + ' ' +
+      content_tag(:div, '',
+        :class => 'clickable deselect-all',
+        :title => NlMessage['deselect_all'])
+
+    end
+
+  end
+end

data/lib/view_columns/column_processor_index.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+module Wice
+  COLUMN_PROCESSOR_INDEX = {
+    :action     => 'action_view_column', # Special processor for action column, columns with checkboxes
+    :text       => 'view_column_string',
+    :string     => 'view_column_string',
+    :timestamp  => 'view_column_datetime',
+    :datetime   => 'view_column_datetime',
+    :date       => 'view_column_date',
+    :integer    => 'view_column_integer',
+    :float      => 'view_column_float',
+    :decimal    => 'view_column_float',
+    :custom     => 'view_column_custom_dropdown',  # Special processor for custom filter columns
+    :boolean    => 'view_column_boolean'
+  }
+end

data/lib/view_columns/view_column_boolean.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+module Wice
+
+
+  class ViewColumnBoolean < ViewColumnCustomDropdown #:nodoc:
+    include ActionView::Helpers::FormOptionsHelper
+
+    attr_accessor :boolean_filter_true_label, :boolean_filter_false_label
+
+    def render_filter_internal(params) #:nodoc:
+      @custom_filter = {
+        @filter_all_label => nil,
+        @boolean_filter_true_label  => 't',
+        @boolean_filter_false_label => 'f'
+      }
+
+      @turn_off_select_toggling = true
+      super(params)
+    end
+  end
+
+
+end

data/lib/view_columns/view_column_custom_dropdown.rb

@@ -0,0 +1,81 @@
+# encoding: UTF-8
+module Wice
+
+
+  class ViewColumnCustomDropdown < ViewColumn #:nodoc:
+    include ActionView::Helpers::FormOptionsHelper
+
+    attr_accessor :filter_all_label
+    attr_accessor :custom_filter
+
+    def render_filter_internal(params) #:nodoc:
+      @query, @query_without_equals_sign, @parameter_name, @dom_id = form_parameter_name_id_and_query('')
+      @query_without_equals_sign += '%5B%5D='
+
+      @custom_filter = @custom_filter.call if @custom_filter.kind_of? Proc
+
+      if @custom_filter.kind_of? Array
+
+        @custom_filter = [[@filter_all_label, nil]] + @custom_filter.map{|label, value|
+          [label.to_s, value.to_s]
+        }
+
+      end
+
+      select_options = {:name => @parameter_name + '[]', :id => @dom_id, :class => 'custom-dropdown'}
+
+      if @turn_off_select_toggling
+        select_toggle = ''
+      else
+        if self.allow_multiple_selection
+          select_options[:multiple] = params.is_a?(Array) && params.size > 1
+
+          expand_icon_style, collapse_icon_style = nil, 'display: none'
+          expand_icon_style, collapse_icon_style = collapse_icon_style, expand_icon_style if select_options[:multiple]
+
+          select_toggle = content_tag(:span, '',
+            :title => NlMessage['expand'],
+            :class => 'expand-multi-select-icon clickable',
+            :style => expand_icon_style
+          ) +
+          content_tag(:span, '',
+            :title => NlMessage['collapse'],
+            :class => 'collapse-multi-select-icon clickable',
+            :style => collapse_icon_style
+          )
+        else
+          select_options[:multiple] = false
+          select_toggle = ''
+        end
+      end
+
+      if auto_reload
+        select_options[:class] += ' auto-reload'
+      end
+
+      params_for_select = (params.is_a?(Hash) && params.empty?) ? [nil] : params
+
+      '<div class="custom-dropdown-container">'.html_safe_if_necessary +
+        content_tag(:select,
+          options_for_select(@custom_filter, params_for_select),
+          select_options) +
+      select_toggle.html_safe_if_necessary + '</div>'.html_safe_if_necessary
+    end
+
+
+    def yield_declaration_of_column_filter #:nodoc:
+      {
+        :templates => [@query_without_equals_sign],
+        :ids       => [@dom_id]
+      }
+    end
+
+
+    def has_auto_reloading_select? #:nodoc:
+      auto_reload
+    end
+  end
+
+
+
+end

data/lib/view_columns/view_column_date.rb

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+module Wice
+
+  class ViewColumnDate < ViewColumnDatetime #:nodoc:
+
+    @@datetime_chunk_names = %w(year month day)
+
+    def render_standard_filter_internal(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
+
+  end
+
+end

data/lib/view_columns/view_column_datetime.rb

@@ -0,0 +1,85 @@
+# encoding: UTF-8
+module Wice
+
+  class ViewColumnDatetime < ViewColumn #:nodoc:
+    include ActionView::Helpers::DateHelper
+    include Wice::JsCalendarHelpers
+
+
+    # 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
+
+    @@datetime_chunk_names = %w(year month day hour minute)
+
+    def prepare_for_standard_filter #:nodoc:
+      x = lambda{|sym|
+        @@datetime_chunk_names.collect{|datetime_chunk_name|
+          triple = form_parameter_name_id_and_query(sym => {datetime_chunk_name => ''})
+          [triple[0], triple[3]]
+        }
+      }
+
+      @queris_ids = x.call(:fr) + x.call(:to)
+
+      _, _, @name1, _ = form_parameter_name_id_and_query({:fr => ''})
+      _, _, @name2, _ = form_parameter_name_id_and_query({:to => ''})
+    end
+
+
+    def prepare_for_calendar_filter #:nodoc:
+      query, _, @name1, @dom_id = form_parameter_name_id_and_query(:fr => '')
+      query2, _, @name2, @dom_id2 = form_parameter_name_id_and_query(:to => '')
+
+      @queris_ids = [[query, @dom_id], [query2, @dom_id2] ]
+    end
+
+
+    def render_standard_filter_internal(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
+
+    def render_calendar_filter_internal(params) #:nodoc:
+
+      html1 = date_calendar_jquery(
+        params[:fr], NlMessage['date_selector_tooltip_from'], :prefix => @name1, :fire_event => auto_reload, :grid_name => self.grid.name)
+
+      html2 = date_calendar_jquery(
+        params[:to], NlMessage['date_selector_tooltip_to'],   :prefix => @name2, :fire_event => auto_reload, :grid_name => self.grid.name)
+
+      %!<div class="date-filter">#{html1}<br/>#{html2}</div>!
+    end
+
+
+    def render_filter_internal(params) #:nodoc:
+      if helper_style == :standard
+        prepare_for_standard_filter
+        render_standard_filter_internal(params)
+      else
+        prepare_for_calendar_filter
+        render_calendar_filter_internal(params)
+      end
+    end
+
+
+    def yield_declaration_of_column_filter #:nodoc:
+      {
+        :templates => @queris_ids.collect{|tuple|  tuple[0] },
+        :ids       => @queris_ids.collect{|tuple|  tuple[1] }
+      }
+    end
+
+
+    def has_auto_reloading_calendar? #:nodoc:
+      auto_reload && helper_style == :calendar
+    end
+
+  end
+
+end

data/lib/view_columns/view_column_float.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+module Wice
+
+  class ViewColumnFloat < ViewColumnInteger #:nodoc:
+  end
+
+end

data/lib/view_columns/view_column_integer.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+module Wice
+
+  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(:fr => '')
+      @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(:to => '')
+
+      opts1 = {:size => 3, :id => @dom_id,  :class => 'range-start'}
+      opts2 = {:size => 3, :id => @dom_id2, :class => 'range-end'}
+
+      if auto_reload
+        opts1[:class] += ' auto-reload'
+        opts2[:class] += ' auto-reload'
+      end
+
+      text_field_tag(parameter_name,  params[:fr], opts1) + text_field_tag(parameter_name2, params[:to], opts2)
+    end
+
+    def yield_declaration_of_column_filter #:nodoc:
+      {
+        :templates => [@query, @query2],
+        :ids       => [@dom_id, @dom_id2]
+      }
+    end
+
+
+    def has_auto_reloading_input? #:nodoc:
+      auto_reload
+    end
+
+  end
+
+
+end

data/lib/view_columns/view_column_string.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+module Wice
+
+  class ViewColumnString < ViewColumn #:nodoc:
+
+    attr_accessor :negation, :auto_reloading_input_with_negation_checkbox
+
+    def render_filter_internal(params) #:nodoc:
+      @contains_a_text_input = true
+      css_class = auto_reload ? 'auto-reload' : nil
+
+      if negation
+        self.auto_reloading_input_with_negation_checkbox = true if auto_reload
+
+        @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(:v => '')
+        @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(:n => '')
+
+        '<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?
+            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}") +
+          '</div>'
+      else
+        @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query('')
+        text_field_tag(parameter_name, (params.blank? ? '' : params), :size => 8, :id => @dom_id, :class => css_class)
+      end
+    end
+
+
+    def yield_declaration_of_column_filter #:nodoc:
+      if negation
+        {
+          :templates => [@query, @query2],
+          :ids       => [@dom_id, @dom_id2]
+        }
+      else
+        {
+          :templates => [@query],
+          :ids       => [@dom_id]
+        }
+      end
+    end
+
+
+    def has_auto_reloading_input? #:nodoc:
+      auto_reload
+    end
+
+    def auto_reloading_input_with_negation_checkbox? #:nodoc:
+      self.auto_reloading_input_with_negation_checkbox
+    end
+
+  end
+
+
+end

data/lib/wice_grid.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require 'will_paginate.rb'
 require 'wice_grid_misc.rb'
 require 'wice_grid_core_ext.rb'
@@ -13,9 +14,7 @@ require 'grid_output_buffer.rb'
 require 'wice_grid_controller.rb'
 require 'wice_grid_spreadsheet.rb'
 require 'wice_grid_serialized_queries_controller.rb'
-require 'js_adaptors/js_adaptor.rb'
-require 'js_adaptors/jquery_adaptor.rb'
-require 'js_adaptors/prototype_adaptor.rb'
+require 'view_columns/column_processor_index.rb'
 require 'view_columns.rb'
 
 
@@ -24,7 +23,7 @@ ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
 
 module Wice
 
-  class WiceGridRailtie < Rails::Railtie  #:nodoc:
+  class WiceGridEngine < ::Rails::Engine
 
     initializer "wice_grid_railtie.configure_rails_initialization" do |app|
 
@@ -45,23 +44,22 @@ module Wice
          ActionView::Helpers::FormTagHelper].each do |m|
           JsCalendarHelpers.send(:include, m)
         end
-      end
 
-      ActiveSupport.on_load :action_view do
         Wice::GridRenderer.send(:include, ::WillPaginate::ViewHelpers)
+        ViewColumn.load_column_processors
         require 'wice_grid_serialized_query.rb'
       end
-    end
 
-    rake_tasks do
-      load 'tasks/wice_grid_tasks.rake'
+      require 'will_paginate_paginator.rb'
+
     end
+
   end
 
   class WiceGrid
 
     attr_reader :klass, :name, :resultset, :custom_order, :query_store_model
-    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :saved_query
+    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :csv_field_separator, :saved_query
     attr_writer :renderer
     attr_accessor :output_buffer, :view_helper_finished, :csv_tempfile
 
@@ -100,6 +98,7 @@ module Wice
       @options = {
         :conditions           => nil,
         :csv_file_name        => nil,
+        :csv_field_separator  => Defaults::CSV_FIELD_SEPARATOR,
         :custom_order         => {},
         :enable_export_to_csv => Defaults::ENABLE_EXPORT_TO_CSV,
         :group                => nil,
@@ -123,6 +122,7 @@ module Wice
       @options.merge!(opts)
       @export_to_csv_enabled = @options[:enable_export_to_csv]
       @csv_file_name = @options[:csv_file_name]
+      @csv_field_separator = @options[:csv_field_separator]
 
       case @name = @options[:name]
       when String
@@ -207,18 +207,18 @@ module Wice
       end
     end
 
-    def declare_column(column_name, model_class, custom_filter_active, table_alias)  #:nodoc:
-      if model_class # this is an included table
-        column = @table_column_matrix.get_column_by_model_class_and_column_name(model_class, column_name)
-        raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{model_class.table_name}'!") if column.nil?
+    def declare_column(column_name, model, custom_filter_active, table_alias)  #:nodoc:
+      if model # this is an included table
+        column = @table_column_matrix.get_column_by_model_class_and_column_name(model, column_name)
+        raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{model.table_name}'!") if column.nil?
         main_table = false
-        table_name = model_class.table_name
+        table_name = model.table_name
       else
         column = @table_column_matrix.get_column_in_default_model_class_by_column_name(column_name)
         if column.nil?
           raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{@klass.table_name}'! " +
             "If '#{column_name}' belongs to another table you should declare it in :include or :join when initialising " +
-            "the grid, and specify :model_class in column declaration.")
+            "the grid, and specify :model in column declaration.")
         end
         main_table = true
         table_name = @table_column_matrix.default_model_class.table_name
@@ -325,9 +325,9 @@ module Wice
     def ordered_by?(column)  #:nodoc:
       return nil if @status[:order].blank?
       if column.main_table && ! offs = @status[:order].index('.')
-        @status[:order] == column.attribute_name
+        @status[:order] == column.attribute
       else
-        @status[:order] == column.table_alias_or_table_name + '.' + column.attribute_name
+        @status[:order] == column.table_alias_or_table_name + '.' + column.attribute
       end
     end
 
@@ -393,7 +393,7 @@ module Wice
 
     # with this variant we get even those values which do not appear in the resultset
     def distinct_values_for_column(column)  #:nodoc:
-      res = column.model_klass.find(:all, :select => "distinct #{column.name}", :order => "#{column.name} asc").collect{|ar|
+      res = column.model.find(:all, :select => "distinct #{column.name}", :order => "#{column.name} asc").collect{|ar|
         ar[column.name]
       }.reject{|e| e.blank?}.map{|i|[i,i]}
     end
@@ -599,10 +599,10 @@ module Wice
   # to be mixed in into ActiveRecord::ConnectionAdapters::Column
   module WiceGridExtentionToActiveRecordColumn #:nodoc:
 
-    attr_accessor :model_klass
+    attr_accessor :model
 
     def alias_or_table_name(table_alias)
-      table_alias || self.model_klass.table_name
+      table_alias || self.model.table_name
     end
 
     def wg_initialize_request_parameters(all_filter_params, main_table, table_alias, custom_filter_active)  #:nodoc:
@@ -686,8 +686,7 @@ module Wice
   class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
 
     def generate_conditions(table_alias, opts)   #:nodoc:
-      if opts.empty?
-        Wice.log "empty parameters for the grid custom filter"
+      if opts.empty? || (opts.is_a?(Array) && opts.size == 1 && opts[0].blank?)
         return false
       end
       opts = (opts.kind_of?(Array) && opts.size == 1) ? opts[0] : opts
@@ -756,10 +755,9 @@ module Wice
         return false
       end
       if string_fragment.empty?
-        Wice.log "invalid parameters for the grid string filter - empty string"
         return false
       end
-      [" #{negation}  #{@column.alias_or_table_name(table_alias)}.#{@column.name} #{::Wice.get_string_matching_operators(@column.model_klass)} ?",
+      [" #{negation}  #{@column.alias_or_table_name(table_alias)}.#{@column.name} #{::Wice.get_string_matching_operators(@column.model)} ?",
           '%' + string_fragment + '%']
     end
 
@@ -795,7 +793,6 @@ module Wice
       end
 
       if conditions.size == 1
-        Wice.log "invalid parameters for the grid integer filter - either range limits are not supplied or they are not numeric"
         return false
       end