wice_grid 3.4.14 → 3.5.0

data/SAVED_QUERIES_HOWTO.rdoc

@@ -46,8 +46,8 @@ It is also possible to initialize a grid with an initial saved query providing t
 itself to parameter <tt>saved_query</tt>:
 
   @products_grid = initialize_grid(Product,
-    :name => 'prod_grid',
-    :saved_query =>  SavedQuery.find_by_id_and_grid_name(12, 'prod_grid') )
+    name:        'prod_grid',
+    saved_query: SavedQuery.find_by_id_and_grid_name(12, 'prod_grid') )
 
 
 == Adding Application Specific Logic to Saving/Restoring Queries
@@ -61,14 +61,14 @@ After renaming the model to SavedQuery it looks like this:
   class SavedQuery < ActiveRecord::Base  #:nodoc:
     serialize :query
 
-    validates_uniqueness_of :name, :scope => :grid_name, :on => :create,
-      :message => 'A query with this name already exists'
+    validates_uniqueness_of :name, scope: :grid_name, on: :create,
+      message: 'A query with this name already exists'
 
-    validates_presence_of :name, :message => 'Please submit the name of the custom query'
+    validates_presence_of :name, message: 'Please submit the name of the custom query'
 
     def self.list(name, controller)
-      conditions = {:grid_name => name}
-      self.find(:all, :conditions => conditions)
+      conditions = {grid_name: name}
+      self.find(:all, conditions: conditions)
     end
   end
 
@@ -79,19 +79,19 @@ store queries for each user, we could add +user_id+ to the table and modify the
   class SavedQuery < ActiveRecord::Base
     serialize :query
 
-    validates_uniqueness_of :name, :scope => :grid_name, :on => :create,
-      :message => 'A query with this name already exists'
+    validates_uniqueness_of :name, scope: :grid_name, on: :create,
+      message: 'A query with this name already exists'
 
-    validates_presence_of :name, :message => 'Please submit the name of the custom query'
+    validates_presence_of :name, message: 'Please submit the name of the custom query'
 
     belongs_to :identity # !
 
     def self.list(name, controller)
-      conditions = {:grid_name => name}
+      conditions = {grid_name: name}
       if controller.current_user # !
         conditions[:user_id] = controller.current_user.id # provided that method current_user is defined in ApplicationController and returns the currrent user.
       end
-      self.find(:all, :conditions => conditions)
+      self.find(:all, conditions: conditions)
     end
   end
 
@@ -99,7 +99,7 @@ The following step is to make sure that a new query is saved with the correct +u
 <tt>saved_queries_panel(@grid_object)</tt> to the following:
 
 
-   <%= saved_queries_panel(@identities_grid, :extra_parameters => {:user_id => @current_user.id}) %>
+   <%= saved_queries_panel(@identities_grid, extra_parameters: {user_id: @current_user.id}) %>
 
 For every key in has :extra_parameters there must exist a field in the model - this hash will be used as a parameter to
 <tt>attributes=</tt> method of the query object.

data/app/views/kaminari/wice_grid/_next_page.html.erb

@@ -1 +1 @@
-<li><%= link_to_unless current_page.last?, ::Wice::NlMessage['next_label'], url, :rel => 'next', :remote => remote %></li>
+<li><%= link_to_unless current_page.last?, ::Wice::NlMessage['next_label'], url, rel: 'next', remote: remote %></li>

data/app/views/kaminari/wice_grid/_page.html.erb

@@ -1 +1 @@
-<li <%if page.current?%>class="active"<%end%>><%= link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %></li>
+<li <%if page.current?%>class="active"<%end%>><%= link_to page, url, {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} %></li>

data/app/views/kaminari/wice_grid/_prev_page.html.erb

@@ -1 +1 @@
-<li><%= link_to_unless current_page.first?, ::Wice::NlMessage['previous_label'], url, :rel => 'prev', :remote => remote %></li>
+<li><%= link_to_unless current_page.first?, ::Wice::NlMessage['previous_label'], url, rel: 'prev', remote: remote %></li>

data/lib/generators/wice_grid/install_generator.rb

@@ -3,7 +3,7 @@ module WiceGrid #:nodoc:
     class InstallGenerator < Rails::Generators::Base #:nodoc:
 
       desc 'Copy WiceGrid wice_grid_config.rb to config/initializers, ' +
-        'wice_grid.yml to config/locales/, and wice_grid.css.scss to assets/stylesheets'
+        'wice_grid.yml to config/locales/, and wice_grid.scss to assets/stylesheets'
 
       source_root File.expand_path('../templates', __FILE__)
 
@@ -12,7 +12,7 @@ module WiceGrid #:nodoc:
 
         copy_file 'wice_grid.yml',  'config/locales/wice_grid.yml'
 
-        copy_file 'wice_grid.css.scss',  'app/assets/stylesheets/wice_grid.css.scss'
+        copy_file 'wice_grid.scss',  'app/assets/stylesheets/wice_grid.scss'
 
       end
     end

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

@@ -46,6 +46,53 @@ en:
     expand: Expand
     collapse: Collapse
 
+es:
+  date:
+    order:
+      - :day
+      - :month
+      - :year
+  wice_grid:
+    show_filter_tooltip: Mostrar filtro
+    hide_filter_tooltip: Ocultar filtro
+    csv_export_tooltip: Exportar a CSV
+    filter_tooltip: Filtro
+    reset_filter_tooltip: Reset
+    boolean_filter_true_label: "Si"
+    boolean_filter_false_label: "No"
+    previous_label: «
+    next_label: »
+    # Title of the icon clicking on which will show the calendar to set the FROM date.
+    date_selector_tooltip_from: Desde
+    # Title of the icon clicking on which will show the calendar to set the TO date.
+    date_selector_tooltip_to: Hasta
+    # The title of the checkox to turn on negation
+    negation_checkbox_title: Excluir
+    # link to switch to show all records
+    show_all_records_label: mostrar todos
+    # tooltip for the link to switch to show all records
+    show_all_records_tooltip: Mostrar todos los registros
+    # Warning message shown when the user wants to switch to all-records mode
+    all_queries_warning: ¿Estás seguro que quieres mostrar todos los registros?
+    # link to paginated view
+    switch_back_to_paginated_mode_label: volver a la vista paginada
+    # tooltip for the link to paginated view
+    switch_back_to_paginated_mode_tooltip: Cambiar atrás a la vista con páginas
+    # Title of the date string.
+    date_string_tooltip: Click en borrar
+    saved_query_panel_title: Consultas salvadas
+    save_query_button_label: Salvar el estado de los filtros
+    saved_query_deletion_confirmation: ¿Estás seguro?
+    saved_query_deletion_link_title: Borrar consulta
+    saved_query_link_title: Cargar consulta
+    validates_uniqueness_error: Una consulta con este nombre ya existe
+    validates_presence_error: Por favor tramita el nombre la consulta modificada
+    query_deleted_message: Salvada la consulta borrado.
+    query_saved_message: Consulta salvada.
+    select_all: Selecciona todo
+    deselect_all: Borra la selección
+    expand: Expandir
+    collapse: Contraer
 
 is:
   date:
@@ -547,4 +594,43 @@ ja:
     select_all: 全てを選択
     deselect_all: 選択を解除
     expand: 開く
-    collapse: 閉じる
+    collapse: 閉じる
+
+it:
+  date:
+    order:
+      - :day
+      - :month
+      - :year
+  wice_grid:
+    show_filter_tooltip: Mostra filtri
+    hide_filter_tooltip: Nascondi filtri
+    csv_export_tooltip: Esporta in CSV
+    filter_tooltip: Filtri
+    reset_filter_tooltip: Cancella
+    boolean_filter_true_label: "si"
+    boolean_filter_false_label: "no"
+    previous_label: «
+    next_label: »
+    date_selector_tooltip_from: Da
+    date_selector_tooltip_to: A
+    negation_checkbox_title: Escludi
+    show_all_records_label: Tutti i risultati
+    show_all_records_tooltip: Mostra tutti i risultati
+    all_queries_warning: Sei sicuro di voler mostrare tutti i risultati?
+    switch_back_to_paginated_mode_label: torna alla vista paginata
+    switch_back_to_paginated_mode_tooltip: Per tornare alla paginazione
+    date_string_tooltip: Clicca per cancellare
+    saved_query_panel_title: Ricerche salvate
+    save_query_button_label: Salva il valore dei filtri
+    saved_query_deletion_confirmation: Sei sicuro?
+    saved_query_deletion_link_title: Cancella la ricerca
+    saved_query_link_title: Carica ricerca
+    validates_uniqueness_error: Una ricerca con questo nome già esiste
+    validates_presence_error: Per favore inserisci il nome per questa ricerca personalizzata
+    query_deleted_message: Ricerca cancellata
+    query_saved_message: Ricerca salvata
+    select_all: Seleziona tutti
+    deselect_all: Deseleziona tutti
+    expand: Espandi
+    collapse: Chiudi

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

@@ -53,7 +53,7 @@ if defined?(Wice::Defaults)
   # when you connect to two databases one of which is MySQL and the other is Postgresql.
   # If the key for an adapter is missing it will fall back to Wice::Defaults::STRING_MATCHING_OPERATOR
   Wice::Defaults::STRING_MATCHING_OPERATORS = {
-    'ActiveRecord::ConnectionAdapters::MysqlAdapter' => 'LIKE',
+    'ActiveRecord::ConnectionAdapters::MysqlAdapter'      => 'LIKE',
     'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter' => 'ILIKE'
   }
 
@@ -90,18 +90,22 @@ if defined?(Wice::Defaults)
 
 
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-  #                              Showing All Queries                          #
+  #                              Showing All Records                          #
 
   # Enable or disable showing all records (non-paginated table)
-  Wice::Defaults::ALLOW_SHOWING_ALL_QUERIES = true
+  Wice::Defaults::ALLOW_SHOWING_ALL_RECORDS = true
 
   # If number of all queries is more than this value, the user will be given a warning message
   Wice::Defaults::START_SHOWING_WARNING_FROM = 100
 
-
   # Hide the "show all" link if the number of all records is more than...
-  # set to nil to shows it always
-  Wice::Defaults::HIDE_ALL_LINK_FROM = nil
+  # Force-resets back to pagination starting from this value.
+  # Set to nil to always show it
+  Wice::Defaults::SHOW_ALL_ALLOWED_UP_TO = nil
+
+  #
+  # set to nil to skip the check
+  Wice::Defaults::SWITCH_BACK_TO_PAGINATION_FROM = nil
 
 
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -119,6 +123,7 @@ if defined?(Wice::Defaults)
   # * <tt>:calendar</tt> - JS calendar
   # * <tt>:html5</tt> - HTML5 date input field
   # * <tt>:standard</tt> - standard Rails date and datetime helpers
+  # * <tt>:bootstrap</tt> - Bootstrap datepicker helper
   Wice::Defaults::HELPER_STYLE = :calendar
 
   # Format of the datetime displayed.
@@ -134,6 +139,11 @@ if defined?(Wice::Defaults)
   Wice::Defaults::DATE_FORMAT_JQUERY     =  "yy-mm-dd"
 
 
+  # Format of the date displayed in Bootstrap's Datepicker
+  # If you change the format, make sure to check if +DATE_PARSER+ can still parse this string.
+  Wice::Defaults::DATE_FORMAT_BOOTSTRAP     =  "yyyy-mm-dd"
+
+
   # With Calendar helpers enabled the parameter sent is the string displayed. This lambda will be given a date string in the
   # format defined by +DATETIME_FORMAT+ and must generate a DateTime object.
   # In many cases <tt>Time.zone.parse</tt> is enough, for instance,  <tt>%Y-%m-%d</tt>. If you change the format, make sure to check this code
@@ -162,7 +172,11 @@ if defined?(Wice::Defaults)
     if date_string.blank?
       nil
     else
-      Date.parse(date_string)
+      begin
+        Date.parse(date_string)
+      rescue ArgumentError
+        nil
+      end
     end
   }
 

data/lib/wice/active_record_column_wrapper.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   # to be mixed in into ActiveRecord::ConnectionAdapters::Column

data/lib/wice/columns.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice #:nodoc:
 
   module Columns #:nodoc:

data/lib/wice/columns/column_action.rb

@@ -1,12 +1,12 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc:
 
 
     class ViewColumnAction < ViewColumn #:nodoc:
-      def initialize(grid_obj, html, param_name, select_all_buttons, object_property, view, block = nil)  #:nodoc:
+      def initialize(grid_obj, html, param_name, select_all_buttons, object_property, html_check_box, view, block = nil)  #:nodoc:
         @view = view
+        @html_check_box       = html_check_box
         @select_all_buttons   = select_all_buttons
         self.grid             = grid_obj
         self.html             = html
@@ -34,12 +34,17 @@ module Wice
       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'])
+        if @html_check_box
+          check_box_tag :select_all, 1, false, {class: 'wg-select-all'}
+        else
+          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/wice/columns/column_boolean.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc:

data/lib/wice/columns/column_custom_dropdown.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc:

data/lib/wice/columns/column_date.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc:
@@ -29,7 +28,7 @@ module Wice
         end
 
         if opts[:to]
-          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} < ? "
+          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} <= ? "
           conditions << (opts[:to].to_date + 1)
         end
 

data/lib/wice/columns/column_datetime.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc:
 
     class ViewColumnDatetime < ViewColumn #:nodoc:
       include ActionView::Helpers::DateHelper
+      include Wice::BsCalendarHelpers
       include Wice::JsCalendarHelpers
 
 
@@ -53,12 +53,37 @@ module Wice
       def render_html5_filter_internal(params) #:nodoc:
         css_class = 'form-control input-sm native-datepicker ' + (auto_reload ? 'auto-reload' : '')
         date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
-        '<div class="date-filter">' +
+        '<div class="date-filter wg-html5-datepicker">' +
         date_field_tag(@name1, params[:fr].try(:strftime, date_format), {class: css_class, id: @dom_id}) + '<br/>' +
         date_field_tag(@name2, params[:to].try(:strftime, date_format), {class: css_class, id: @dom_id2}) +
         '</div>'
       end
 
+      def render_bs_filter_internal(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 render_calendar_filter_internal(params) #:nodoc:
 
         calendar_data_from = prepare_data_for_calendar(
@@ -84,7 +109,7 @@ module Wice
 
         html2 = date_calendar_jquery calendar_data_to
 
-        %!<div class="date-filter">#{html1}<br/>#{html2}</div>!
+        %!<div class="date-filter wg-jquery-datepicker">#{html1}<br/>#{html2}</div>!
       end
 
 
@@ -95,6 +120,9 @@ module Wice
         elsif helper_style == :html5
           prepare_for_calendar_filter
           render_html5_filter_internal(params)
+        elsif helper_style == :bootstrap
+          prepare_for_calendar_filter
+          render_bs_filter_internal(params)
         else # :calendar
           prepare_for_calendar_filter
           render_calendar_filter_internal(params)
@@ -111,13 +139,11 @@ module Wice
 
 
       def has_auto_reloading_calendar? #:nodoc:
-        auto_reload && helper_style == :calendar
+        auto_reload && [:bootstrap, :calendar].include?(helper_style)
       end
 
     end
 
-
-
     class ConditionsGeneratorColumnDatetime < ConditionsGeneratorColumn  #:nodoc:
 
       def generate_conditions(table_alias, opts)   #:nodoc:
@@ -128,7 +154,7 @@ module Wice
         end
 
         if opts[:to]
-          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} < ? "
+          conditions[0] << " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} <= ? "
           conditions << (opts[:to])
         end
 

data/lib/wice/columns/column_float.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice #:nodoc:
 
 

data/lib/wice/columns/column_integer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   module Columns #:nodoc: