simple_drilldown 0.5.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9994fb706e46554bec7e26a9191cdc10e2675a19770e4414019f5b4a067e7daf
-  data.tar.gz: 874f30d58de361193d6faed89b2af82e8899b0c628861865b917af9466faa64d
+  metadata.gz: 213cbd7d6cd897ec7b381009bef56cf5fb663a8dcaeba2ef459b84635093e59b
+  data.tar.gz: ebc3d77828685b892254022b471ac76f80f840963ba7e78f9ddf4cb3161e746c
 SHA512:
-  metadata.gz: 61559d0c5e2f91474c86bbb3424c55e41d4fb355921a06cd3b4627ea1ab72a789be74989e53135b7179ea3b59feec83d140ed4e681fb85f111f0f024017a169d
-  data.tar.gz: 8bed5fd23fb6254bf5280ddce378738294af1bf5de119da11000695a3c594e48797b9f820987ef4296ed94ac6a680075f20924a6d6473702f7b05c7fe120af34
+  metadata.gz: f21841814f866ecdfe03b63d853dd79ff4b4f4fef5754a67ff78dbbeda1faab0c6ad9f1afe59b100087e4efbcf87de430c5fcf2a8cafbcf299401fef232d1d05
+  data.tar.gz: 6b227bf456e69d56902f03415c5c7cff137177f09512a8d268a97eabd2ed48d674bf5e5b25a14fed95c1c732c2b40cf178935c99c67df975e2868490373fc65f

data/app/views/drilldown/_chart.html.erb

@@ -20,7 +20,7 @@
   case @search.display_type
   when SimpleDrilldown::Search::DisplayType::PIE
 %>
-  <%= pie_chart data, height: '24rem' %>
+  <%= pie_chart data, height: '24rem', events: ['click'] %>
 <% when SimpleDrilldown::Search::DisplayType::BAR %>
   <%= column_chart data, height: '24rem' %>
 <% when SimpleDrilldown::Search::DisplayType::LINE %>
@@ -40,7 +40,7 @@
     options += @remaining_dimensions.keys.map { |name| [controller.c_dimension_defs[name][:pretty_name], name] }  %>
     <%= t(i == 0 ? :group_by : :then_by) %>:
     <%= form.select 'dimensions', options, { :selected => @search.dimensions && @search.dimensions[i] },
-        { :onChange => 'form.submit()', :name => 'search[dimensions][]', :id => "search_dimensions_#{i}" } %>
+        { onChange: 'form.submit()', name: 'search[dimensions][]', id: "search_dimensions_#{i}" } %>
   <% end %>
 
   <br/>
@@ -60,3 +60,23 @@
   <%= form.check_box :list, { :onChange => 'form.submit()' } %>
   <%= form.label :list, t(:list) %>
 </div>
+
+<% if @dimensions.size == 1 &&
+    [SimpleDrilldown::Search::DisplayType::BAR, SimpleDrilldown::Search::DisplayType::PIE].include?(@search.display_type) %>
+  <%= javascript_tag do %>
+    $('#chart-1').on('click', function(e){
+      chart = Chartkick.charts['chart-1'].getChartObject();
+      firstPoint = chart.getElementsAtEvent(e)[0]
+      if (firstPoint) {
+        label = chart.data.labels[firstPoint._index];
+        value = chart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
+        console.log("Label: " + label + ", Value: " + value);
+        new_location = window.location.toString();
+        new_location = new_location.replace("&search[dimensions][]=<%= @dimensions[0][:url_param_name] %>", '');
+        new_location = new_location + '&search[filter][<%= @dimensions[0][:url_param_name] %>][]=' + label;
+        console.log(new_location);
+        window.location = new_location;
+      }
+    });
+  <% end %>
+<% end %>

data/app/views/drilldown/_excel_record_list.builder

@@ -2,6 +2,6 @@
 
 xml << render(partial: '/drilldown/excel_row_header')
 
-result[:transactions].each do |t|
+result[:records].each do |t|
   xml << render(partial: '/drilldown/excel_row', locals: { transaction: t, previous_transaction: nil, errors: [], error_row: false, meter1_errors: false })
 end

data/app/views/drilldown/_export_links.html.erb

@@ -0,0 +1,2 @@
+<%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&nbsp;|
+<%= link_to 'HTML', @search.url_options.merge(action: :html_export), data_popup: ['Elections', 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes, width=1024px'] %>

data/app/views/drilldown/_field.html.erb

@@ -22,7 +22,7 @@
   </tr>
 <% else %>
   <div class="form-group">
-    <%= form.label "filter[#{dimension_name}]", t(dimension_name) %>
+    <%= form.label "filter[#{dimension_name}]", t(dimension_name, default: :"activerecord.models.#{dimension_name}") %>
     <%= select :search, :filter,
         choices,
         { :selected => @search.filter[dimension_name] },

data/app/views/drilldown/_fields.html.erb

@@ -6,7 +6,7 @@
           </style>
 
         <% @transaction_fields.each do | field | %>
-          <%=form.label "fields[#{field}]", t(field), :class => "field_label" %>
+          <%=form.label "fields[#{field}]", t(field, default: :"attributes.#{field}"), :class => "field_label" %>
           <%=form.check_box :fields, :id => "search_fields[#{field}]", :name => "search[fields][#{field}]", :checked => @search.fields.include?(field) %>
           <br/>
         <% end %>

data/app/views/drilldown/_filter.html.erb

@@ -3,9 +3,8 @@
   <%= form.text_field :title, class: 'form-control' %>
 </div>
 
-<% choices = Concurrent::Hash.new %>
 <% controller.c_dimension_defs.each do |dimension_name, dimension| %>
-  <% choices[dimension_name] = [[t(:all), nil]] + (dimension[:legal_values] && dimension[:legal_values].call(@search).map { |o| o.is_a?(Array) ? [o[0].to_s, o[1].to_s] : o.to_s } || []) %>
-  <%= render partial: 'drilldown/field', locals: { choices: choices[dimension_name] || [],
+  <% choices = [[t(:all), nil]] + (dimension[:legal_values] && dimension[:legal_values].call(@search).map { |o| o.is_a?(Array) ? [o[0].to_s, o[1].to_s] : o.to_s } || []) %>
+  <%= render partial: 'drilldown/field', locals: { choices: choices || [],
       form: form, dimension_name: dimension_name } %>
 <% end %>

data/app/views/drilldown/_record_list.html.erb

@@ -1,9 +1,9 @@
-<% unless result[:transactions].empty? %>
+<% unless result[:records].empty? %>
   <tr>
     <td colspan="<%= controller.c_summary_fields.size + 1 %>">
       <table class="table table-condensed table-bordered" style="padding-bottom: 10px;">
         <%= render :partial => '/drilldown/row_header' %>
-        <% result[:transactions].each do |t| %>
+        <% result[:records].each do |t| %>
           <%= render :partial => '/drilldown/row', :locals => { :transaction => t, :previous_transaction => nil, :errors => [], :error_row => false, :meter1_errors => false } %>
         <% end %>
       </table>

data/app/views/drilldown/_row_header.html.erb

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <% @search.fields.each do |field| %>
-      <th><%=t field %></th>
+      <th><%=t field, default: :"attributes.#{field}" %></th>
     <% end %>
     <th></th>
   </tr>

data/app/views/drilldown/excel_export_transactions.builder

@@ -12,7 +12,7 @@ xml.Workbook(
 ) do
   xml << render(partial: '/layouts/excel_styles')
 
-  xml.Worksheet 'ss:Name' => 'Transactions' do
+  xml.Worksheet 'ss:Name' => 'Drilldown' do
     xml.Table do
       xml.Row 'ss:Height' => '18.75' do
         xml.Cell 'ss:MergeAcross' => '35', 'ss:StyleID' => 'MainTitle' do
@@ -42,7 +42,7 @@ xml.Workbook(
         end
       end
 
-      @transactions.each do |transaction|
+      @records.each do |transaction|
         xml.Row do
           @transaction_fields.each do |field|
             field_map = controller.c_fields[field.to_sym]

data/app/views/drilldown/index.html.erb

@@ -13,25 +13,25 @@
     }
 </style>
 
-<%= form_for @search, :html => {:id => 'edit_search_SEARCH', :method => :get, :class => :search, :style => 'background: inherit', :onsubmit => 'return this.submit()'}, :url => {} do |form| %>
+<%= form_for @search, html: { id: 'edit_search_SEARCH', method: :get, class: :search, style: 'background: inherit', onsubmit: 'return this.submit()' }, url: {} do |form| %>
     <div class="row">
       <div class="col-md-3" valign="top">
         <ul class="nav nav-tabs">
-          <li class="active">
-            <a href="#filter" data-toggle="tab"><em><%= t :filter %></em></a></li>
-          <li><a href="#fields" data-toggle="tab"><em><%= t :fields %></em></a>
+          <li class="nav-item">
+            <a class="nav-link active" href="#filter" data-toggle="tab"><em><%= t :filter %></em></a></li>
+          <li><a class="nav-link" href="#fields" data-toggle="tab"><em><%= t :fields %></em></a>
           </li>
         </ul>
 
         <!-- Tab panes -->
         <div class="tab-content">
           <div class="tab-pane active" id="filter">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/filter', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/filter', form: form  %>
           </div>
           <div class="tab-pane" id="fields">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/fields', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/fields', form: form %>
           </div>
         </div>
 
@@ -39,20 +39,16 @@
       <div class="col-md-9">
         <div class="row" valign="top">
           <div class="col-md-12">
-            <%= render :partial => '/drilldown/chart', :locals => {:form => form} %>
-            <br/>
+            <%= render '/drilldown/chart', form: form %>
           </div>
         </div>
 
         <div class="row">
           <div class="col-md-12" valign="top">
             <div style="float: right; clear: both;">
-              <%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&nbsp;|
-              <%= link_to 'HTML', @search.url_options.merge(action: :html_export), :data_popup => ['Elections', 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes, width=1024px'] %>
+              <%= render '/drilldown/export_links' %>
             </div>
-            <br/>
-
-            <%= render :partial => '/drilldown/summary_table' %>
+            <%= render '/drilldown/summary_table' %>
           </div>
         </div>
       </div>

data/lib/generators/drilldown_controller/USAGE

@@ -6,3 +6,4 @@ Example:
 
     This will create:
         app/controllers/thing_drilldown_controller.rb
+        test/controllers/thing_drilldown_controller_test.rb

data/lib/generators/drilldown_controller/templates/drilldown_controller.rb.erb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'simple_drilldown/drilldown_controller'
+require 'simple_drilldown/controller'
 
-class <%= class_name %>DrilldownController < SimpleDrilldown::DrilldownController
+class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   # The main focus of the drilldown
   # target_class <%= class_name %>
 

data/lib/simple_drilldown/{drilldown_controller.rb → controller.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'simple_drilldown/drilldown_helper'
+require 'simple_drilldown/helper'
 require 'simple_drilldown/search'
 
 module SimpleDrilldown
-  class DrilldownController < ::ApplicationController
-    helper DrilldownHelper
+  class Controller < ::ApplicationController
+    helper Helper
 
     LIST_LIMIT = 10_000
 
@@ -14,8 +14,8 @@ module SimpleDrilldown
     class_attribute :c_base_includes, default: []
     class_attribute :c_default_fields, default: []
     class_attribute :c_default_select_value, default: SimpleDrilldown::Search::SelectValue::COUNT
-    class_attribute :c_dimension_defs, default: Concurrent::Hash.new
-    class_attribute :c_fields, default: {}
+    class_attribute :c_dimension_defs
+    class_attribute :c_fields
     class_attribute :c_list_includes, default: []
     class_attribute :c_list_order
     class_attribute :c_select, default: 'count(*) as count'
@@ -25,7 +25,16 @@ module SimpleDrilldown
     class << self
       def inherited(base)
         super
-        base.c_target_class = base.name.chomp('DrilldownController').constantize
+        base.c_dimension_defs = Concurrent::Hash.new
+        base.c_fields = {}
+        begin
+          base.c_target_class = base.name.chomp('DrilldownController').constantize
+        rescue NameError
+          begin
+            base.c_target_class = base.name.chomp('Controller').constantize
+          rescue NameError
+          end
+        end
       end
 
       def base_condition(base_condition)
@@ -41,7 +50,11 @@ module SimpleDrilldown
       end
 
       def default_fields(default_fields)
-        self.c_default_fields = default_fields
+        self.c_default_fields = default_fields.flatten
+      end
+
+      def default_select_value(default_select_value)
+        self.c_default_select_value = default_select_value
       end
 
       def target_class(target_class)
@@ -53,7 +66,7 @@ module SimpleDrilldown
       end
 
       def list_includes(list_includes)
-        self.c_list_includes = list_includes
+        self.c_list_includes = list_includes.flatten
       end
 
       def list_order(list_order)
@@ -65,7 +78,7 @@ module SimpleDrilldown
       end
 
       def summary_fields(*summary_fields)
-        self.c_summary_fields = summary_fields
+        self.c_summary_fields = summary_fields.flatten
       end
 
       def dimension(name, select_expression = name, options = {})
@@ -92,17 +105,24 @@ module SimpleDrilldown
         end
 
         c_dimension_defs[name.to_s] = {
-          includes: queries.inject([]) do |a, e|
+          includes: queries.inject(nil) do |a, e|
             i = e[:includes]
             next a unless i
-            next a if a.include?(i)
+            next a if a&.include?(i)
 
-            a + [i]
+            case a
+            when nil
+              i
+            when Symbol
+              [a, *i]
+            else
+              a.concat(*i)
+            end
           end,
           interval: interval,
           label_method: label_method,
           legal_values: legal_values,
-          pretty_name: I18n.t(name),
+          pretty_name: I18n.t(name, default: :"activerecord.models.#{name}"),
           queries: queries,
           reverse: reverse,
           select_expression: queries.size > 1 ? "COALESCE(#{queries.map { |q| q[:select] }.join(',')})" : queries[0][:select],
@@ -217,9 +237,9 @@ module SimpleDrilldown
         when Hash
           sql = +''
           include.each do |parent, child|
-            sql << make_join(joins, model, parent) + ' '
+            sql << ' ' + make_join(joins, model, parent)
             ass = model.to_s.camelize.constantize.reflect_on_association parent
-            sql << make_join(joins, parent, child, ass.class_name.constantize)
+            sql << ' ' + make_join(joins, parent, child, ass.class_name.constantize)
           end
           sql
         when Symbol
@@ -369,26 +389,26 @@ module SimpleDrilldown
     def excel_export
       index(false)
       headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
       headers['Cache-Control'] = ''
       render template: '/drilldown/excel_export', layout: false
     end
 
-    def excel_export_transactions
+    def excel_export_records
       params[:search][:list] = '1'
       index(false)
-      @transactions = get_transactions(@result)
+      @records = get_records(@result)
       headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
-      render template: '/drilldown/excel_export_transactions', layout: false
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
+      render template: '/drilldown/excel_export_records', layout: false
     end
 
     def xml_export
       params[:search][:list] = '1'
       index(false)
-      @transactions = get_transactions(@result)
+      @records = get_records(@result)
       headers['Content-Type'] = 'text/xml'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
       render template: '/drilldown/xml_export', layout: false
     end
 
@@ -498,31 +518,69 @@ module SimpleDrilldown
 
     def populate_list(conditions, includes, result, values)
       if result[:rows]
-        result[:rows].each do |r|
-          populate_list(conditions, includes, r, values + [r[:value]])
+        return result[:rows].each { |r| populate_list(conditions, includes, r, values + [r[:value]]) }
+      end
+      list_includes = merge_includes(includes, c_list_includes)
+      @search.fields.each do |field|
+        field_def = c_fields[field.to_sym]
+        raise "Field definition missing for: #{field.inspect}" unless field_def
+
+        field_includes = field_def[:include]
+        if field_includes
+          list_includes = merge_includes(list_includes , field_includes)
         end
-      else
-        list_includes = includes + c_list_includes
-        @search.fields.each do |field|
-          field_def = c_fields[field.to_sym]
-          raise "Field definition missing for: #{field.inspect}" unless field_def
-
-          field_includes = field_def[:include]
-          if field_includes
-            list_includes += field_includes.is_a?(Array) ? field_includes : [field_includes]
+      end
+      if @search.list_change_times
+        @history_fields.each do |f|
+          if @search.fields.include? f
+            list_includes = merge_includes(list_includes, assignment: { order: :"#{f}_changes" } )
           end
         end
-        list_includes.uniq!
-        if @search.list_change_times
-          @history_fields.each do |f|
-            list_includes << { assignment: { order: :"#{f}_changes" } } if @search.fields.include? f
-          end
+      end
+      joins = self.class.make_join([], c_target_class.name.underscore.to_sym, list_includes)
+      list_conditions = list_conditions(conditions, values)
+      base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(c_list_order)
+      base_query = base_query.where(list_conditions) if list_conditions
+      result[:records] = base_query.to_a
+    end
+
+    def merge_includes(*args)
+      hash = hash_includes(*args)
+      result = hash.dup.map { |k, v|
+        if v.blank?
+          hash.delete(k)
+          k
+        end
+      }.compact
+      result << hash unless hash.blank?
+      case result.size
+      when 0
+        nil
+      when 1
+        result[0]
+      else
+        result
+      end
+    end
+
+    def hash_includes(*args)
+      args.inject({}) do |h, inc|
+        case inc
+        when Array
+          inc.each { |v|
+            h = hash_includes(h, v)
+          }
+        when Hash
+          inc.each { |k, v|
+            h[k] = merge_includes(h[k], v)
+          }
+        when NilClass, FalseClass
+        when String, Symbol
+          h[inc] ||= []
+        else
+          raise "Unknown include type: #{inc.inspect}"
         end
-        joins = self.class.make_join([], c_target_class.name.underscore.to_sym, list_includes)
-        list_conditions = list_conditions(conditions, values)
-        base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(@list_order)
-        base_query = base_query.where(list_conditions) if list_conditions
-        result[:transactions] = base_query.to_a
+        h
       end
     end
 
@@ -536,10 +594,10 @@ module SimpleDrilldown
       [list_conditions_string, *(conditions[1..-1] + values)]
     end
 
-    def get_transactions(tree)
-      return tree[:transactions] if tree[:transactions]
+    def get_records(tree)
+      return tree[:records] if tree[:records]
 
-      tree[:rows].map { |r| get_transactions(r) }.flatten
+      tree[:rows].map { |r| get_records(r) }.flatten
     end
 
     class ScopeHolder

data/lib/simple_drilldown/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'chartkick'
+require 'simple_drilldown/routing'
 
 module SimpleDrilldown
   class Engine < ::Rails::Engine
@@ -10,5 +11,7 @@ module SimpleDrilldown
     initializer 'simple_drilldown.assets.precompile' do |app|
       app.config.assets.precompile += %w[chartkick.js]
     end
+
+    ActionDispatch::Routing::Mapper.include SimpleDrilldown::Routing
   end
 end

data/lib/simple_drilldown/{drilldown_helper.rb → helper.rb}

@@ -2,7 +2,7 @@
 
 module SimpleDrilldown
   # View helper for SimpleDrilldown
-  module DrilldownHelper
+  module Helper
     def value_label(dimension_index, value)
       dimension = @dimensions[dimension_index]
       return nil if dimension.nil?
@@ -11,7 +11,7 @@ module SimpleDrilldown
     end
 
     def caption
-      result = @search.title || "#{@target_class} #{t(@search.select_value.downcase)}" +
+      result = @search.title || "#{controller.c_target_class} #{t(@search.select_value.downcase)}" +
                                 (@dimensions && @dimensions.any? ? ' by ' + @dimensions.map { |d| d[:pretty_name] }.join(' and ') : '')
       result.gsub('$date', [*@search.filter[:calendar_date]].uniq.join(' - '))
     end

data/lib/simple_drilldown/routing.rb

@@ -6,7 +6,7 @@ module SimpleDrilldown
     def draw_drilldown(path, controller = path)
       get "#{path}(.:format)" => "#{controller}#index", as: path
       scope path do
-        %i[excel_export html_export index].each do |action|
+        %i[choices excel_export html_export index].each do |action|
           get "#{action}(/:id)(.:format)", controller: controller, action: action
         end
       end

data/lib/simple_drilldown/search.rb

@@ -108,6 +108,10 @@ module SimpleDrilldown
       'SEARCH'
     end
 
+    def list?
+      list
+    end
+
     def drill_down(dimensions, *values)
       raise 'Too many values' if values.size > self.dimensions.size
 

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.5.0'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -97,6 +97,7 @@ files:
 - app/views/drilldown/_excel_styles.builder
 - app/views/drilldown/_excel_summary_row.builder
 - app/views/drilldown/_excel_summary_total_row.builder
+- app/views/drilldown/_export_links.html.erb
 - app/views/drilldown/_field.html.erb
 - app/views/drilldown/_fields.html.erb
 - app/views/drilldown/_filter.html.erb
@@ -125,9 +126,9 @@ files:
 - lib/generators/drilldown_controller/templates/drilldown_controller.rb.erb
 - lib/generators/drilldown_controller/templates/drilldown_controller_test.rb.erb
 - lib/simple_drilldown.rb
-- lib/simple_drilldown/drilldown_controller.rb
-- lib/simple_drilldown/drilldown_helper.rb
+- lib/simple_drilldown/controller.rb
 - lib/simple_drilldown/engine.rb
+- lib/simple_drilldown/helper.rb
 - lib/simple_drilldown/routing.rb
 - lib/simple_drilldown/search.rb
 - lib/simple_drilldown/version.rb