wice_grid 3.0.0.pre2 → 3.0.0.pre3

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.0.0.pre1
+Version:: 3.0.0.pre3
 Author::  Yuri Leikind
 Homepage:: http://leikind.org/pages/wicegrid
 Examples online:: http://grid.leikind.org
@@ -691,7 +691,7 @@ WiceGrid icons are in directory <tt>public/images/icons/grid/</tt>.
 
 === Adding rows to the grid
 
-It is possible to add your own handcrafted HTML after and/or before each grid row. This works similar to +row_attributes+, by adding blocks +after_row+ and +before_row+:
+It is possible to add your own handcrafted HTML after and/or before each grid row. This works similar to +row_attributes+, by adding blocks +after_row+, +before_row+,  and +last_row+:
 
   <%= grid(@tasks_grid) do |g|
     g.before_row do |task|
@@ -702,12 +702,21 @@ It is possible to add your own handcrafted HTML after and/or before each grid ro
         nil
       end
     end
+
+    g.last_row do          # This row will always be added to the bottom of the grid
+      content_tag(:tr,
+        content_tag(:td,
+          'Last row',
+        :colspan => 10),
+       :class => 'last_row')
+    end
+
     .......
   end %>
 
 It is up for the developer to return the correct HTML code, or return +nil+ if no row is needed for this record. Naturally, there is only one +before_row+  definition and one +after_row+  definition for a WiceGrid instance.
 
-A real life example might be some enterprisy  tables inside a table.
+A real life example might be some enterprisy tables inside a table.
 
 === Rendering a grid without records
 

data/VERSION

@@ -1 +1 @@
-3.0.0.pre2
+3.0.0.pre3

data/lib/generators/wice_grid/templates/wice_grid.yml

@@ -274,6 +274,135 @@ pt:
     validates_presence_error: Queira indicar o nome da query que deseja gravar
     query_deleted_message: A query foi apagada.
     query_saved_message: A query foi gravada.
-    # To do: translate
-    select_all: Select all
-    deselect_all: Remove selection
+    select_all: Selecionar todos
+    deselect_all: Remover seleção
+
+pt-BR:
+  date:
+    order:
+      - :year
+      - :month
+      - :day
+  wice_grid:
+    show_filter_tooltip: Mostrar o filtro
+    hide_filter_tooltip: Esconder o filtro
+    csv_export_tooltip: Exportar em CSV
+    filter_tooltip: Filtrar
+    reset_filter_tooltip: Reinicializar
+    boolean_filter_true_label: sim
+    boolean_filter_false_label: não
+    previous_label: « Anterior
+    next_label: Próximo »
+    date_selector_tooltip_from: De
+    date_selector_tooltip_to: a
+    negation_checkbox_title: Excluir
+    show_all_records_label: Ver todos
+    show_all_records_tooltip: Ver todos os registos
+    all_queries_warning: Tem certeza que gostaria de visualizar todos os registos?
+    switch_back_to_paginated_mode_label: Voltar à lista paginada
+    switch_back_to_paginated_mode_tooltip: Voltar à lista por página
+    date_string_tooltip: Clique para apagar
+    saved_query_panel_title: Filtros gravados
+    save_query_button_label: Gravar o estado dos filtros
+    saved_query_deletion_confirmation: Tem certeza?
+    saved_query_deletion_link_title: Apagar o filtro
+    saved_query_link_title: Carregar o filtro
+    validates_uniqueness_error: Já existe um filtro com o mesmo nome
+    validates_presence_error: Indique o nome do filtro que deseja gravar
+    query_deleted_message: O filtro foi apagado.
+    query_saved_message: O filtro foi gravado.
+    select_all: Selecionar todos
+    deselect_all: Remover seleção
+
+
+sk:
+  date:
+    order:
+      - :year
+      - :month
+      - :day
+  wice_grid:
+    show_filter_tooltip: Zobraziť filter
+    hide_filter_tooltip: Skryť filter
+    csv_export_tooltip: Exportovať do CSV
+    filter_tooltip: Filter
+    reset_filter_tooltip: Zrušiť filtre
+    boolean_filter_true_label: "áno"
+    boolean_filter_false_label: "nie"
+    previous_label: « Predchádzajúci
+    next_label: Následujúci »
+    # Title of the icon clicking on which will show the calendar to set the FROM date.
+    date_selector_tooltip_from: Dátum od
+    # Title of the icon clicking on which will show the calendar to set the TO date.
+    date_selector_tooltip_to: Dátum do
+    # The title of the checkox to turn on negation
+    negation_checkbox_title: Inverzný výber
+    # link to switch to show all records
+    show_all_records_label: Zobraziť všetko
+    # tooltip for the link to switch to show all records
+    show_all_records_tooltip: Zobrazí všetky záznamy v databáze
+    # Warning message shown when the user wants to switch to all-records mode
+    all_queries_warning: Určite chceš zobraziť všetky záznamy v databáze?
+    # link to paginated view
+    switch_back_to_paginated_mode_label: späť na stránkové zobrazenie
+    # tooltip for the link to paginated view
+    switch_back_to_paginated_mode_tooltip: Prepnúť do stránkového zobrazenia
+    # Title of the date string.
+    date_string_tooltip: Kliknutím zmažeš
+    saved_query_panel_title: Uložené filtre/výsledky
+    save_query_button_label: Uložiť stav filtrov
+    saved_query_deletion_confirmation: Si si istý?
+    saved_query_deletion_link_title: Vymazať uložený filter
+    saved_query_link_title: Nahrať uložený filter
+    validates_uniqueness_error: Filter s uvedeným názvom už existuje.
+    validates_presence_error: Prosím zadaj názov uloženého filtra.
+    query_deleted_message: Uložený filter bol vymazaný.
+    query_saved_message: Filter bol uložený.
+    select_all: Vyber všetko
+    deselect_all: Zrušiť výber
+
+cz:
+  date:
+    order:
+      - :year
+      - :month
+      - :day
+  wice_grid:
+    show_filter_tooltip: Zobrazit filtr
+    hide_filter_tooltip: Skrýt filtr
+    csv_export_tooltip: Exportovat do CSV
+    filter_tooltip: Filtr
+    reset_filter_tooltip: Zrušit filtr
+    boolean_filter_true_label: "áno"
+    boolean_filter_false_label: "ne"
+    previous_label: « Předešlý
+    next_label: Následující »
+    # Title of the icon clicking on which will show the calendar to set the FROM date.
+    date_selector_tooltip_from: Dátum od
+    # Title of the icon clicking on which will show the calendar to set the TO date.
+    date_selector_tooltip_to: Dátum do
+    # The title of the checkox to turn on negation
+    negation_checkbox_title: Inverzní výběr
+    # link to switch to show all records
+    show_all_records_label: Zobrazit všechno
+    # tooltip for the link to switch to show all records
+    show_all_records_tooltip: Zobrazí všechny záznamy v databáze
+    # Warning message shown when the user wants to switch to all-records mode
+    all_queries_warning: Určitě chceš zobrazit všechny záznamy v databáze?
+    # link to paginated view
+    switch_back_to_paginated_mode_label: zpět na stránkové zobrazení
+    # tooltip for the link to paginated view
+    switch_back_to_paginated_mode_tooltip: Přepnout do stránkového zobrazení
+    # Title of the date string.
+    date_string_tooltip: Kliknutím zmažeš
+    saved_query_panel_title: Uložené filtry
+    save_query_button_label: Uložit aktuálni stav filtrů
+    saved_query_deletion_confirmation: Seš si jistej?
+    saved_query_deletion_link_title: Smazat uloženej filtr
+    saved_query_link_title: Použít uloženej filtr
+    validates_uniqueness_error: Filtr už existuje.
+    validates_presence_error: Prosím zadej název filtru.
+    query_deleted_message: Uložený filtr byl smazán.
+    query_saved_message: Filtr byl uložen.
+    select_all: Vyber všechno
+    deselect_all: Zrušit výběr

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

@@ -67,6 +67,11 @@ if defined?(Wice::Defaults)
   # A boolean value specifying if a change in a filter triggers reloading of the grid.
   Wice::Defaults::AUTO_RELOAD = false
 
+  # If set to an integer (including 0), in integer and float filters the second field will be
+  # dynamically updated when the first field is updated
+  Wice::Defaults::SECOND_RANGE_VALUE_FOLLOWING_THE_FIRST = false
+  # Wice::Defaults::SECOND_RANGE_VALUE_FOLLOWING_THE_FIRST = 1
+
 
   # SQL operator used for matching strings in string filters.
   Wice::Defaults::STRING_MATCHING_OPERATOR = 'LIKE'

data/lib/grid_renderer.rb

@@ -12,6 +12,7 @@ module Wice
     attr_reader :after_row_handler
     attr_reader :before_row_handler
     attr_reader :blank_slate_handler
+    attr_reader :last_row_handler
     attr_reader :grid
     attr_accessor :erb_mode
 
@@ -407,6 +408,11 @@ module Wice
       @before_row_handler = block
     end
 
+    # Can be used to add HTML code (calculation results, for example) after all rows.
+    # Nothing is added if the block return +false+ or +nil+.
+    def last_row(&block)
+      @last_row_handler = block
+    end
     # The output of the block submitted to +blank_slate+ is rendered instead of the whole grid if no filters are active
     # and there are no records to render.
     # In addition to the block style two other variants are accepted:
@@ -520,6 +526,10 @@ module Wice
       contains_auto_reloading_elements(:has_auto_reloading_calendar?)
     end
 
+    def contains_range_filters
+      filter_columns(:in_html).detect{|column| column.filter_shown? && column.is_a?(ViewColumnInteger)}
+    end
+
     protected
 
     def contains_auto_reloading_elements(what) #:nodoc:
@@ -532,4 +542,4 @@ module Wice
     end
 
   end
-end
+end

data/lib/helpers/js_calendar_helpers.rb

@@ -4,9 +4,9 @@ module Wice #:nodoc:
     # Jquery
 
     def date_calendar_jquery(initial_date, view, opts = {}, html_opts = {})  #:nodoc:
-      date_format = Wice::Defaults::DATE_FORMAT
+      date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
 
-      options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id =
+      options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id, close_calendar_event_name  =
         prepare_data_for_calendar(opts, date_format, initial_date)
 
       remove_date_function = %! $('##{date_span_id}').html(''); $('##{dom_id}')[0].value = ''; !
@@ -23,19 +23,19 @@ module Wice #:nodoc:
 
       html = "<span id=\"#{datepicker_placeholder_id}\">#{date_picker}</span>"
 
-      javascript = calendar_constructor_jquery(dom_id, view, Wice::Defaults::DATE_FORMAT_JQUERY,
-        date_span_id, opts[:fire_event], html_opts[:title], datepicker_placeholder_id)
+      javascript = calendar_constructor_jquery(dom_id, view, Wice::ConfigurationProvider.value_for(:DATE_FORMAT_JQUERY),
+        date_span_id, opts[:fire_event], html_opts[:title], datepicker_placeholder_id, close_calendar_event_name)
 
       [html, javascript]
     end
 
     # Prototype
     def date_calendar_prototype(initial_date, view, opts = {}, html_opts = {})  #:nodoc:
-      select_date_datetime_common_prototype(initial_date, view, opts, html_opts, false, Wice::Defaults::DATE_FORMAT)
+      select_date_datetime_common_prototype(initial_date, view, opts, html_opts, false, Wice::ConfigurationProvider.value_for(:DATE_FORMAT))
     end
 
     def datetime_calendar_prototype(initial_date, view, opts = {}, html_opts = {})  #:nodoc:
-      select_date_datetime_common_prototype(initial_date, view, opts, html_opts, true, Wice::Defaults::DATETIME_FORMAT)
+      select_date_datetime_common_prototype(initial_date, view, opts, html_opts, true, Wice::ConfigurationProvider.value_for(:DATETIME_FORMAT))
     end
 
     protected
@@ -50,19 +50,20 @@ module Wice #:nodoc:
       dom_id = options[:id] || name.gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
       datepicker_placeholder_id = dom_id + '_date_placeholder'
       date_span_id = dom_id + '_date_view'
-
-      return options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id
+      close_calendar_event_name =  "wg:calendarChanged_#{opts[:grid_name]}"
+      return options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id, close_calendar_event_name
     end
 
     # jquery
 
-    def calendar_constructor_jquery(dom_id, view, date_format, date_span_id, fireEvent, title, datepicker_placeholder_id) #:nodoc:
+    def calendar_constructor_jquery(dom_id, view, date_format, date_span_id, fireEvent, title,
+        datepicker_placeholder_id, close_calendar_event_name)
 
       javascript  =  %| $( "##{dom_id}" ).datepicker({\n|
       javascript <<  %|   firstDay: 1,\n|
       javascript <<  %|   showOn: "button",\n|
       javascript <<  %|   dateFormat: "#{date_format}",\n|
-      javascript <<  %|   buttonImage: "#{::Wice::Defaults::CALENDAR_ICON}",\n|
+      javascript <<  %|   buttonImage: "#{Wice::ConfigurationProvider.value_for(:CALENDAR_ICON)}",\n|
       javascript <<  %|   buttonImageOnly: true,\n|
       javascript <<  %|   buttonText: "#{title}",\n|
       javascript <<  %|   changeMonth: true,\n|
@@ -70,7 +71,7 @@ module Wice #:nodoc:
       javascript <<  %|   onSelect: function(dateText, inst) {\n|
       javascript <<  %|     $("##{date_span_id}").html(dateText);\n|
       if fireEvent
-        javascript <<  %|     $("##{dom_id}").trigger('wg:calendarChanged');\n|
+        javascript <<  %|     $("##{dom_id}").trigger('#{close_calendar_event_name}');\n|
       end
       javascript <<  %|   }\n|
       javascript <<  %| });\n|
@@ -116,7 +117,7 @@ module Wice #:nodoc:
     # prortotype
 
     def calendar_constructor_prototype(popup_trigger_icon_id, view, dom_id, date_format, 
-                                      date_span_id, with_time, fireEvent) #:nodoc:
+                                      date_span_id, with_time, fireEvent, close_calendar_event_name)
       javascript = ''
 
       unless view.respond_to? :wg_calendar_lang_set
@@ -132,11 +133,11 @@ module Wice #:nodoc:
       javascript << %|      popupTriggerElement : "#{popup_trigger_icon_id}",\n |
       javascript << %|      initialDate : $('#{dom_id}').value,\n |
       if fireEvent
-        javascript << %|      onHideCallback : function(){Event.fire($(#{dom_id}), 'wg:calendarChanged')},\n |
+        javascript << %|      onHideCallback : function(){Event.fire($(#{dom_id}), '#{close_calendar_event_name}')},\n |
       end
       javascript << %|      dateFormat : "#{date_format}",\n|
-      unless Wice::Defaults::POPUP_PLACEMENT_STRATEGY == :trigger
-        javascript << %|      popupPositioningStrategy : "#{Wice::Defaults::POPUP_PLACEMENT_STRATEGY}",\n|
+      unless Wice::ConfigurationProvider.value_for(:POPUP_PLACEMENT_STRATEGY) == :trigger
+        javascript << %|      popupPositioningStrategy : "#{Wice::ConfigurationProvider.value_for(:POPUP_PLACEMENT_STRATEGY)}",\n|
       end
       if with_time
         javascript << %|        withTime : true,\n|
@@ -149,14 +150,14 @@ module Wice #:nodoc:
 
     def select_date_datetime_common_prototype(initial_date, view, opts, html_opts, with_time, date_format)  #:nodoc:
 
-      options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id =
+      options, name, date_string, dom_id, datepicker_placeholder_id, date_span_id, close_calendar_event_name =
         prepare_data_for_calendar(opts, date_format, initial_date)
 
       popup_trigger_icon_id = dom_id + '_trigger'
 
       function = %! $('#{date_span_id}').innerHTML = ''; $('#{dom_id}').value = ''; !
       if opts[:fire_event]
-        function += "Event.fire($(#{dom_id}), 'wg:calendarChanged')"
+        function += "Event.fire($(#{dom_id}), '#{close_calendar_event_name}')"
       end
 
       date_picker = image_tag(Defaults::CALENDAR_ICON,
@@ -174,7 +175,7 @@ module Wice #:nodoc:
 
       html = "<span id=\"#{datepicker_placeholder_id}\">#{date_picker}</span>"
 
-      javascript = calendar_constructor_prototype(popup_trigger_icon_id, view, dom_id, date_format, date_span_id, with_time, opts[:fire_event])
+      javascript = calendar_constructor_prototype(popup_trigger_icon_id, view, dom_id, date_format, date_span_id, with_time, opts[:fire_event], close_calendar_event_name)
 
       [html, javascript]
     end

data/lib/helpers/wice_grid_misc_view_helpers.rb

@@ -13,7 +13,7 @@ module Wice
       end
 
       grid.get_state_as_parameter_value_pairs(true).collect{|param_name, value|
-        hidden_field_tag(param_name, value)
+        hidden_field_tag(param_name, value, :id => "hidden-#{param_name.gsub(/[\[\]]/, '-')}")
       }.join("\n").html_safe_if_necessary
     end
 

data/lib/helpers/wice_grid_view_helpers.rb

@@ -475,6 +475,14 @@ module Wice
         content << after_row_output if after_row_output
       end
 
+      last_row_output = if rendering.last_row_handler
+        call_block_as_erb_or_ruby(rendering, rendering.last_row_handler, nil)
+      else
+        nil
+      end
+
+      content << last_row_output if last_row_output
+
       content << '</tbody></table></div>'
 
       base_link_for_filter, base_link_for_show_all_records = rendering.base_link_for_filter(controller, options[:extra_request_parameters])
@@ -538,6 +546,11 @@ module Wice
         cached_javascript << JsAdaptor.focus_element(rendering.element_to_focus)
       end
 
+      if Wice::ConfigurationProvider.value_for(:SECOND_RANGE_VALUE_FOLLOWING_THE_FIRST) && rendering.contains_range_filters
+        cached_javascript << JsAdaptor.update_ranges(grid.name)
+      end
+
+
       content << javascript_tag(
         JsAdaptor.dom_loaded +
         %/ #{prototype_and_js_version_check}\n/ +
@@ -778,4 +791,4 @@ module Wice
     end
 
   end
-end
+end

data/lib/js_adaptors/jquery_adaptor.rb

@@ -42,7 +42,7 @@ module Wice::JsAdaptor   #:nodoc:
       end
 
       def enter_key_event_registration(grid_name)  #:nodoc:
-        %! $('div##{grid_name}.wice_grid_container .wice_grid_filter_row input[type=text]').keydown(function(event){\n! +
+        %! $('div##{grid_name}.wice_grid_container .wice_grid_filter_row input[type=text], .#{grid_name}_detached_filter input[type=text]').keydown(function(event){\n! +
         %!  if (event.keyCode == 13) {#{grid_name}.process()}\n! +
         %! });\n!
       end
@@ -73,7 +73,7 @@ module Wice::JsAdaptor   #:nodoc:
 
 
       def auto_reloading_calendar_event_initialization(grid_name)  #:nodoc:
-        %! $(document).bind('wg:calendarChanged', function(event){\n! +
+        %! $(document).bind('wg:calendarChanged_#{grid_name}', function(event){\n! +
         %!   #{grid_name}.process()\n! +
         %! });\n!
       end
@@ -139,6 +139,18 @@ module Wice::JsAdaptor   #:nodoc:
         %! }\n!
       end
 
+
+      def update_ranges(grid_name)
+        %! $('div##{grid_name}.wice_grid_container .range-start, .#{grid_name}_detached_filter .range-start').keyup(function(e, a){\n! +
+        %!   var endRange = $(e.target).next();\n! +
+        %!   if (e.target.value){\n! +
+        %!     endRange.val(#{Wice::ConfigurationProvider.value_for(:SECOND_RANGE_VALUE_FOLLOWING_THE_FIRST)} + parseInt(e.target.value));\n! +
+        %!     }else{\n! +
+        %!       endRange.val('');\n! +
+        %!     }\n! +
+        %! });\n!
+      end
+
     end
 
   end

data/lib/js_adaptors/js_adaptor.rb

@@ -3,7 +3,7 @@
 module Wice::JsAdaptor  #:nodoc:
   mattr_accessor :calendar_module
   def self.init  #:nodoc:
-    if Wice::Defaults::JS_FRAMEWORK == :prototype
+    if Wice::ConfigurationProvider.value_for(:JS_FRAMEWORK) == :prototype
       include Wice::JsAdaptor::Prototype
     else
       include Wice::JsAdaptor::Jquery

data/lib/js_adaptors/prototype_adaptor.rb

@@ -45,7 +45,7 @@ module Wice::JsAdaptor  #:nodoc:
       end
 
       def enter_key_event_registration(grid_name)  #:nodoc:
-        %! $$('div##{grid_name}.wice_grid_container .wice_grid_filter_row input[type=text]').each(function(e){\n! +
+        %! $$('div##{grid_name}.wice_grid_container .wice_grid_filter_row input[type=text], .#{grid_name}_detached_filter input[type=text]').each(function(e){\n! +
         %!   e.observe('keydown', function(event){\n! +
         %!     if (event.keyCode == 13) {#{grid_name}.process()}\n! +
         %!   })\n! +
@@ -86,7 +86,7 @@ module Wice::JsAdaptor  #:nodoc:
 
 
       def auto_reloading_calendar_event_initialization(grid_name)  #:nodoc:
-        %! document.observe('wg:calendarChanged', function(event){\n! +
+        %! document.observe('wg:calendarChanged_#{grid_name}', function(event){\n! +
         %!   #{grid_name}.process()\n! +
         %! });\n!
       end
@@ -161,8 +161,19 @@ module Wice::JsAdaptor  #:nodoc:
         %! elToFocus.value = elToFocus.value;\n! # this will just place the cursor at the end of the text input
       end
 
-    end
+      def update_ranges(grid_name)
+        %/ $$('div##{grid_name}.wice_grid_container .range-start, .#{grid_name}_detached_filter .range-start').each(function(e){\n/+
+        %/   e.observe('keyup', function(){\n/+
+        %!     var endRange = e.next();\n! +
+        %!     if (e.value){\n! +
+        %/       endRange.value = #{Wice::ConfigurationProvider.value_for(:SECOND_RANGE_VALUE_FOLLOWING_THE_FIRST)} + parseInt(e.value);\n/ +
+        %/     }else{\n/ +
+          %/       endRange.value = '';\n/ +
+        %/     }\n/ +
+        %/   })\n/+
+        %/ });\n/
+      end
 
+    end
   end
-
 end

data/lib/view_columns.rb

@@ -203,12 +203,12 @@ module Wice
       @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}
-      opts2 = {:size => 3, :id => @dom_id2}
+      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'
+        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)
@@ -356,10 +356,10 @@ module Wice
 
     def render_calendar_filter_internal(params) #:nodoc:
       html1, js1 = datetime_calendar_prototype(params[:fr], @view,
-        {:include_blank => true, :prefix => @name1, :id => @dom_id, :fire_event => auto_reload},
+        {:include_blank => true, :prefix => @name1, :id => @dom_id, :fire_event => auto_reload, :grid_name => self.grid.name},
         :title => WiceGridNlMessageProvider.get_message(:DATE_SELECTOR_TOOLTIP_FROM))
       html2, js2 = datetime_calendar_prototype(params[:to], @view,
-        {:include_blank => true, :prefix => @name2, :id => @dom_id2, :fire_event => auto_reload},
+        {:include_blank => true, :prefix => @name2, :id => @dom_id2, :fire_event => auto_reload, :grid_name => self.grid.name},
         :title => WiceGridNlMessageProvider.get_message(:DATE_SELECTOR_TOOLTIP_TO))
       [%!<div class="date-filter">#{html1}<br/>#{html2}</div>!, js1 + js2]
     end
@@ -401,17 +401,17 @@ module Wice
 
     def render_calendar_filter_internal(params) #:nodoc:
 
-      calendar_helper_method = if Wice::Defaults::JS_FRAMEWORK == :prototype
+      calendar_helper_method = if Wice::ConfigurationProvider.value_for(:JS_FRAMEWORK) == :prototype
         :date_calendar_prototype
       else
         :date_calendar_jquery
       end
 
       html1, js1 = send(calendar_helper_method, params[:fr], @view,
-        {:include_blank => true, :prefix => @name1, :fire_event => auto_reload},
+        {:include_blank => true, :prefix => @name1, :fire_event => auto_reload, :grid_name => self.grid.name},
         :title => WiceGridNlMessageProvider.get_message(:DATE_SELECTOR_TOOLTIP_FROM))
       html2, js2 = send(calendar_helper_method, params[:to], @view,
-        {:include_blank => true, :prefix => @name2, :fire_event => auto_reload},
+        {:include_blank => true, :prefix => @name2, :fire_event => auto_reload, :grid_name => self.grid.name},
         :title => WiceGridNlMessageProvider.get_message(:DATE_SELECTOR_TOOLTIP_TO))
 
       [%!<div class="date-filter">#{html1}<br/>#{html2}</div>!, js1 + js2]
@@ -447,8 +447,8 @@ 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::Defaults::NEGATION_CHECKBOX_LABEL.blank?
-            ::Wice::Defaults::NEGATION_CHECKBOX_LABEL
+          if defined?(Wice::Defaults::NEGATION_CHECKBOX_LABEL) && ! Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL).blank?
+            Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL)
           else
             ''
           end +

data/lib/wice_grid.rb

@@ -485,7 +485,11 @@ module Wice
       end
 
       if custom_order.blank?
-        ActiveRecord::Base.connection.quote_table_name(fully_qualified_column_name.strip)
+        if ActiveRecord::ConnectionAdapters.const_defined?(:SQLite3Adapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+          fully_qualified_column_name.strip.split('.').map{|chunk| ActiveRecord::Base.connection.quote_table_name(chunk)}.join('.')
+        else
+          ActiveRecord::Base.connection.quote_table_name(fully_qualified_column_name.strip)
+        end
       else
         if custom_order.is_a? String
           custom_order.gsub(/\?/, fully_qualified_column_name)
@@ -619,9 +623,9 @@ module Wice
           [:fr, :to].each do |sym|
             if @request_params[sym]
               if @request_params[sym].is_a?(String)
-                @request_params[sym] = Wice::Defaults::DATETIME_PARSER.call(@request_params[sym])
+                @request_params[sym] = Wice::ConfigurationProvider.value_for(:DATETIME_PARSER).call(@request_params[sym])
               elsif @request_params[sym].is_a?(Hash)
-                @request_params[sym] = ::Wice::GridTools.params_2_datetime(@request_params[sym])
+                @request_params[sym] = Wice::GridTools.params_2_datetime(@request_params[sym])
               end
             end
           end
@@ -635,7 +639,7 @@ module Wice
           [: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])
+                @request_params[sym] = Wice::ConfigurationProvider.value_for(:DATE_PARSER).call(@request_params[sym])
               elsif @request_params[sym].is_a?(Hash)
                 @request_params[sym] = ::Wice::GridTools.params_2_date(@request_params[sym])
               end

data/lib/wice_grid_misc.rb

@@ -20,7 +20,7 @@ module Wice
     # Retrieves and constantizes (if needed ) the Query Store model
     def get_query_store_model #:nodoc:
 
-      query_store_model = ::Wice::Defaults::QUERY_STORE_MODEL
+      query_store_model = Wice::ConfigurationProvider.value_for(:QUERY_STORE_MODEL)
       query_store_model = query_store_model.constantize if query_store_model.is_a? String
       raise ::Wice::WiceGridArgumentError.new("Defaults::QUERY_STORE_MODEL must be an ActiveRecord class or a string which can be constantized to an ActiveRecord class") unless query_store_model.kind_of? Class
       validate_query_model(query_store_model) unless @@model_validated
@@ -28,11 +28,11 @@ module Wice
     end
 
     def get_string_matching_operators(model)   #:nodoc:
-      if defined?(Wice::Defaults::STRING_MATCHING_OPERATORS) && Wice::Defaults::STRING_MATCHING_OPERATORS.is_a?(Hash) &&
-          str_matching_operator = Wice::Defaults::STRING_MATCHING_OPERATORS[model.connection.class.to_s]
+      if defined?(Wice::Defaults::STRING_MATCHING_OPERATORS) && Wice::ConfigurationProvider.value_for(:STRING_MATCHING_OPERATORS).is_a?(Hash) &&
+          str_matching_operator = Wice::ConfigurationProvider.value_for(:STRING_MATCHING_OPERATORS)[model.connection.class.to_s]
         str_matching_operator
       else
-        Wice::Defaults::STRING_MATCHING_OPERATOR
+        Wice::ConfigurationProvider.value_for(:STRING_MATCHING_OPERATOR)
       end
     end
 
@@ -81,6 +81,20 @@ module Wice
     end
   end
 
+  module ConfigurationProvider #:nodoc:
+    class << self
+
+      def value_for(key) #:nodoc:
+        if Wice::Defaults.const_defined?(key)
+          Wice::Defaults.const_get(key)
+        else
+          raise WiceGridException.new("Could not find constant #{key} in the configuration file! Please run the generator command to update the configuration file:\n   rails g  wice_grid:wice_grid_assets_jquery\nor   rails g wice_grid:wice_grid_assets_prototype\ndepending on your JS framework")
+        end
+      end
+
+    end
+  end
+
   module Defaults  #:nodoc:
   end
 

data/lib/wice_grid_serialized_queries_controller.rb

@@ -33,7 +33,7 @@ module Wice
           @error_messages = sq.errors.full_raw_messages.join(' ')
         end
       end
-      template_name = if Wice::Defaults::JS_FRAMEWORK == :prototype
+      template_name = if Wice::ConfigurationProvider.value_for(:JS_FRAMEWORK) == :prototype
         'delete'
       else
         'delete_jq'
@@ -60,7 +60,7 @@ module Wice
       else
         @error_messages = @saved_query.errors.map{ |_, msg| msg }.join(' ')
       end
-      template_name = if Wice::Defaults::JS_FRAMEWORK == :prototype
+      template_name = if Wice::ConfigurationProvider.value_for(:JS_FRAMEWORK) == :prototype
         'create'
       else
         'create_jq'

data/wice_grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid}
-  s.version = "3.0.0.pre2"
+  s.version = "3.0.0.pre3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind"]
-  s.date = %q{2010-12-28}
+  s.date = %q{2011-02-18}
   s.description = %q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
   s.email = %q{yuri.leikind@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: wice_grid
 version: !ruby/object:Gem::Version 
-  hash: -1876988207
+  hash: -1876988210
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre2
-  version: 3.0.0.pre2
+  - pre3
+  version: 3.0.0.pre3
 platform: ruby
 authors: 
 - Yuri Leikind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency