effective_datatables 4.7.19 → 4.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618838ca90e9046e4cbd0bb0e7d7a5e73f00b07e58733a81ac07a0a7976524da
-  data.tar.gz: 8e1c0545b02af85a0c4270f4ab70c1ac1e81b1d3b7ff9438f7562a42e71e661b
+  metadata.gz: 64b15bd9c60e95f6097c087680780efc353785339a872b303214ba5bfe7f0b4d
+  data.tar.gz: c60b68831df53a2b8e4d14684313f8c62b2a7dce346209358492d0276aa39804
 SHA512:
-  metadata.gz: 9a33841f4c1923cfea7b9b28c767df80ca6454c5fe6174a7169ba902a3df3eb60c6437381a9b8b130ef6769f3276f4d35d83744eade5201ec164b819dd7f909e
-  data.tar.gz: 40f39a4bdc1f0cb9b078be9332c60ece434b85cd31932604592f811c92b12cffd0944bfc1cb397bdc80ef41f1f307de929337e61438e4fe3e6c9a6e5ead4fc5e
+  metadata.gz: b816c9a553c6c984f579728363208abbd686adc4ac649dba3c8b2315d1ae0af2a361ce272266bceed88bc732e17bc092f7f1c26359eed861fa97c4b5a806eac0
+  data.tar.gz: 402548a22f0e10a00915eedf2c6f3e2d8847d6010b9a23b1cfa3633c2f297d25f8aa7e99c2ec229c910478da10f72f1b225c8ae93113cd669962a6139dcab4ed

data/README.md

@@ -879,6 +879,10 @@ Create a [Google Chart](https://developers.google.com/chart/interactive/docs/qui
 
 No javascript required. Just use the `chart do ... end` block and return an Array of Arrays.
 
+The first collection, `collection` is the raw results as returned from the `collection do` block.
+
+The second collection, `searched_collection` is the results after the table's search columns have been applied, but irregardless of pagination.
+
 ```ruby
 charts do
   chart :breakfast, 'BarChart' do |collection|
@@ -894,6 +898,18 @@ charts do
       [date.strftime('%F'), posts.length]
     end
   end
+
+  chart :posts_per_user, 'ColumnChart' do |collection, searched_collection|
+    measured_posts = if search.present?
+      ["Posts with #{search.map { |k, v| k.to_s + ' ' + v.to_s }.join(',')}", searched_collection.length]
+    else
+      ['All Posts', collection.length]
+    end
+
+    [['Posts', 'Count'], measured_posts] +
+    searched_collection.group_by(&:user).map { |user, posts| [user.last_name, posts.length] }
+  end
+
 end
 ```
 

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -131,7 +131,7 @@ initializeDataTables = (target) ->
       if typeof(google) != 'undefined' && typeof(google.visualization) != 'undefined'
         $.each charts, (name, data) =>
           $(".effective-datatables-chart[data-name='#{name}']").each (_, obj) =>
-            chart = new google.visualization[data['type']](obj)
+            chart = new google.visualization[data['as']](obj)
             chart.draw(google.visualization.arrayToDataTable(data['data']), data['options'])
 
     # Appends the search html, stored in the column definitions, into each column header

data/app/models/effective/effective_datatable/compute.rb

@@ -36,6 +36,9 @@ module Effective
         # Apply value ordering
         col = value_tool.order(col)
 
+        # Charts too
+        @charts_data = chart(collection, col) if _charts.present?
+
         # Apply pagination
         col = col.kind_of?(Array) ? value_tool.paginate(col) : column_tool.paginate(col)
 
@@ -48,9 +51,6 @@ module Effective
         # Compute aggregate data
         @aggregates_data = aggregate(col) if _aggregates.present?
 
-        # Charts too
-        @charts_data = chart(col) if _charts.present?
-
         # Format all results
         format(col)
 
@@ -161,11 +161,11 @@ module Effective
         end || BLANK
       end
 
-      def chart(collection)
+      def chart(collection, searched_collection)
         _charts.inject({}) do |retval, (name, chart)|
           retval[name] = {
             as: chart[:as],
-            data: dsl_tool.instance_exec(collection, &chart[:compute]),
+            data: dsl_tool.instance_exec(collection, searched_collection, &chart[:compute]),
             name: chart[:name],
             options: chart[:options]
           }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.19'.freeze
+  VERSION = '4.7.20'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.19
+  version: 4.7.20
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails