simple_drilldown 0.6.0 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a69810eb60aa499744a6989bad20efed263b05fc51dfcb094f151494deacbad
-  data.tar.gz: e3402d01f9a8a19683c6c4095fa47725eede9dda5434ff2dd9a43cb5d5e75643
+  metadata.gz: f7973a2345d9a18add6f71aa2e0b1d1922738b58050b93e6f3e6f325e7e6b28d
+  data.tar.gz: 56a5a4a4d5c60164234637e2642dc6272c4370bd5354934377d92cb8dadcfda6
 SHA512:
-  metadata.gz: 7701b13e4ee048dd707b9e5a787e2081932ad301cb62eb028e770033664a6d7696267fd2a409a79a540db73a06026305b2bd2eee597fdd8196c7568db161d2f6
-  data.tar.gz: 5a9a820ecee0516f76bebb0a3ce64325a80e0e3f71f4855b2529ab07b451cf87db2148544114343f40d5f35e624bf5bac8c614ca600642ca8127b62f6ffc072c
+  metadata.gz: 99604c9bb8f933bc9772a3350816de27192d830a2849e271afe805fcef4a2b08df401fe0dc9a2b6cec4002430474562f57b2b69d37d883f5b112d7460cd8e976
+  data.tar.gz: e76fbaecb66361e0793adc80c90c14b497a848078b8a6d8b1ed140cf3541917c71484a0bfb7659288da591343f0044e7e0698adc2594b9712af5bb1df6fff3fb

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/_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 id="filter-tab" class="nav-link active" data-target="#filter" data-toggle="tab"><%= t :filter %></a></li>
+          <li><a id="fields-tab" class="nav-link" data-target="#fields" data-toggle="tab"><%= t :fields %></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>
@@ -101,7 +97,7 @@ form.submit = function() {
     return false;
 };
 
-$(document).ready(function () {
-  $('[data-behaviour~=datepicker]').datepicker({format: "yyyy-mm-dd"});
-})
+// $(document).ready(function () {
+//   $('[data-behaviour~=datepicker]').datepicker({format: "yyyy-mm-dd"});
+// })
 <% end %>

data/lib/simple_drilldown/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 Controller < ::ApplicationController
-    helper DrilldownHelper
+    helper Helper
 
     LIST_LIMIT = 10_000
 
@@ -122,7 +122,7 @@ module SimpleDrilldown
           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],
@@ -389,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
 
@@ -539,9 +539,9 @@ module SimpleDrilldown
       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 = 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[:transactions] = base_query.to_a
+      result[:records] = base_query.to_a
     end
 
     def merge_includes(*args)
@@ -594,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/{drilldown_helper.rb → helper.rb}

@@ -2,8 +2,7 @@
 
 module SimpleDrilldown
   # View helper for SimpleDrilldown
-  # FIXME(uwe): Rename to Helper
-  module DrilldownHelper
+  module Helper
     def value_label(dimension_index, value)
       dimension = @dimensions[dimension_index]
       return nil if dimension.nil?

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.6.0'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.6
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-09 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
@@ -126,8 +127,8 @@ files:
 - lib/generators/drilldown_controller/templates/drilldown_controller_test.rb.erb
 - lib/simple_drilldown.rb
 - lib/simple_drilldown/controller.rb
-- lib/simple_drilldown/drilldown_helper.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