simple_drilldown 0.9.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ba2c9cf34da86dc647e8c951569cadedd7805b12b5e60eac2f8dc07b3a4af8c
-  data.tar.gz: f7d28279fe625f7be6d6ebcc51e1af3ca2a6a42dc19952e51c74927c5d5098c1
+  metadata.gz: 410c30764f97a9856e29d4b23a1e5ae93241ae832ff49d14e3f77bf5b3bbbf66
+  data.tar.gz: 8dcd72c45f3624ceddee62a077fe73b3f333d7576939b801e598af6dbd4e31d0
 SHA512:
-  metadata.gz: f497e109cfd0771d22ce11b3cfb2286f142316696ba4749ce152f97955d201da4693e3dac2e640e70e61eec410bf7f1aec467d8acc2bf98ba3142586ad6c76dd
-  data.tar.gz: 88b2d29433a6072b75f9a8c0c849b12e86190ab299b5029f7f92ad743786e826aac394c22775458726c6ad5187c2c3bcb96cfe7904b97322a0766206466b84b8
+  metadata.gz: fb47d841da1360b1c9d5dcaf649f03a8b3d63d9ad9fb9c9e17205d41c3c47a69a72a17567a8196c3acf2ec92536867d5117ffb42c4eca0618482c1f853d75b41
+  data.tar.gz: 6079c8de990f063f1ba3c8c147b8cbd7809c136f9b10c4f04bb9dc65cf7c279dbd6a75ab8c89def41b7c1e31f0b2a31802e4c9f2674fc487eca06e4214bf898d

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/_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/_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/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)
@@ -85,7 +85,15 @@ module SimpleDrilldown
         self.c_summary_fields = summary_fields.flatten
       end
 
-      def dimension(name, select_expression = name, options = {})
+      def dimension(name, select_expression = name.to_s, options = {})
+        if select_expression.is_a?(Hash)
+          unless options.blank?
+            raise "select_expression should be a string: #{select_expression.class}, options: #{options.inspect}"
+          end
+
+          options = select_expression
+          select_expression = name.to_s
+        end
         interval = options.delete(:interval)
         label_method = options.delete(:label_method)
         legal_values = options.delete(:legal_values) || legal_values_for(name)
@@ -327,16 +335,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.2'
+  VERSION = '0.9.7'
 end

metadata

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