it-logica-application-backbone 1.3.12 → 1.3.13

data/VERSION

@@ -1 +1 @@
-1.3.12
+1.3.13

data/app/views/helpers/_build_table_wrapper.html.erb

@@ -46,8 +46,23 @@
                     <%= text_field_tag "number_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "text #{settings[:form_id] + '_column_find'}",
                                                                                                 :onchange => "form_submit_watcher('#{settings[:form_id]}')",
                                                                                                 :placeholder => "max.",
-                                                                                                :title => t('itl-gem.value_has_to_be_bigger_or_equal')} %>
+                                                                                                :title => t('itl-gem.value_has_to_be_lesser_or_equal')} %>
                   </div>
+              <% when :number_exact %>
+                    <div class="inputs range clearfix small_padding">
+                      <% saved_param = (!settings[:params].blank? && !settings[:params]['number_exact_from'].blank? && !settings[:params]['number_exact_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['number_exact_from']["#{col[:table]}.#{col[:name]}"] : "" %>
+
+                      <%= text_field_tag "number_exact_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "text first #{settings[:form_id] + '_column_find'}",
+                                                                                                    :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                                    :placeholder => "min.",
+                                                                                                    :title => t('itl-gem.value_has_to_be_bigger_or_equal_or_exact')} %>
+                      <% saved_param = (!settings[:params].blank? && !settings[:params]['number_exact_to'].blank? && !settings[:params]['number_exact_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['number_exact_to']["#{col[:table]}.#{col[:name]}"] : "" %>
+                      <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
+                      <%= text_field_tag "number_exact_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "text #{settings[:form_id] + '_column_find'}",
+                                                                                                  :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                                  :placeholder => "max.",
+                                                                                                  :title => t('itl-gem.value_has_to_be_lesser_or_equal_or_exact')} %>
+                    </div>
               <% when :date %>
                   <div class="inputs range clearfix small_padding">
                     <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>

data/app/views/helpers/editable_table/_build_table_header.html.erb

@@ -56,6 +56,21 @@
                                                                                                   :placeholder => "max.",
                                                                                                   :title => "Hodnota musí být menší nebo rovna zadané hodnotě"} %>
                     </div>
+                <% when :number_exact %>
+                    <div class="inputs range clearfix small_padding">
+                      <% saved_param = (!settings[:params].blank? && !settings[:params]['number_exact_from'].blank? && !settings[:params]['number_exact_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['number_exact_from']["#{col[:table]}.#{col[:name]}"] : "" %>
+
+                      <%= text_field_tag "number_exact_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "text first #{settings[:form_id] + '_column_find'}",
+                                                                                                    :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                                    :placeholder => "min.",
+                                                                                                    :title => t('itl-gem.value_has_to_be_bigger_or_equal_or_exact')} %>
+                      <% saved_param = (!settings[:params].blank? && !settings[:params]['number_exact_to'].blank? && !settings[:params]['number_exact_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['number_exact_to']["#{col[:table]}.#{col[:name]}"] : "" %>
+                      <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
+                      <%= text_field_tag "number_exact_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "text #{settings[:form_id] + '_column_find'}",
+                                                                                                  :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                                  :placeholder => "max.",
+                                                                                                  :title => t('itl-gem.value_has_to_be_lesser_or_equal_or_exact')} %>
+                    </div>
                 <% when :date %>
                     <div class="inputs range clearfix small_padding">
                       <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>

data/config/locales/gem_translations.cs.yml

@@ -14,6 +14,9 @@ cs:
     edit_description: Editovat popisek
     value_has_to_be_bigger_or_equal: Hodnota musí být vetší nebo rovna zadané hodnotě
     value_has_to_be_lesser_or_equal: Hodnota musí být menší nebo rovna zadané hodnotě
+    value_has_to_be_bigger_or_equal_or_exact: Hodnota musí být rovna zadané hodnotě nebo v intervalu <min,max> pokud jsou zadány obě hodnoty min a max.
+    value_has_to_be_lesser_or_equal_or_exact: Hodnota musí být rovna zadané hodnotě nebo v intervalu <min,max> pokud jsou zadány obě hodnoty min a max.
+
     date_from: Datum od
     date_to: Datum do
     mark_unmark_all_checkboxes: Označit/odznačit vše na stránce

data/config/locales/gem_translations.sk.yml

@@ -14,6 +14,9 @@ sk:
     edit_description: Editovať popis
     value_has_to_be_bigger_or_equal: Hodnota musí byť väčšia alebo rovná zadanej hodnote
     value_has_to_be_lesser_or_equal: Hodnota musí byť menšia nebo rovná zadanej hodnote
+    value_has_to_be_bigger_or_equal_or_exact: Hodnota sa musí rovnať zadanej hodnote, alebo byť v intervale <min,max>, ak sú hodnoty min a max zadané
+    value_has_to_be_lesser_or_equal_or_exact: Hodnota sa musí rovnať zadanej hodnote, alebo byť v intervale <min,max>, ak sú hodnoty min a max zadané
+
     date_from: Dátum od
     date_to: Dátum do
     mark_unmark_all_checkboxes: Označiť/odznačit všetko na stránke

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.3.12"
+  s.version = "1.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2013-02-19"
+  s.date = "2013-03-14"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/model_mixins/table_builder_class_methods.rb

@@ -383,6 +383,49 @@ module ModelMixins
       select(select_string)
     end
 
+    def process_number_exact_filter(params)
+      # this will divide :number_exact filter into find_exact and number_from - number_to filter
+      # the condition is look for interval if there is an interval(2 values given) otherwise look for the exact match
+
+      if !params.blank?
+        number_exact_from = params['number_exact_from'].blank? ? nil : params['number_exact_from'].dup
+        number_exact_to = params['number_exact_to'].blank? ? nil : params['number_exact_to'].dup
+
+        if (!number_exact_from.blank? && !number_exact_to.blank?)
+          # if they have whole interval, it will go to number_filter
+          number_keys = number_exact_from.keys.delete_if { |x| number_exact_from[x].blank? } &
+              number_exact_to.keys.delete_if { |x| number_exact_to[x].blank? }
+          number_keys.each do |number_key|
+            # move it to number filter
+            params['number_from'] ||= {}
+            params['number_from'][number_key] = number_exact_from[number_key]
+            params['number_to'] ||= {}
+            params['number_to'][number_key] = number_exact_to[number_key]
+
+            # and delete it
+            number_exact_from.delete(number_key)
+            number_exact_to.delete(number_key)
+          end
+        end
+
+        # the ones with whole interval were removed, I will put the rest in find exact
+        if (!number_exact_from.blank?)
+          params['find_exact'] ||= {}
+          number_exact_from.each_pair do |index, value|
+            params['find_exact'][index] = value unless value.blank?
+          end
+        end
+
+        if (!number_exact_to.blank?)
+          params['find_exact'] ||= {}
+          number_exact_to.each_pair do |index, value|
+            params['find_exact'][index] = value unless value.blank?
+          end
+        end
+      end
+      params
+    end
+
     def filter(object, settings, params, per_page = 10, total_count = nil)
       order_by = params[:real_order_by]
 
@@ -398,6 +441,9 @@ module ModelMixins
           cond_hash = {:checkboxes => params["checkbox_pool"].split(",")}
           per_page = nil # no paginate for checkbox filter
         else
+          params = process_number_exact_filter(params)
+
+
           # filtering by table filters
           if !params.blank? && params['find']
             params['find'].each_pair do |i, v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &82222620 !ruby/object:Gem::Requirement
+  requirement: &69897050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82222620
+  version_requirements: *69897050
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &82221660 !ruby/object:Gem::Requirement
+  requirement: &69895340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *82221660
+  version_requirements: *69895340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &82219800 !ruby/object:Gem::Requirement
+  requirement: &69894290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82219800
+  version_requirements: *69894290
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85197770 !ruby/object:Gem::Requirement
+  requirement: &72767730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85197770
+  version_requirements: *72767730
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85196770 !ruby/object:Gem::Requirement
+  requirement: &72766790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *85196770
+  version_requirements: *72766790
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85195850 !ruby/object:Gem::Requirement
+  requirement: &72765950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *85195850
+  version_requirements: *72765950
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &85194910 !ruby/object:Gem::Requirement
+  requirement: &72764980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85194910
+  version_requirements: *72764980
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -633,7 +633,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -217816723
+      hash: -158069183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: