cm-admin 1.3.5 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3ee61a20da53d4f971707c68d72d47665c39a59eebdd554d13b96254cf666c
-  data.tar.gz: 9c2e4b2fb2ca38f03a8f799c69d3f966088211b10909d1a19ca437e5437dc93c
+  metadata.gz: ac0b46b59a37aa14513ffd40ca2ba413b13887638078d237f7984e57775f44a2
+  data.tar.gz: 2447f380415e9ee56eea95c349c44ad0184afa22b346a75f9ea27b68b6057e98
 SHA512:
-  metadata.gz: 6b0b6889ee66cb8b6cc230d015356478dba9ccd348003334ddb315bdc34d2071033a91c65c196c92207fb01f8551377043effd3117dac910118bfcd71b20523b
-  data.tar.gz: 64600259cd7a8e671a5393f7a0058182303f99c8cc80c2fe0fa41441c8a1a7ce7c2124658bec77b3cf26cdfc602a9945a0f9b77279c15bfb3f28a923608c8637
+  metadata.gz: a10b1b77856006ef36af25065fdf8e192609707794ec5c4d335871608404f61a617403ae5c2bf89e8e1ae5b9267837ac134fc000282db55dce098f08b881a1a7
+  data.tar.gz: 317b10e4376033e39a3d72cf5f62c60434128996847a625d9d6aadcd77c37f3c3772fe7499e2ed1cd13dabb8a41515cac08c4c117becfd604ecc94feb2fb28be

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.3.5)
+    cm-admin (1.3.7)
       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, :filter_with
 
       VALID_FILTER_TYPES = Set[:date, :multi_select, :range, :search, :single_select].freeze
 
@@ -14,7 +14,7 @@ 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
+        @filter_with = nil
         set_default_values
         options.each do |key, value|
           send("#{key}=", value)
@@ -72,8 +72,8 @@ 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)
+            if filter.filter_with.present?
+              return records.send(filter.filter_with, scope_value)
             else
               query_variables = []
               filter.db_column_name.each do |col|
@@ -116,20 +116,34 @@ module CmAdmin
           return nil if scope_value.nil?
 
           scope_value.each do |key, value|
-            next unless value.present?
+            filters.select { |x| x if [:date, :range].include?(x.filter_type) && x.db_column_name.to_s == key.to_s }.each do |filter|
 
-            value = value.split(' to ')
-            from = value[0].presence
-            to = value[1].presence
-            records = records.where(key => from..to)
+              next unless value.present?
+
+              value = value.split(' to ')
+              from = value[0].presence
+              to = value[1].presence
+              if filter.filter_with.present?
+                records = records.send(filter.filter_with, from, to)
+              else
+                records = records.where(key => from..to)
+              end
+            end
           end
           records
         end
 
         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?
+            filters.select { |x| x if [:single_select, :multi_select].include?(x.filter_type) && x.db_column_name.to_s == key.to_s  }.each do |filter|
+              if filter.filter_with.present?
+                records = records.send(filter.filter_with, value) if value.present?
+              else
+                records = records.where(key => value) if value.present?
+              end
+            end
           end
           records
         end

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -33,7 +33,7 @@ module CmAdmin
               concat(content_tag(:div, class: 'list-area') do
                 filters.each do |filter|
                   concat(content_tag(:div, class: 'pointer list-item', data: {behaviour: 'filter-option', filter_type: "#{filter.filter_type}", db_column: "#{filter.db_column_name}"}) do
-                    tag.span filter.db_column_name.to_s.titleize
+                    tag.span filter.placeholder.to_s.titleize
                   end)
                 end
               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.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails