cm-admin 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3ee61a20da53d4f971707c68d72d47665c39a59eebdd554d13b96254cf666c
-  data.tar.gz: 9c2e4b2fb2ca38f03a8f799c69d3f966088211b10909d1a19ca437e5437dc93c
+  metadata.gz: 6181e94f36f08555c2209adfc3e17dbf1da4d551262522a3864acf5a07404e23
+  data.tar.gz: f1a409a00b8c1b91b70c1554243fdd52ea7c085658d52abd263cbd8a72e178ff
 SHA512:
-  metadata.gz: 6b0b6889ee66cb8b6cc230d015356478dba9ccd348003334ddb315bdc34d2071033a91c65c196c92207fb01f8551377043effd3117dac910118bfcd71b20523b
-  data.tar.gz: 64600259cd7a8e671a5393f7a0058182303f99c8cc80c2fe0fa41441c8a1a7ce7c2124658bec77b3cf26cdfc602a9945a0f9b77279c15bfb3f28a923608c8637
+  metadata.gz: 6c06b41f043ac408e4c57cb71b0e939f425a39d2a1cd6e0368f2d5ed993f8c844aaa73df3d1ad67774cc4acde4956fc4f9bcee68401a6595f9f9ed00d441e40b
+  data.tar.gz: 71345aae21c3e87adb2ce4439c8526b2ac53d9227808168e530acec22b03388b79ae8b10ece5a33a1a096ce85299091acedb6b9cc2663478065611c8b47bc5cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.3.5)
+    cm-admin (1.3.6)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/lib/cm_admin/models/dsl_method.rb

@@ -142,7 +142,7 @@ module CmAdmin
         @available_actions << bulk_action
       end
 
-      def filter(db_column_name, filter_type, options = {})
+      def filter(db_column_name, filter_type, options={})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end
 

data/lib/cm_admin/models/field.rb

@@ -23,6 +23,7 @@ module CmAdmin
       end
 
       def set_default_values
+        self.precision = 2
         self.tag_class = {}
         self.col_size = nil
         self.field_type = :string

data/lib/cm_admin/models/filter.rb

@@ -5,7 +5,7 @@ module CmAdmin
     class Filter
       include Utils::Helpers
 
-      attr_accessor :db_column_name, :filter_type, :placeholder, :collection, :scope_name
+      attr_accessor :db_column_name, :filter_type, :placeholder, :collection
 
       VALID_FILTER_TYPES = Set[:date, :multi_select, :range, :search, :single_select].freeze
 
@@ -14,7 +14,6 @@ module CmAdmin
         raise ArgumentError, "Kindly select a valid filter type like #{VALID_FILTER_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{filter_type} for column #{db_column_name}" unless VALID_FILTER_TYPES.include?(filter_type.to_sym)
 
         @db_column_name, @filter_type = structure_data(db_column_name, filter_type)
-        @scope_name = nil
         set_default_values
         options.each do |key, value|
           send("#{key}=", value)
@@ -53,7 +52,7 @@ module CmAdmin
         def filtered_data(filter_params, records, filters)
           if filter_params
             filter_params.each do |scope_type, scope_value|
-              filter_method = case scope_type
+              scope_name = case scope_type
                            when 'date', 'range'
                              'date_and_range'
                            when 'single_select', 'multi_select'
@@ -61,7 +60,7 @@ module CmAdmin
                            else
                              scope_type
                            end
-              records = send("cm_#{filter_method}_filter", scope_value, records, filters) if scope_value.present?
+              records = send("cm_#{scope_name}_filter", scope_value, records, filters) if scope_value.present?
             end
           end
           records
@@ -72,44 +71,40 @@ module CmAdmin
 
           table_name = records.table_name
           filters.select { |x| x if x.filter_type.eql?(:search) }.each do |filter|
-            if filter.scope_name.present?
-              return records.send(filter.scope_name, scope_value)
-            else
-              query_variables = []
-              filter.db_column_name.each do |col|
-                case col
-                when Symbol
-                  query_variables << "#{table_name.pluralize}.#{col}"
-                when Hash
-                  col.map do |key, value|
-                    value.map { |val| query_variables << "#{key.to_s.pluralize}.#{val}" }
-                  end
+            query_variables = []
+            filter.db_column_name.each do |col|
+              case col
+              when Symbol
+                query_variables << "#{table_name.pluralize}.#{col}"
+              when Hash
+                col.map do |key, value|
+                  value.map { |val| query_variables << "#{key.to_s.pluralize}.#{val}" }
                 end
               end
-              terms = scope_value.downcase.split(/\s+/)
-              terms = terms.map { |e|
-                (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
-              }
-              sql = ''
-              query_variables.each.with_index do |column, i|
-                sql.concat("#{column} ILIKE ?")
-                sql.concat(' OR ') unless query_variables.size.eql?(i + 1)
-              end
-
-              if filter.db_column_name.map { |x| x.is_a?(Hash) }.include?(true)
-                associations_hash = filter.db_column_name.select { |x| x if x.is_a?(Hash) }.last
-                records = records.left_joins(associations_hash.keys).distinct
-              end
+            end
+            terms = scope_value.downcase.split(/\s+/)
+            terms = terms.map { |e|
+              (e.gsub('*', '%').prepend('%') + '%').gsub(/%+/, '%')
+            }
+            sql = ''
+            query_variables.each.with_index do |column, i|
+              sql.concat("#{column} ILIKE ?")
+              sql.concat(' OR ') unless query_variables.size.eql?(i + 1)
+            end
 
-              records = records.where(
-                terms.map { |term|
-                  sql
-                }.join(' AND '),
-                *terms.map { |e| [e] * query_variables.size }.flatten
-              )
-              return records
+            if filter.db_column_name.map { |x| x.is_a?(Hash) }.include?(true)
+              associations_hash = filter.db_column_name.select { |x| x if x.is_a?(Hash) }.last
+              records = records.left_joins(associations_hash.keys).distinct
             end
+
+            records = records.where(
+              terms.map { |term|
+                sql
+              }.join(' AND '),
+              *terms.map { |e| [e] * query_variables.size }.flatten
+            )
           end
+          records
         end
 
         def cm_date_and_range_filter(scope_value, records, filters)
@@ -128,6 +123,7 @@ module CmAdmin
 
         def cm_dropdown_filter(scope_value, records, filters)
           return nil if scope_value.nil?
+
           scope_value.each do |key, value|
             records = records.where(key => value) if value.present?
           end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - sajinmp