wice_grid 3.5.0 → 3.6.0.pre1

data/lib/wice/columns.rb

@@ -1,37 +1,32 @@
+# encoding: utf-8
 module Wice #:nodoc:
-
   module Columns #:nodoc:
-
     mattr_reader :handled_type_view, :handled_type_conditions_generator
 
     class << self #:nodoc:
-
       def load_column_processors #:nodoc:
-
         require_columns
 
-        loaded_view_column_processors = Hash.new
-
         @@handled_type_view                 = build_table_of_processors 'view'
         @@handled_type_conditions_generator = build_table_of_processors 'conditions_generator'
 
         if Wice::Defaults.const_defined?(:ADDITIONAL_COLUMN_PROCESSORS)
 
-          common_error_prefix = "Error loading Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS. "
+          common_error_prefix = 'Error loading Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS. '
 
           Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS.each do |key, value|
             unless key.is_a?(Symbol)
-              raise common_error_prefix + "A key of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a Symbol!"
+              fail common_error_prefix + 'A key of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a Symbol!'
             end
 
-            if @@handled_type_view.has_key?(key)
-              raise common_error_prefix +
+            if @@handled_type_view.key?(key)
+              fail common_error_prefix +
                 "Column with key \"#{key}\" already exists in WiceGrid, overwriting existing columns is forbidden, please choose another key!"
             end
 
-            if ! value.is_a?(Array) || value.size != 2
-              raise common_error_prefix +
-                "A value of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a a 2-element array!"
+            if !value.is_a?(Array) || value.size != 2
+              fail common_error_prefix +
+                'A value of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a a 2-element array!'
             end
 
             view_processor, conditions_generator  = value.map(&:to_s).map do |klass|
@@ -43,22 +38,19 @@ module Wice #:nodoc:
             end
 
             unless view_processor.ancestors.include?(::Wice::Columns::ViewColumn)
-              raise common_error_prefix +
+              fail common_error_prefix +
                 "#{view_processor} should be inherited from Wice::Columns::ViewColumn!"
             end
 
-
             unless conditions_generator.ancestors.include?(::Wice::Columns::ConditionsGeneratorColumn)
-              raise common_error_prefix +
+              fail common_error_prefix +
                 "#{conditions_generator} should be inherited from Wice::Columns::ConditionsGeneratorColumn!"
             end
 
             @@handled_type_view[key] = view_processor
             @@handled_type_conditions_generator[key] = conditions_generator
-
           end
         end
-
       end
 
       def get_view_column_processor(column_type) #:nodoc:
@@ -67,22 +59,21 @@ module Wice #:nodoc:
 
       def get_conditions_generator_column_processor(column_type) #:nodoc:
         column_type = column_type.intern if column_type.is_a? String
-        @@handled_type_conditions_generator[column_type] || raise("Could not find conditions generator processor for column_type #{column_type}")
+        @@handled_type_conditions_generator[column_type] || fail("Could not find conditions generator processor for column_type #{column_type}")
       end
 
-
       private
 
       def build_table_of_processors(prefix)
-        Hash.new.tap do |processor_table|
-          loaded_processors = Hash.new
+        {}.tap do |processor_table|
+          loaded_processors = {}
 
           Wice::Columns::COLUMN_PROCESSOR_INDEX.each do |column_type, column_source_file|
             unless loaded_processors[column_source_file]
               processor_class_name = "#{prefix}_#{column_source_file}".classify
 
               unless Wice::Columns.const_defined?(processor_class_name.intern)
-                raise "#{column_source_file}.rb is expected to define #{processor_class_name}!"
+                fail "#{column_source_file}.rb is expected to define #{processor_class_name}!"
               end
               processor_class = eval("Wice::Columns::#{processor_class_name}")
 
@@ -99,12 +90,9 @@ module Wice #:nodoc:
           require "wice/columns/#{column_source_file}.rb"
         end
       end
-
     end
 
     class ViewColumn  #:nodoc:
-
-
       include ActionView::Helpers::FormTagHelper
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::JavaScriptHelper
@@ -112,12 +100,29 @@ module Wice #:nodoc:
 
       # fields defined from the options parameter
       FIELDS = [:attribute, :name, :html, :filter, :model, :allow_multiple_selection,
-                :in_html, :in_csv, :helper_style, :table_alias, :custom_order, :detach_with_id, :ordering, :auto_reload]
+                :in_html, :in_csv, :table_alias, :custom_order, :detach_with_id, :ordering, :auto_reload]
+
+      attr_accessor(*FIELDS)
+
+      # a Proc object which would return contents of one cell
+      attr_accessor :cell_rendering_block
+
+      # reference to the WiceGrid instance
+      attr_accessor :grid
+
+      # name of the table
+      attr_accessor :table_name
 
-      attr_accessor *FIELDS
+      # name of the main table (first argument to initialize_grid)
+      attr_accessor :main_table
 
-      attr_accessor :cell_rendering_block, :grid,  :table_name, :main_table, :model, :custom_filter
+      # attr_accessor :model
 
+      # specification for a custom filter: an array of option label + option value pairs for the select, or a Proc object which returns this array.
+      # Or nil if it is not a custom filter
+      attr_accessor :custom_filter
+
+      # A boolean flag: whether a column has a text input or not
       attr_reader :contains_a_text_input
 
       def initialize(block, options, grid_obj, tname, mtable, cfilter, view)  #:nodoc:
@@ -133,8 +138,7 @@ module Wice #:nodoc:
         end
       end
 
-
-      def add_css_class(klass_value)
+      def add_css_class(klass_value) #:nodoc:
         self.html ||= {}
         if html[:class].nil?
           html[:class] = klass_value
@@ -157,7 +161,7 @@ module Wice #:nodoc:
       end
 
       def detachness #:nodoc:
-        (! detach_with_id.blank?).to_s
+        (!detach_with_id.blank?).to_s
       end
 
       def yield_declaration #:nodoc:
@@ -171,7 +175,6 @@ module Wice #:nodoc:
         end
       end
 
-
       def config  #:nodoc:
         @view.config
       end
@@ -180,22 +183,21 @@ module Wice #:nodoc:
         @view.controller
       end
 
-
       def render_filter #:nodoc:
         params = @grid.filter_params(self)
         render_filter_internal(params)
       end
 
-      def render_filter_internal(params) #:nodoc:
+      def render_filter_internal(_params) #:nodoc:
         '<!-- implement me! -->'
       end
 
       def form_parameter_name_id_and_query(v) #:nodoc:
         query = form_parameter_template(v)
-        query_without_equals_sign = query.sub(/=$/,'')
+        query_without_equals_sign = query.sub(/=$/, '')
         parameter_name = CGI.unescape(query_without_equals_sign)
         dom_id = id_out_of_name(parameter_name)
-        return query, query_without_equals_sign, parameter_name, dom_id.tr('.', '_')
+        [query, query_without_equals_sign, parameter_name, dom_id.tr('.', '_')]
       end
 
       # bad name, because for the main table the name is not really 'fully_qualified'
@@ -207,22 +209,20 @@ module Wice #:nodoc:
         table_alias_or_table_name + '.' + attribute
       end
 
-
       def filter_shown? #:nodoc:
         self.attribute && self.filter
       end
 
       def filter_shown_in_main_table? #:nodoc:
-        filter_shown? && ! self.detach_with_id
+        filter_shown? && !self.detach_with_id
       end
 
-
       def table_alias_or_table_name  #:nodoc:
         table_alias || table_name
       end
 
       def capable_of_hosting_filter_related_icons?  #:nodoc:
-        self.attribute.blank? && self.name.blank? && ! self.filter_shown?
+        self.attribute.blank? && self.name.blank? && !self.filter_shown?
       end
 
       def has_auto_reloading_input?  #:nodoc:
@@ -244,7 +244,7 @@ module Wice #:nodoc:
       protected
 
       def form_parameter_template(v) #:nodoc:
-        {@grid.name => {f: {self.attribute_name_fully_qualified_for_all_but_main_table_columns => v}}}.to_query
+        { @grid.name => { f: { self.attribute_name_fully_qualified_for_all_but_main_table_columns => v } } }.to_query
       end
 
       def form_parameter_name(v) #:nodoc:
@@ -252,24 +252,25 @@ module Wice #:nodoc:
       end
 
       def name_out_of_template(s) #:nodoc:
-        CGI.unescape(s).sub(/=$/,'')
+        CGI.unescape(s).sub(/=$/, '')
       end
 
       def id_out_of_name(s) #:nodoc:
-        s.gsub(/[\[\]]+/,'_').sub(/_+$/, '')
+        s.gsub(/[\[\]]+/, '_').sub(/_+$/, '')
       end
-
     end
 
-
     class ConditionsGeneratorColumn   #:nodoc:
-
-      def initialize(column_wrapper)   #:nodoc:
+      def initialize(column_wrapper, column_type = nil)   #:nodoc:
+        # Wice::ActiveRecordColumnWrapper
         @column_wrapper = column_wrapper
+        @column_type = column_type
       end
-    end
-
-  end
 
+      def generate_conditions(_table_alias, _opts) #:nodoc:
+        fail('implement me')
+      end
 
-end
+    end
+  end
+end

data/lib/wice/columns/column_action.rb

@@ -1,11 +1,9 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
-
     class ViewColumnAction < ViewColumn #:nodoc:
       def initialize(grid_obj, html, param_name, select_all_buttons, object_property, html_check_box, view, block = nil)  #:nodoc:
-        @view = view
+        @view                 = view
         @html_check_box       = html_check_box
         @select_all_buttons   = select_all_buttons
         self.grid             = grid_obj
@@ -14,7 +12,7 @@ module Wice
         grid_name             = self.grid.name
         @param_name           = param_name
         @cell_rendering_block = lambda do |object, params|
-          if block && ! block.call(object)
+          if block && !block.call(object)
             ''
           else
             selected = params[grid_name] && params[grid_name][param_name] && params[grid_name][param_name].index(object.send(object_property).to_s)
@@ -35,20 +33,20 @@ module Wice
         return '' unless @select_all_buttons
 
         if @html_check_box
-          check_box_tag :select_all, 1, false, {class: 'wg-select-all'}
+          check_box_tag :select_all, 1, false, class: 'wg-select-all'
         else
-          content_tag(:div, '',
+          content_tag(:div,
+                      content_tag(:i, '', class: 'fa fa-check-square-o'),
                       class: 'clickable select-all',
                       title: NlMessage['select_all']) + ' ' +
-          content_tag(:div, '',
-                      class: 'clickable deselect-all',
-                      title: NlMessage['deselect_all'])
+            content_tag(:div,
+                        content_tag(:i, '', class: 'fa fa-square-o'),
+                        class: 'clickable deselect-all',
+                        title: NlMessage['deselect_all'])
         end
-
       end
-
     end
 
     ConditionsGeneratorColumnAction = ConditionsGeneratorColumn #:nodoc:
   end
-end
+end

data/lib/wice/columns/column_boolean.rb

@@ -1,11 +1,14 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
     class ViewColumnBoolean < ViewColumnCustomDropdown #:nodoc:
       include ActionView::Helpers::FormOptionsHelper
 
-      attr_accessor :boolean_filter_true_label, :boolean_filter_false_label
+      # Text for the true value
+      attr_accessor :boolean_filter_true_label
+
+      # Text for the false value
+      attr_accessor :boolean_filter_false_label
 
       def render_filter_internal(params) #:nodoc:
         @custom_filter = {
@@ -19,10 +22,9 @@ module Wice
       end
     end
 
-
     class ConditionsGeneratorColumnBoolean < ConditionsGeneratorColumn  #:nodoc:
       def  generate_conditions(table_alias, opts)   #:nodoc:
-        unless (opts.kind_of?(Array) && opts.size == 1)
+        unless opts.is_a?(Array) && opts.size == 1
           Wice.log "invalid parameters for the grid boolean filter - must be an one item array: #{opts.inspect}"
           return false
         end
@@ -31,12 +33,8 @@ module Wice
           [" (#{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} = ? or #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} is null) ", false]
         elsif opts == 't'
           [" #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} = ?", true]
-        else
-          nil
-        end
+                end
       end
     end
-
   end
-
-end
+end

data/lib/wice/columns/column_bootstrap_datepicker.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module Wice
+  module Columns #:nodoc:
+    class ViewColumnBootstrapDatepicker < ViewColumn #:nodoc:
+
+      include Wice::BsCalendarHelpers
+      include Wice::Columns::CommonDateDatetimeMixin
+      include Wice::Columns::CommonJsDateDatetimeMixin
+
+      def do_render(params) #:nodoc:
+        calendar_data_from = prepare_data_for_bscalendar(
+          initial_date: params[:fr],
+          name:         @name1,
+          fire_event:   auto_reload,
+          grid_name:    self.grid.name
+        )
+
+        calendar_data_to = prepare_data_for_bscalendar(
+          initial_date: params[: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_bs calendar_data_from
+
+        html2 = date_calendar_bs calendar_data_to
+
+        %(<div class="date-filter wg-bootstrap-datepicker">#{html1}#{html2}</div>)
+      end
+
+
+      def has_auto_reloading_calendar? #:nodoc:
+        auto_reload
+      end
+
+    end
+
+    class ConditionsGeneratorColumnBootstrapDatepicker < ConditionsGeneratorColumn  #:nodoc:
+
+      include Wice::Columns::CommonJsDateDatetimeConditionsGeneratorMixin
+
+    end
+  end
+end

data/lib/wice/columns/column_custom_dropdown.rb

@@ -1,26 +1,28 @@
+# encoding: utf-8
 module Wice
-
   module Columns #:nodoc:
-
     class ViewColumnCustomDropdown < ViewColumn #:nodoc:
       include ActionView::Helpers::FormOptionsHelper
 
+      # text in the filter dropdown for an empty <option><option>
       attr_accessor :filter_all_label
+
+      # contains an array of option label + option value pairs for the select, or a Proc object which returns this array
       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
+        @custom_filter = @custom_filter.call if @custom_filter.is_a? Proc
 
-        if @custom_filter.kind_of? Array
-          @custom_filter = [[@filter_all_label, nil]] + @custom_filter.map{|label, value|
+        if @custom_filter.is_a? Array
+          @custom_filter = [[@filter_all_label, nil]] + @custom_filter.map do|label, value|
             [label.to_s, value.to_s]
-          }
+          end
         end
 
-        select_options = {name: @parameter_name + '[]', id: @dom_id, class: 'custom-dropdown form-control'}
+        select_options = { name: @parameter_name + '[]', id: @dom_id, class: 'custom-dropdown form-control' }
 
         if @turn_off_select_toggling
           select_toggle = ''
@@ -31,12 +33,16 @@ module Wice
             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, '',
+            select_toggle = content_tag(
+              :span,
+              content_tag(:i, '', class: 'fa fa-plus'),
               title: NlMessage['expand'],
               class: 'expand-multi-select-icon clickable',
               style: expand_icon_style
             ) +
-            content_tag(:span, '',
+            content_tag(
+              :span,
+              content_tag(:i, '', class: 'fa fa-minus'),
               title: NlMessage['collapse'],
               class: 'collapse-multi-select-icon clickable',
               style: collapse_icon_style
@@ -55,11 +61,10 @@ module Wice
 
         '<div class="custom-dropdown-container">'.html_safe +
           content_tag(:select,
-            options_for_select(@custom_filter, params_for_select),
-            select_options) +  select_toggle.html_safe + '</div>'.html_safe
+                      options_for_select(@custom_filter, params_for_select),
+                      select_options) + select_toggle.html_safe + '</div>'.html_safe
       end
 
-
       def yield_declaration_of_column_filter #:nodoc:
         {
           templates: [@query_without_equals_sign],
@@ -67,23 +72,20 @@ module Wice
         }
       end
 
-
       def has_auto_reloading_select? #:nodoc:
         auto_reload
       end
     end
 
-
     class ConditionsGeneratorColumnCustomDropdown < ConditionsGeneratorColumn #:nodoc:
-
       def generate_conditions(table_alias, opts)   #:nodoc:
         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
+        opts = (opts.is_a?(Array) && opts.size == 1) ? opts[0] : opts
 
-        if opts.kind_of?(Array)
-          opts_with_special_values, normal_opts = opts.partition{|v| ::Wice::GridTools.special_value(v)}
+        if opts.is_a?(Array)
+          opts_with_special_values, normal_opts = opts.partition { |v| ::Wice::GridTools.special_value(v) }
 
           conditions_ar = if normal_opts.size > 0
             [" #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
@@ -92,7 +94,7 @@ module Wice
           end
 
           if opts_with_special_values.size > 0
-            special_conditions = opts_with_special_values.collect{|v| " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} is " + v}.join(' or ')
+            special_conditions = opts_with_special_values.collect { |v| " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} is " + v }.join(' or ')
             if conditions_ar.size > 0
               conditions_ar[0] = " (#{conditions_ar[0]} or #{special_conditions} ) "
             else
@@ -108,9 +110,6 @@ module Wice
           end
         end
       end
-
     end
-
   end
-
-end
+end