table_on_steroids 0.1.1.2 → 0.1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d0db1565b5c92a644b129ec08263c56cb174ce00de3a415111d3683cf65958
-  data.tar.gz: b5db441dbd5e78723cd4ca3d7ae59737784fc0363e28915b3cb4d16825aa5e9b
+  metadata.gz: c9c5c3440b05a59bd943f908ac5b945b4070bab690e5316339181513c434ecc4
+  data.tar.gz: 5e9ab8b1e41d446dfe14184c2e898d1097f2e068416a69c5104d042a17098663
 SHA512:
-  metadata.gz: 4c1b1094fc0231cec8167781e05e154ccc9fe02e04fc3c14399ecb55b9b91fface474df8897df1cadc8dabc6f617a31319f51ca845bad0b7d703984ca9c6b01b
-  data.tar.gz: b0574a3eebd51d591b43c3f922155bef2d54c9f585726e5f0d4a4182eab74af5c71ef8b97c472211f8041dfdd381c202a9184119a9d621d570ab1d2665b1b5a7
+  metadata.gz: 40e0bdd265c1ea29797b5efdf1778535fee90867dd1b456cebc1d203e0f8c558cf5e1cecec64a06523e7aea431b48756d96fed9f75d9983483d16d319bfc5c99
+  data.tar.gz: 60fe2980de7cb7847b7f84da88a0306b6c5ba21469338da8ed1d0e2ee9048c7bd663f30104e1b6741d999c955e1b1b6f05b77beef505c66c8da5e8e8c65b1618

data/app/controllers/concerns/table_on_steroids/table_concern.rb

@@ -39,7 +39,10 @@ module TableOnSteroids
   
     def filter_and_order(objects, columns_on_steroid, global_search=nil, include_counts=false, all_pages=false )
       # execute the global search if you have one
-      objects = global_search.call(objects,params[:search]) if global_search && params[:search].present?
+      if(params[:search].present?)
+        objects = global_search.call(objects,params[:search]) if global_search
+        objects = all_column_search(objects,columns_on_steroid, params[:search]) if !global_search
+      end
 
       [:activerecord, :array].each do |t|
 
@@ -98,6 +101,23 @@ module TableOnSteroids
         end
       end
     end
+
+    def all_column_search(objects, columns_on_steroid, query)
+      matched_object_ids = []
+      [:activerecord, :array].each do |t|
+        columns_on_steroid.each do |key, value|
+          if(value[t].present? && ((value[t][:search_lambda].present? && !["date","integer"].include?(value[:datatype])) || value[t][:global_search_lambda].present?))
+            if(value[t][:global_search_lambda].present?)
+              objects_returned = value[t][:global_search_lambda].call(objects, query)
+            else
+              objects_returned = value[t][:search_lambda].call(objects, query)
+            end
+            objects_returned.each{|o| matched_object_ids << o.id } if(objects_returned)
+          end
+        end
+      end
+      objects = objects.where(id: matched_object_ids.uniq)
+    end
   
   
     def objects_where(objects, columns_on_steroid, t)
@@ -137,7 +157,7 @@ module TableOnSteroids
     end
 
     def object_where_integer(integer, operator, value)
-        case operator
+      case operator
       when "<",">=" then
         return integer.to_f < value.to_f
       when "=" then
@@ -168,7 +188,6 @@ module TableOnSteroids
 
         objects = objects.where(where_sql, *values)
       end
-
       objects
     end
   end

data/app/views/table_on_steroids/_table_on_steroids.html.erb

@@ -13,6 +13,10 @@
 <% csv_image ||= nil %>
 <% param_hash = CGI::parse(request.query_string) %>
 <% expected_column_keys = columns.map{|col,col_values| col }+columns.map{|col,col_values|("search_" + col)}+columns.map{|col,col_values|("search_operator_" + col)} %>
+<% column_search_lambdas = columns.collect{|k,v| 
+                                (!v.dig(:datatype) && v.dig(:activerecord,:search_lambda)) || v.dig(:activerecord,:global_search_lambda) ||
+                                (!v.dig(:datatype) && v.dig(:array,:search_lambda)) || v.dig(:array,:global_search_lambda) }.compact %>
+
 <div class="table-on-steroids" id="<%= table_on_steroid_id %>">
   <%= form_tag request.path, method: "get", id: ("knowledge_base_filters" + table_on_steroid_id) do %>
     <% param_hash.select{ |k,v| !expected_column_keys.include?(k) && !["utf8","columns[]"].include?(k) }.each do |k,v| %>
@@ -20,15 +24,15 @@
     <% end %>
   <%end%>
   <div class="row">
-    <div class="col-8 col-sn-12">
+    <div class="col-6 col-sn-12">
       <div class="header-text-h1">
         <% if title %>
           <%= title %>
         <% end %>
       </div>
     </div>
-    <div class="col-8 col-sn-12" style="text-align:right">
-      <% if(search_lambda) %>
+    <div class="col-6 col-sn-12" style="text-align:right;margin-bottom:10px">
+      <% if(search_lambda || !column_search_lambdas.empty?) %>
         <%= text_field_tag 'search', params[:search], placeholder: 'Search ..', onchange: "$('#knowledge_base_filters#{table_on_steroid_id}').submit();", class: 'form-control global-search', form: "knowledge_base_filters#{table_on_steroid_id}"  %>
       <% end %>
     </div>

data/lib/table_on_steroids/version.rb

@@ -1,3 +1,3 @@
 module TableOnSteroids
-  VERSION = "0.1.1.2"
+  VERSION = "0.1.1.3"
 end

data/table_on_steroids.gemspec

@@ -7,7 +7,7 @@ require "table_on_steroids/version"
 Gem::Specification.new do |spec|
   spec.name          = "table_on_steroids"
   spec.version       = TableOnSteroids::VERSION
-  spec.authors       = ["Marieke Gueye", "Matt Hyatt"]
+  spec.authors       = ["Marieke Gueye", "Matt Hiatt"]
   spec.email         = ["marieke@obvious.ly"]
 
   spec.summary       = %q{Create awesome tables for rails}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: table_on_steroids
 version: !ruby/object:Gem::Version
-  version: 0.1.1.2
+  version: 0.1.1.3
 platform: ruby
 authors:
 - Marieke Gueye
-- Matt Hyatt
+- Matt Hiatt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -125,6 +125,8 @@ files:
 - bin/setup
 - lib/table_on_steroids.rb
 - lib/table_on_steroids/version.rb
+- table_on_steroids-0.1.1.2.gem
+- table_on_steroids-0.1.2.0.gem
 - table_on_steroids.gemspec
 - vendor/assets/images/csv.png
 - vendor/assets/javascripts/table_on_steroids.js