simple_drilldown 0.13.0 → 0.14.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/simple_drilldown/controller.rb +11 -1
- data/lib/simple_drilldown/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5ca344402dbcb15946fe11948f5548b6802df4d50f97b8a6c596c10728b1f8c0
|
4
|
+
data.tar.gz: af4df3909a14d2d7dcf6ba4838d6585ca0947dce7139247316aa49b4cdc3b803
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 72502b99cd7db75b86b75d42a0b89210e0836c4357f75f56636f22a763cf5f8f2bb48ef8b23acd84ad3125e2d36a7ac5a99f3fd86379d574e0b2c19d0b957ab3
|
7
|
+
data.tar.gz: fb60b7c5f49a48bd04160e2ce4f522dea38fa8794d402ed2356631a2e17ef5dabbc95268118d288beb41f8b15119ae9dea14b58804b18b6b4ad16b6025c1079c
|
@@ -162,7 +162,10 @@ module SimpleDrilldown
|
|
162
162
|
.group(:value)
|
163
163
|
rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
|
164
164
|
rows_query = rows_query.where(filter_conditions) if filter_conditions
|
165
|
-
|
165
|
+
if (where = query[:where])
|
166
|
+
where_mapped = where.map { |e| e.respond_to?(:call) ? e.call : e }
|
167
|
+
rows_query = rows_query.where(where_mapped)
|
168
|
+
end
|
166
169
|
rows = rows_query.to_a
|
167
170
|
filter_fields = search.filter[field.to_s]
|
168
171
|
filter_fields&.each do |selected_value|
|
@@ -192,6 +195,13 @@ module SimpleDrilldown
|
|
192
195
|
dimension_def = c_dimension_defs[field]
|
193
196
|
raise "Unknown filter field: #{field.inspect}" if dimension_def.nil?
|
194
197
|
|
198
|
+
dimension_def[:queries].each do |query|
|
199
|
+
next unless (where = query[:where])
|
200
|
+
|
201
|
+
where_mapped = where.map { |e| e.respond_to?(:call) ? e.call : e }
|
202
|
+
condition_strings << where_mapped[0]
|
203
|
+
condition_values += where_mapped[1..]
|
204
|
+
end
|
195
205
|
values = Array(values)
|
196
206
|
if dimension_def[:interval]
|
197
207
|
if values[0].present? && values[1].present?
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simple_drilldown
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.14.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Uwe Kubosch
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-09-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: caxlsx_rails
|