it-logica-application-backbone 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/app/assets/stylesheets/backbone_css/tables.css.scss

@@ -23,6 +23,10 @@ table.table_special .input-small {
   color: $marked_item_color;
 }
 
+table.table_special .input-small.input-mini {
+  width: 15px;
+}
+
 table.table_special .input-small.datetime_class {
   width: 15px;
 }

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

@@ -9,9 +9,9 @@
     <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
         <th></th>
     <% end %>
-    <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless  settings[:params][:order_by].blank?  %>
+    <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless  settings[:params][:order_by].blank? %>
     <% settings[:columns].each do |col| %>
-        <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc")  %>
+        <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc") %>
         <% order_desc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___desc") %>
         <th class="<%= col[:class] %>">
           <div class="th_label">
@@ -45,10 +45,22 @@
                                        :onchange => "form_submit_watcher('#{settings[:form_id]}')",
                                        :multiple => true,
                                        :class => "multiselect_class") %></span>
-            <% when :date %>
-                <% 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]}"] : "" %>
+              <% when :number %>
+                              <% 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]}"] : "" %>
+
+                  <%= text_field_tag "number_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "input-small input-mini #{settings[:form_id] + '_column_find'}",
+                                                                                              :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                              :title => "Vetší nebo rovno"} %>
+                  <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
+                  <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
+                  <%= text_field_tag "number_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "input-small input-mini",
+                                                                                            :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                            :title => "Menší nebo rovno"} %>
+                  <span></span>
+              <% when :date %>
+                  <% 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]}"] : "" %>
                   <%#= label_tag "date_from[#{col[:table]}.#{col[:name]}]", "Od", :class => "datetime_class_label" %>
-                  <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
+                  <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small #{settings[:form_id] + '_column_find'}",
                                                                                               :onchange => "form_submit_watcher('#{settings[:form_id]}')",
                                                                                               :title => "Datum od"} %>
                   <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
@@ -57,7 +69,7 @@
                                                                                             :onchange => "form_submit_watcher('#{settings[:form_id]}')",
                                                                                             :title => "Datum do"} %>
                   <span></span>
-            <% else %>
+                  <% else %>
               <% end %>
             </span>
           </div>

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.6"
+  s.version = "1.0.7"
 
   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

@@ -205,7 +205,7 @@ module ModelMixins
               if i.match(/^.*?___sql_expression___.*$/i)
                 i = i.gsub(/___sql_expression___\./, "") #some cleaning job
 
-                having_cond_str += " AND " unless cond_str.blank?
+                having_cond_str += " AND " unless having_cond_str.blank?
                 cond_id = "find_#{i.gsub(/\./, '_')}"
                 having_cond_str += "#{i} LIKE :#{cond_id}" #OR guest_email LIKE :find"
                 having_cond_hash.merge!({cond_id.to_sym => "%#{v}%"})
@@ -235,26 +235,54 @@ module ModelMixins
         end
       end
 
-      if !params.blank? && params['date_from']
-        params['date_from'].each_pair do |i, v|
+      if !params.blank? && (params['date_from'] || params['number_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?
-            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}"})
+            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['date_to']
-        params['date_to'].each_pair do |i, v|
+      if !params.blank? && (params['date_to'] || params['number_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?
+        end
+        to_hash.each_pair do |i, v|
           i = i.gsub(/___unknown___\./, "") #some cleaning job
           unless v.blank?
-            cond_str += " AND " unless cond_str.blank?
-            cond_id = "date_to_#{i.gsub(/\./, '_')}"
-            cond_str += "#{i} <= :#{cond_id}" #OR guest_email LIKE :find"
-            cond_hash.merge!({cond_id.to_sym => "#{v}"})
+            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"
+              cond_hash.merge!({cond_id.to_sym => "#{v}"})
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &74655360 !ruby/object:Gem::Requirement
+  requirement: &79206700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74655360
+  version_requirements: *79206700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &74654940 !ruby/object:Gem::Requirement
+  requirement: &78559150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74654940
+  version_requirements: *78559150
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74176350 !ruby/object:Gem::Requirement
+  requirement: &78558850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *74176350
+  version_requirements: *78558850
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74176070 !ruby/object:Gem::Requirement
+  requirement: &78558570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *74176070
+  version_requirements: *78558570
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74175780 !ruby/object:Gem::Requirement
+  requirement: &78558310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *74175780
+  version_requirements: *78558310
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74175470 !ruby/object:Gem::Requirement
+  requirement: &78557980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74175470
+  version_requirements: *78557980
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -570,7 +570,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1038174595
+      hash: -43345519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: