it-logica-application-backbone 1.0.33 → 1.0.34

data/VERSION

@@ -1 +1 @@
-1.0.33
+1.0.34

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.33"
+  s.version = "1.0.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

data/lib/model_mixins/table_builder_class_methods.rb

@@ -357,13 +357,9 @@ module ModelMixins
             end
           end
 
-          if !params.blank? && (params['date_from'] || params['number_from'])
+          if !params.blank? && (params['date_from'])
             from_hash = params['date_from']
-            if from_hash.blank?
-              from_hash = params['number_from']
-            else
-              from_hash.merge!(params['number_from']) unless params['number_from'].blank?
-            end
+
             from_hash.each_pair do |i, v|
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
@@ -377,19 +373,62 @@ module ModelMixins
                   cond_str += " AND " unless cond_str.blank?
                   cond_id = "date_from_#{i.gsub(/\./, '_')}"
                   cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
-                  cond_hash.merge!({cond_id.to_sym => "#{v}"})
+                  v = Time.parse(v)  # queries to database has to be in utc date
+                  cond_hash.merge!({cond_id.to_sym => "#{v.utc}"})
                 end
               end
             end
           end
 
-          if !params.blank? && (params['date_to'] || params['number_to'])
+          if !params.blank? && (params['date_to'])
             to_hash = params['date_to']
-            if to_hash.blank?
-              to_hash = params['number_to']
-            else
-              to_hash.merge!(params['number_to']) unless params['number_to'].blank?
+
+            to_hash.each_pair do |i, v|
+              i = i.gsub(/___unknown___\./, "") #some cleaning job
+              unless v.blank?
+                if i.match(/^.*?___sql_expression___.*$/i)
+                  i = i.gsub(/___sql_expression___\./, "") #some cleaning job
+                  having_cond_str += " AND " unless having_cond_str.blank?
+                  cond_id = "date_to_#{i.gsub(/\./, '_')}"
+                  having_cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
+                  having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
+                else
+                  cond_str += " AND " unless cond_str.blank?
+                  cond_id = "date_to_#{i.gsub(/\./, '_')}"
+                  cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
+                  v = Time.parse(v)  # queries to database has to be in utc date
+                  cond_hash.merge!({cond_id.to_sym => "#{v.utc}"})
+                end
+              end
+            end
+          end
+
+
+          if !params.blank? && (params['number_from'])
+            from_hash = params['number_from']
+
+            from_hash.each_pair do |i, v|
+              i = i.gsub(/___unknown___\./, "") #some cleaning job
+              unless v.blank?
+                if i.match(/^.*?___sql_expression___.*$/i)
+                  i = i.gsub(/___sql_expression___\./, "") #some cleaning job
+                  having_cond_str += " AND " unless having_cond_str.blank?
+                  cond_id = "date_from_#{i.gsub(/\./, '_')}"
+                  having_cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
+                  having_cond_hash.merge!({cond_id.to_sym => "#{v}"})
+                else
+                  cond_str += " AND " unless cond_str.blank?
+                  cond_id = "date_from_#{i.gsub(/\./, '_')}"
+                  cond_str += "#{i} >= :#{cond_id}" #OR guest_email LIKE :find"
+                  cond_hash.merge!({cond_id.to_sym => "#{v}"})
+                end
+              end
             end
+          end
+
+          if !params.blank? && (params['number_to'])
+            to_hash = params['number_to']
+
             to_hash.each_pair do |i, v|
               i = i.gsub(/___unknown___\./, "") #some cleaning job
               unless v.blank?
@@ -409,6 +448,7 @@ module ModelMixins
             end
           end
 
+
         #items = self.joins("LEFT OUTER JOIN intranet_text_pages ON resource_id = intranet_text_pages.id").where(cond_str, cond_hash).paginate(:page => params[:page], :per_page => per_page).order(order_by).selection(settings)
         #if params[:page].to_i > items.total_pages && items.total_pages > 0
         #  params[:page] = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &77498870 !ruby/object:Gem::Requirement
+  requirement: &71370050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77498870
+  version_requirements: *71370050
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77498490 !ruby/object:Gem::Requirement
+  requirement: &71369730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77498490
+  version_requirements: *71369730
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77497730 !ruby/object:Gem::Requirement
+  requirement: &71368910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77497730
+  version_requirements: *71368910
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77519900 !ruby/object:Gem::Requirement
+  requirement: &70780380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77519900
+  version_requirements: *70780380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77518910 !ruby/object:Gem::Requirement
+  requirement: &70779330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77518910
+  version_requirements: *70779330
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77518460 !ruby/object:Gem::Requirement
+  requirement: &70778790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77518460
+  version_requirements: *70778790
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -577,7 +577,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 978516881
+      hash: -939288579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: