wice_grid_mongoid 0.5.7 → 6.0.3

data/lib/helpers/wice_grid_view_helpers.rb

@@ -116,7 +116,7 @@ module Wice
       if grid.output_buffer
         if grid.output_buffer == true
           raise  WiceGridException.new("Second occurence of grid helper with the same grid object. " +
-                                "Did you intend to use detached filters and forget to define them?")
+                                       "Did you intend to use detached filters and forget to define them?")
         else
           return grid.output_buffer
         end
@@ -199,12 +199,12 @@ module Wice
       buff = GridOutputBuffer.new
 
       buff <<  if rendering.blank_slate_handler.is_a?(Proc)
-        call_block_as_erb_or_ruby(rendering, rendering.blank_slate_handler, nil)
-      elsif rendering.blank_slate_handler.is_a?(Hash)
-        render(rendering.blank_slate_handler)
-      else
-        rendering.blank_slate_handler
-      end
+                 call_block_as_erb_or_ruby(rendering, rendering.blank_slate_handler, nil)
+               elsif rendering.blank_slate_handler.is_a?(Hash)
+                 render(rendering.blank_slate_handler)
+               else
+                 rendering.blank_slate_handler
+               end
 
       if rendering.find_one_for(:in_html){|column| column.detach_with_id}
         buff.stubborn_output_mode = true
@@ -268,10 +268,10 @@ module Wice
       # first row of column labels with sorting links
 
       filter_shown = if options[:show_filters] == :when_filtered
-        grid.filtering_on?
-      elsif options[:show_filters] == :always
-        true
-      end
+                       grid.filtering_on?
+                     elsif options[:show_filters] == :always
+                       true
+                     end
 
       cached_javascript = []
 
@@ -295,28 +295,27 @@ module Wice
             direction = 'desc' if grid.order_direction == 'asc'
           end
 
-          col_link = link_to(
-            column_name,
-            rendering.column_link(column, direction, params, options[:extra_request_parameters]),
-            :class => link_style)
+          col_link = link_to(column_name,
+                             rendering.column_link(column, direction, params, options[:extra_request_parameters]),
+                             :class => link_style)
           content << content_tag(:th, col_link, Hash.make_hash(:class, css_class))
           column.css_class = css_class
         else
           if reuse_last_column_for_filter_buttons && last
             content << content_tag(:th,
-              hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering),
-              :class => 'hide_show_icon'
-            )
+                                   hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering),
+                                   :class => 'hide_show_icon'
+                                   )
           else
-            content << content_tag(:th, column_name)
+            content << content_tag(:th, (column.icon ? image_tag("/images/icons/grid/#{column.icon}", :alt => column_name, :border => 0) : column_name))
           end
         end
       end
 
       content << content_tag(:th,
-        hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering),
-        :class => 'hide_show_icon'
-      ) unless no_rightmost_column
+                             hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering),
+                             :class => 'hide_show_icon'
+                             ) unless no_rightmost_column
 
       content << '</tr>'
       # rendering first row end
@@ -346,7 +345,6 @@ module Wice
 
           rendering.each_column_aware_of_one_last_one(:in_html) do |column, last|
             if column.filter_shown?
-
               filter_html_code, filter_js_code = column.render_filter
               filter_html_code = filter_html_code.html_safe_if_necessary
               cached_javascript << filter_js_code
@@ -360,9 +358,9 @@ module Wice
             else
               if reuse_last_column_for_filter_buttons && last
                 content << content_tag(:th,
-                  reset_submit_buttons(options, grid, rendering),
-                  Hash.make_hash(:class, column.css_class).add_or_append_class_value!('filter_icons')
-                )
+                                       reset_submit_buttons(options, grid, rendering),
+                                       Hash.make_hash(:class, column.css_class).add_or_append_class_value!('filter_icons')
+                                       )
               else
                 content << content_tag(:th, '', Hash.make_hash(:class, column.css_class))
               end
@@ -382,6 +380,7 @@ module Wice
       end
 
       content << '</thead><tfoot>'
+
       content << rendering.pagination_panel(no_rightmost_column, options[:hide_csv_button]) do
         if pagination_panel_content_html
           pagination_panel_content_html
@@ -402,16 +401,16 @@ module Wice
       grid.each do |ar| # rows
 
         before_row_output = if rendering.before_row_handler
-          call_block_as_erb_or_ruby(rendering, rendering.before_row_handler, ar)
-        else
-          nil
-        end
+                              call_block_as_erb_or_ruby(rendering, rendering.before_row_handler, ar)
+                            else
+                              nil
+                            end
 
         after_row_output = if rendering.after_row_handler
-          call_block_as_erb_or_ruby(rendering, rendering.after_row_handler, ar)
-        else
-          nil
-        end
+                             call_block_as_erb_or_ruby(rendering, rendering.after_row_handler, ar)
+                           else
+                             nil
+                           end
 
         row_content = ''
         rendering.each_column(:in_html) do |column|
@@ -420,23 +419,23 @@ module Wice
           opts = column.td_html_attrs.clone
 
           column_block_output = if column.class == Wice::ActionViewColumn
-            cell_block.call(ar, params)
-          else
-            call_block_as_erb_or_ruby(rendering, cell_block, ar)
-          end
+                                  cell_block.call(ar, params)
+                                else
+                                  call_block_as_erb_or_ruby(rendering, cell_block, ar)
+                                end
 
           if column_block_output.kind_of?(Array)
 
             unless column_block_output.size == 2
               raise WiceGridArgumentError.new('When WiceGrid column block returns an array it is expected to contain 2 elements only - '+
-                'the first is the contents of the table cell and the second is a hash containing HTML attributes for the <td> tag.')
+                                              'the first is the contents of the table cell and the second is a hash containing HTML attributes for the <td> tag.')
             end
 
             column_block_output, additional_opts = column_block_output
 
             unless additional_opts.is_a?(Hash)
               raise WiceGridArgumentError.new('When WiceGrid column block returns an array its second element is expected to be a ' +
-                "hash containing HTML attributes for the <td> tag. The returned value is #{additional_opts.inspect}. Read documentation.")
+                                              "hash containing HTML attributes for the <td> tag. The returned value is #{additional_opts.inspect}. Read documentation.")
             end
 
             additional_css_class = nil
@@ -476,6 +475,8 @@ module Wice
       end
 
       content << '</tbody></table></div>'
+      
+      content << link_to( "More &#x25BC;".html_safe, rendering.more_link(controller, options[:extra_request_parameters]), :id => 'more') if grid.has_more_to_show?
 
       base_link_for_filter, base_link_for_show_all_records = rendering.base_link_for_filter(controller, options[:extra_request_parameters])
 
@@ -485,18 +486,18 @@ module Wice
       parameter_name_for_focus = {grid.name => {:foc => ''}}.to_query
 
       prototype_and_js_version_check = if ENV['RAILS_ENV'] == 'development'
-        %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
-        %$   alert('wice_grid.js not loaded, WiceGrid cannot proceed! ' +\n$ +
-        %$     'Please make sure that you include WiceGrid javascript in your page. ' +\n$ +
-        %$     'Use <%= include_wice_grid_assets %> or <%= include_wice_grid_assets(:include_calendar => true) %> ' +\n$ +
-        %$     'for WiceGrid javascripts and assets.')\n$ +
-        %$ } else if ((typeof(WiceGridProcessor._version) == "undefined") || ( WiceGridProcessor._version != "0.4.3")) {\n$ +
-        %$    alert("wice_grid.js in your /public is outdated, please run\\n ./script/generate wice_grid_assets_jquery\\n$ +
-        %$ or\\n ./script/generate wice_grid_assets_prototype\\nto update it.");\n$ +
-        %$ }\n$
-      else
-        ''
-      end
+                                         %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
+                                           %$   alert('wice_grid.js not loaded, WiceGrid cannot proceed! ' +\n$ +
+                                           %$     'Please make sure that you include WiceGrid javascript in your page. ' +\n$ +
+                                           %$     'Use <%= include_wice_grid_assets %> or <%= include_wice_grid_assets(:include_calendar => true) %> ' +\n$ +
+                                           %$     'for WiceGrid javascripts and assets.')\n$ +
+                                           %$ } else if ((typeof(WiceGridProcessor._version) == "undefined") || ( WiceGridProcessor._version != "0.4.3")) {\n$ +
+                                           %$    alert("wice_grid.js in your /public is outdated, please run\\n ./script/generate wice_grid_assets_jquery\\n$ +
+                                           %$ or\\n ./script/generate wice_grid_assets_prototype\\nto update it.");\n$ +
+                                           %$ }\n$
+                                       else
+                                         ''
+                                       end
 
       if rendering.show_hide_button_present
         cached_javascript << JsAdaptor.show_hide_button_initialization(grid.name, filter_row_id)
@@ -539,21 +540,21 @@ module Wice
       end
 
       content << javascript_tag(
-        JsAdaptor.dom_loaded +
-        %/ #{prototype_and_js_version_check}\n/ +
-        %/ window['#{grid.name}'] = new WiceGridProcessor('#{grid.name}', '#{base_link_for_filter}',\n/ +
-        %/  '#{base_link_for_show_all_records}', '#{link_for_export}', '#{parameter_name_for_query_loading}',\n/ +
-        %/ '#{parameter_name_for_focus}', '#{ENV['RAILS_ENV']}');\n/ +
-        if no_filters_at_all
-          ''
-        else
-          rendering.select_for(:in_html) do |vc|
-            vc.attribute_name and not vc.no_filter
-          end.collect{|column| column.yield_javascript}.join("\n")
-        end +
-        "\n" + cached_javascript.compact.join('') +
-        '})'
-      )
+                                JsAdaptor.dom_loaded +
+                                %/ #{prototype_and_js_version_check}\n/ +
+                                %/ window['#{grid.name}'] = new WiceGridProcessor('#{grid.name}', '#{base_link_for_filter}',\n/ +
+                                %/  '#{base_link_for_show_all_records}', '#{link_for_export}', '#{parameter_name_for_query_loading}',\n/ +
+                                %/ '#{parameter_name_for_focus}', '#{ENV['RAILS_ENV']}');\n/ +
+                                if no_filters_at_all
+                                  ''
+                                else
+                                  rendering.select_for(:in_html) do |vc|
+                                    vc.attribute_name and not vc.no_filter
+                                  end.collect{|column| column.yield_javascript}.join("\n")
+                                end +
+                                "\n" + cached_javascript.compact.join('') +
+                                '})'
+                                )
 
       if content.stubborn_output_mode
         grid.output_buffer = content
@@ -582,25 +583,25 @@ module Wice
         filter_tooltip = WiceGridNlMessageProvider.get_message(:HIDE_FILTER_TOOLTIP)
 
         hide_icon = content_tag(:span,
-          image_tag(Defaults::SHOW_HIDE_FILTER_ICON,
-            :title => filter_tooltip,
-            :alt   => filter_tooltip),
-          :id => grid_name + '_hide_icon',
-          :style => styles[0],
-          :class => 'clickable'
-        )
+                                image_tag(Defaults::SHOW_HIDE_FILTER_ICON,
+                                          :title => filter_tooltip,
+                                          :alt   => filter_tooltip),
+                                :id => grid_name + '_hide_icon',
+                                :style => styles[0],
+                                :class => 'clickable'
+                                )
 
 
         filter_tooltip = WiceGridNlMessageProvider.get_message(:SHOW_FILTER_TOOLTIP)
 
         show_icon = content_tag(:span,
-          image_tag(Defaults::SHOW_HIDE_FILTER_ICON,
-            :title => filter_tooltip,
-            :alt   => filter_tooltip),
-          :id => grid_name + '_show_icon',
-          :style => styles[1],
-          :class => 'clickable'
-        )
+                                image_tag(Defaults::SHOW_HIDE_FILTER_ICON,
+                                          :title => filter_tooltip,
+                                          :alt   => filter_tooltip),
+                                :id => grid_name + '_show_icon',
+                                :style => styles[1],
+                                :class => 'clickable'
+                                )
 
         hide_icon + show_icon
       end
@@ -608,19 +609,19 @@ module Wice
 
     def reset_submit_buttons(options, grid, rendering)  #:nodoc:
       (if options[:hide_submit_button]
-        ''
-      else
-        rendering.submit_button_present = true
-        filter_tooltip = WiceGridNlMessageProvider.get_message(:FILTER_TOOLTIP)
-        image_tag(Defaults::FILTER_ICON, :title => filter_tooltip, :alt => filter_tooltip, :class => 'submit clickable')
-      end + ' ' +
-      if options[:hide_reset_button]
-        ''
-      else
-        rendering.reset_button_present = true
-        filter_tooltip = WiceGridNlMessageProvider.get_message(:RESET_FILTER_TOOLTIP)
-        image_tag(Defaults::RESET_ICON, :title => filter_tooltip, :alt => filter_tooltip, :class => 'reset clickable')
-      end).html_safe_if_necessary
+         ''
+       else
+         rendering.submit_button_present = true
+         filter_tooltip = WiceGridNlMessageProvider.get_message(:FILTER_TOOLTIP)
+         image_tag(Defaults::FILTER_ICON, :title => filter_tooltip, :alt => filter_tooltip, :class => 'submit clickable')
+       end + ' ' +
+       if options[:hide_reset_button]
+         ''
+       else
+         rendering.reset_button_present = true
+         filter_tooltip = WiceGridNlMessageProvider.get_message(:RESET_FILTER_TOOLTIP)
+         image_tag(Defaults::RESET_ICON, :title => filter_tooltip, :alt => filter_tooltip, :class => 'reset clickable')
+       end).html_safe_if_necessary
     end
 
     # Renders a detached filter. The parameters are:
@@ -635,7 +636,7 @@ module Wice
       end
       if grid.output_buffer == true
         raise WiceGridArgumentError.new("grid_filter: You have defined no detached filters, or you try use detached filters with" +
-          ":show_filters => :no (set :show_filters to :always in this case). Read about detached filters in the documentation.")
+                                        ":show_filters => :no (set :show_filters to :always in this case). Read about detached filters in the documentation.")
       end
 
       content_tag :span, grid.output_buffer.filter_for(filter_key), :class => "#{grid.name}_detached_filter"
@@ -672,8 +673,6 @@ module Wice
 
 
     def grid_csv(grid, rendering) #:nodoc:
-
-
       field_separator = (grid.export_to_csv_enabled && grid.export_to_csv_enabled.is_a?(String)) ? grid.export_to_csv_enabled : ','
       spreadsheet = ::Wice::Spreadsheet.new(grid.name, field_separator)
 
@@ -708,13 +707,14 @@ module Wice
       end
 
       html, js = pagination_info(grid, allow_showing_all_records)
-
-      [will_paginate(grid.resultset,
-        :previous_label => WiceGridNlMessageProvider.get_message(:PREVIOUS_LABEL),
-        :next_label     => WiceGridNlMessageProvider.get_message(:NEXT_LABEL),
-        :param_name     => "#{grid.name}[page]",
-        :params         => extra_request_parameters).to_s +
-        (' <div class="pagination_status">' + html + '</div>').html_safe_if_necessary, js]
+      '<div class="pagination_status">' + html + '</div>'
+
+      #       [will_paginate(grid.resultset,
+      #         :previous_label => WiceGridNlMessageProvider.get_message(:PREVIOUS_LABEL),
+      #         :next_label     => WiceGridNlMessageProvider.get_message(:NEXT_LABEL),
+      #         :param_name     => "#{grid.name}[page]",
+      #         :params         => extra_request_parameters).to_s +
+      #         (' <div class="pagination_status">' + html + '</div>').html_safe_if_necessary, js]
     end
 
 
@@ -747,35 +747,15 @@ module Wice
     end
 
     def pagination_info(grid, allow_showing_all_records)  #:nodoc:
-      collection = grid.resultset
-
-      collection_total_entries = collection.total_entries
-      collection_total_entries_str = collection_total_entries.to_s
-      parameters = grid.get_state_as_parameter_value_pairs
-
-      js = ''
-      html = if (collection.total_pages < 2 && collection.length == 0)
-        '0'
-      else
-        parameters << ["#{grid.name}[pp]", collection_total_entries_str]
-
-        "#{collection.offset + 1}-#{collection.offset + collection.length} / #{collection_total_entries_str} " +
-          if (! allow_showing_all_records) || collection_total_entries <= collection.length
-            ''
-          else
-            res, js = show_all_link(collection_total_entries, parameters, grid.name)
-            res
-          end
-      end +
-      if grid.all_record_mode?
-        res, js = back_to_pagination_link(parameters, grid.name)
-        res
-      else
-        ''
-      end
-
-      [html, js]
+      found = grid.resultset.count
+      total = grid.klass.count
+      shown = [found, grid.status[:per_page].to_i].min
+      summary = ""
+      summary << "Shown: #{shown}"
+      summary << ", Found: #{found}" if grid.has_any_filter_criteria?
+      summary << ", Total: #{total}"
+      [summary, ""]
     end
 
   end
-end
+end

data/lib/mongoid_field.rb

@@ -0,0 +1,50 @@
+require 'filter_conditions_generators'
+
+module Wice
+  # to be mixed in into Mongoid::Field
+  module MongoidField
+    def wice_add_filter_criteria(all_filter_params, criteria, custom_filter_active)  #:nodoc:
+      request_params = all_filter_params ? all_filter_params[name] : nil
+      return nil unless request_params
+
+      # Preprocess incoming parameters for datetime, if what's coming in is
+      # a datetime (with custom_filter it can be anything else, and not
+      # the datetime hash {"fr" => ..., "to" => ...})
+      if (self.type == Time) && request_params.is_a?(Hash)
+        ["fr", "to"].each do |sym|
+          if request_params[sym]
+            if request_params[sym].is_a?(String)
+              request_params[sym] = Time.parse(Wice::Defaults::DATETIME_PARSER.call(request_params[sym]).to_s)
+            elsif request_params[sym].is_a?(Hash)
+              request_params[sym] = Time.parse(::Wice::GridTools.params_2_datetime(request_params[sym]).to_s)
+            end
+          end
+        end
+      end
+
+      # Preprocess incoming parameters for date, if what's coming in is
+      # a date (with custom_filter it can be anything else, and not
+      # the date hash {"fr" => ..., "to" => ...})
+      if self.type == Date && request_params.is_a?(Hash)
+        ["fr", "to"].each do |sym|
+          if request_params[sym]
+            if request_params[sym].is_a?(String)
+              request_params[sym] = Wice::Defaults::DATE_PARSER.call(request_params[sym]).to_time
+            elsif request_params[sym].is_a?(Hash)
+              request_params[sym] = ::Wice::GridTools.params_2_date(request_params[sym]).to_time
+            end
+          end
+        end
+      end
+
+      processor_klass =  ::Wice::FilterConditionsGeneratorCustomFilter if custom_filter_active
+      processor_klass = ::Wice::FilterConditionsGenerator.handled_type[self.type] unless processor_klass
+      unless processor_klass
+        Wice.log("No processor for database type #{self.type}!!!")
+        return nil
+      end
+      processor_klass.new(self, criteria).generate_conditions(request_params)
+    end
+
+  end
+end

data/lib/view_columns.rb

@@ -8,7 +8,7 @@ module Wice
     include ActionView::Helpers::AssetTagHelper
 
     # fields defined from the options parameter
-    FIELDS = [:attribute_name, :column_name, :td_html_attrs, :no_filter, :model_class, :allow_multiple_selection,
+    FIELDS = [:attribute_name, :column_name, :icon, :td_html_attrs, :no_filter, :model_class, :allow_multiple_selection,
               :in_html, :in_csv, :helper_style, :table_alias, :custom_order, :detach_with_id, :allow_ordering, :auto_reload]
 
     attr_accessor *FIELDS
@@ -26,7 +26,7 @@ module Wice
       @view = view
 
       FIELDS.each do |field|
-        self.send(field.to_s + '=', options[field])
+        self.send("#{field}=", options[field])
       end
     end
 
@@ -58,6 +58,15 @@ module Wice
       end
     end
 
+
+    def config
+      @view.config
+    end
+
+    def controller
+      @view.controller
+    end
+
     def render_filter #:nodoc:
       params = @grid.filter_params(self)
       res = render_filter_internal(params)
@@ -76,16 +85,6 @@ module Wice
       return 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'
-    def attribute_name_fully_qualified_for_all_but_main_table_columns #:nodoc:
-      self.main_table ? attribute_name : table_alias_or_table_name + '.' + attribute_name
-    end
-
-    def fully_qualified_attribute_name #:nodoc:
-      table_alias_or_table_name + '.' + attribute_name
-    end
-
-
     def filter_shown? #:nodoc:
       self.attribute_name && ! self.no_filter
     end
@@ -93,12 +92,7 @@ module Wice
     def filter_shown_in_main_table? #:nodoc:
       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_name.blank? && self.column_name.blank? && ! self.filter_shown?
     end
@@ -122,7 +116,7 @@ module Wice
     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 => v}}}.to_query
     end
 
     def form_parameter_name(v) #:nodoc:
@@ -185,7 +179,7 @@ module Wice
   end
 
   class ViewColumnInteger < ViewColumn #:nodoc:
-    @@handled_type[:integer] = self
+    @@handled_type[Integer] = self
 
     def render_filter_internal(params) #:nodoc:
       @contains_a_text_input = true
@@ -216,8 +210,8 @@ module Wice
   end
 
   class ViewColumnFloat < ViewColumnInteger #:nodoc:
-    @@handled_type[:decimal] = self
-    @@handled_type[:float] = self
+    @@handled_type[BigDecimal] = self
+    @@handled_type[Float] = self
   end
 
   class ViewColumnCustomDropdown < ViewColumn #:nodoc:
@@ -277,7 +271,7 @@ module Wice
   end
 
   class ViewColumnBoolean < ViewColumnCustomDropdown #:nodoc:
-    @@handled_type[:boolean] = self
+    @@handled_type[Boolean] = self
     include ActionView::Helpers::FormOptionsHelper
 
     attr_accessor :boolean_filter_true_label, :boolean_filter_false_label
@@ -292,8 +286,8 @@ module Wice
   end
 
   class ViewColumnDatetime < ViewColumn #:nodoc:
-    @@handled_type[:datetime] = self
-    @@handled_type[:timestamp] = self
+    @@handled_type[DateTime] = self
+    @@handled_type[Time] = self
     include ActionView::Helpers::DateHelper
     include Wice::JsCalendarHelpers
 
@@ -371,7 +365,7 @@ module Wice
   end
 
   class ViewColumnDate < ViewColumnDatetime #:nodoc:
-    @@handled_type[:date] = self
+    @@handled_type[Date] = self
 
     @@datetime_chunk_names = %w(year month day)
 
@@ -413,8 +407,8 @@ module Wice
   end
 
   class ViewColumnString < ViewColumn #:nodoc:
-    @@handled_type[:string] = self
-    @@handled_type[:text] = self
+    @@handled_type[String] = self
+#    @@handled_type[:text] = self
 
     attr_accessor :negation, :auto_reloading_input_with_negation_checkbox
 
@@ -466,4 +460,4 @@ module Wice
 
   end
 
-end
+end