simple_drilldown 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38f18e3e6bd96a64ec6dfee0ad36d067d76a2a2069d468efc29f9a8d222e9d5
-  data.tar.gz: f17ea328823a47247fa81317541ce6712fb6e97695292d09723670e13267cd69
+  metadata.gz: 3144b3e6cb99f07f654f2045836172d74c29bca1016787fcc9de9dd4bbdff211
+  data.tar.gz: d18da3c55b9ee565dadd892f14d4feae817094c7f100ada2d4aaebd975e80a1a
 SHA512:
-  metadata.gz: ea2e3464984b2e37263c525313230e0dfdcfb2b068ae16af9c5ab59102a82f119ddd00509f9e05be5ac99ebccfb89796fb71d662448be7ddd2c1ccbe8d514a56
-  data.tar.gz: 7897b10ac69bb8e5b85c094650b81e3467be21ef18e74866d897d52d7992af751b7436526a1dd7e705fd3895f67797e1afa330ed165d1154b22232ceb95b144c
+  metadata.gz: af25dfcb777c5d1f01d854a456a3b7ce954e9715244d71bb6dd69681df9a15f81e1b73853e59c3bb4abe1eee6bdd33a09be9393bfd35e8eb8d2227a1b3d4788a
+  data.tar.gz: b3f6706f4024d14b5d248083ca922374b2710ec012bed7f7af4cb65a8e854a735473793097210391ac0c52ecdb02a78898211e29b1e0ac106036b53c98378723

data/app/assets/stylesheets/simple_drilldown/application.css

@@ -19,7 +19,6 @@ th.header {
 td {
   border: 1px solid #dfded2;
   padding: 2px;
-  font-size: 10px;
 }
 
 td.numeric {

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

@@ -2,14 +2,14 @@
   data =
     case @dimensions.size
     when 0
-      { @result[:value] => @result[:count] }
+      { @result[:value] => @result[@search.select_value] }
     when 1
-      @result[:rows].map { |r| [@dimensions[0][:label_method] ? @dimensions[0][:label_method].call(r[:value]) : r[:value], r[:count]] }
+      @result[:rows].map { |r| [@dimensions[0][:label_method] ? @dimensions[0][:label_method].call(r[:value]) : r[:value], r[@search.select_value]] }
     when 2
       @result[:rows].map do |r|
         {
           name: r[:value],
-          data: r[:rows].map { |r2| [r2[:value], r2[:count]] }
+          data: r[:rows].map { |r2| [r2[:value], r2[@search.select_value]] }
         }
       end
     when 3
@@ -56,6 +56,22 @@
   <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::NONE, { :onChange => 'form.submit()' } %>
   <%= form.label :display_type_none, t(:none) %>
 
+  <% if controller.c_summary_fields.present? && @search.display_type != SimpleDrilldown::Search::DisplayType::NONE %>
+    <div class="text-center">
+      <label style="margin-bottom:0;margin-right:1em" for="search_select_value">Value: </label>
+      <div class="form-check form-check-inline">
+        <%= form.radio_button :select_value, SimpleDrilldown::Search::SelectValue::COUNT, class: "form-check-input", onChange: 'form.submit()' %>
+        <label class="form-check-label mr-3" for="search_select_value_count"><%= t(:count) %></label>
+      </div>
+      <% controller.c_summary_fields.each do |field| %>
+        <div class="form-check form-check-inline">
+          <%= form.radio_button :select_value, field, class: "form-check-input", onChange: 'form.submit()' %>
+          <label class="form-check-label mr-3" for="search_select_value_<%= field %>"><%= t(:field, default: field.to_s.titleize) %></label>
+        </div>
+      <% end %>
+    </div>
+<% end %>
+
   <%= form.check_box :order_by_value, { :onChange => 'form.submit()' } %>
   <%= form.label :order_by_value, t(:order_by_value) %>
 
@@ -68,10 +84,10 @@
   <%= javascript_tag do %>
     $('#chart-1').on('click', function(e){
     chart = Chartkick.charts['chart-1'].getChartObject();
-    firstPoint = chart.getElementsAtEvent(e)[0]
+    firstPoint = chart.getElementsAtEventForMode(e, 'nearest', { intersect: true }, false)[0]
     if (firstPoint) {
-    label = chart.data.labels[firstPoint._index];
-    value = chart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
+    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(/#.*$/, '');

data/app/views/drilldown/_excel_record_list_xlsx.xlsx.axlsx

@@ -3,7 +3,7 @@
 def excel_header_row(sheet)
   padding_cells = @dimensions.empty? ? 1 : @dimensions.size
   row = (1...(padding_cells - 1)).map { |_n| nil }
-  @search.fields.each_with_index { |field, _i| row << t(field) }
+  @search.fields.each_with_index { |field, _i| row << t(field, default: field.titleize) }
   sheet.add_row row
 end
 

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

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

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

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

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

@@ -1,8 +1,10 @@
 <thead>
   <tr>
     <% @search.fields.each do |field| %>
-      <th><%=t field, default: :"attributes.#{field}" %></th>
+      <th><%= t field, default: :"attributes.#{field}" %></th>
     <% end %>
-    <th></th>
+    <th>
+      <%= render 'drilldown/export_links', records: records %>
+    </th>
   </tr>
 </thead>

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

@@ -1,3 +1,4 @@
+<% row_class = dimension > 0 && @dimensions[dimension - 1]&.[](:row_class)&.call(result[:value]) %>
 <% if new_row -%>
   <tr class="<%= cycle("odd", "even", :name => "dim#{dimension}") %>">
     <% ((dimension + 1)..(@dimensions.size)).each { |i| cycle("odd", "even", :name => "dim#{i}") if current_cycle("dim#{i}") != current_cycle("dim#{dimension}") } -%>
@@ -14,5 +15,13 @@
       (<%= 100 * result[:count] / parent_result[:count] %>%)
     <% end %>
   </td>
+  <% controller.c_summary_fields.each do |summary_field| %>
+    <td class="<%=row_class%>" align="right">
+      <%= result[summary_field] %>
+      <% if @search.percent && parent_result && parent_result[summary_field] > 0 %>
+        (<%= 100 * result[summary_field] / parent_result[summary_field] %>%)
+      <% end %>
+    </td>
+  <% end %>
   </tr>
 <% end %>

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

@@ -1,4 +1,4 @@
-<table id="drilldown-summary-table" class="table table-condensed table-bordered">
+<table id="drilldown-summary-table" class="table table-sm table-bordered">
   <thead>
     <tr>
       <% @dimensions.each do |d| %>

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

@@ -43,7 +43,7 @@
         <div class="row">
           <div class="col-md-12" valign="top">
             <div style="float: right; clear: both;">
-              <%= render '/drilldown/export_links' %>
+              <%= render '/drilldown/export_links', records: @result[:records] %>
             </div>
             <%= render '/drilldown/summary_table' %>
           </div>

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

@@ -12,6 +12,15 @@ class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   # How should we count the reords?
   # select 'count(*) as count'
 
+  # Multiple select values:
+  # select <<~SQL
+  #   COUNT(*) as count,
+  #   sum(hours) as hours,
+  #   sum(billable_hours) as billable_hours
+  # SQL
+  # summary_fields :hours, :billable_hours
+  # default_select_value :billable_hours
+
   # When selecting records, what relations should be included for optimization?
   # Other relations can be included for specific dimensions and fields.
   # base_includes :user, :comments # TODO(uwe): Read relations from schema?

data/lib/simple_drilldown/controller.rb

@@ -58,7 +58,7 @@ module SimpleDrilldown
       end
 
       def default_select_value(default_select_value)
-        self.c_default_select_value = default_select_value
+        self.c_default_select_value = default_select_value.to_sym
       end
 
       def target_class(target_class)
@@ -327,16 +327,7 @@ module SimpleDrilldown
       includes.flatten!
       includes.keep_if(&:present?).uniq!
       if @search.order_by_value && @dimensions.size <= 1
-        order = case @search.select_value
-                when Search::SelectValue::VOLUME
-                  'volume DESC'
-                when Search::SelectValue::VOLUME_COMPENSATED
-                  'volume_compensated DESC'
-                when Search::SelectValue::COUNT
-                  'count DESC'
-                else
-                  'count DESC'
-                end
+        order = "#{c_summary_fields.find { |f| f == @search.select_value } || 'count'} DESC"
       else
         order = (1..@dimensions.size).map { |i| "value#{i}" }.join(',')
         order = nil if order.empty?

data/lib/simple_drilldown/helper.rb

@@ -89,7 +89,8 @@ module SimpleDrilldown
     private
 
     def caption_txt
-      "#{controller.c_target_class} #{I18n.t(@search.select_value.downcase)}" +
+      "#{controller.c_target_class} #{I18n.t(@search.select_value.downcase,
+                                             default: @search.select_value.to_s.titleize)}" +
         (@dimensions && @dimensions.any? ? " by #{@dimensions.map { |d| d[:pretty_name] }.join(' and ')}" : '')
     end
   end

data/lib/simple_drilldown/search.rb

@@ -14,9 +14,7 @@ module SimpleDrilldown
     end
 
     module SelectValue
-      COUNT = 'COUNT'
-      VOLUME = 'VOLUME'
-      VOLUME_COMPENSATED = 'VOLUME_COMPENSATED'
+      COUNT = :count
     end
 
     attr_reader :dimensions, :display_type, :fields, :filter, :list_change_times, :order_by_value,
@@ -62,7 +60,7 @@ module SimpleDrilldown
         @display_type = DisplayType::BAR if @dimensions.size >= 2 && @display_type == DisplayType::PIE
 
         @order_by_value = attributes && (attributes[:order_by_value] == '1')
-        @select_value = attributes&.dig(:select_value).present? ? attributes[:select_value] : @default_select_value
+        @select_value = attributes&.dig(:select_value).presence&.to_sym || @default_select_value
         @list = attributes&.[](:list) == '1'
         @percent = attributes&.[](:percent) == '1'
         @list_change_times = attributes&.[](:list_change_times) == '1'

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.9.1'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.6
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails