simple_drilldown 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb4a7a11169686c1934a597adf694bcf0698324f51e1b0f3f1d50fd1c22eb5f
-  data.tar.gz: 39555fb5382aad0a9d4e0a5542c697a90115baf295b5b4ba618662b0dda7ef38
+  metadata.gz: 388fda7e00b8742770fafabfe6742b0fa910bd6055ba7dc8dfe323c46a2bca74
+  data.tar.gz: a765fbd6f39829ecf2ac58c40b44e48095f502530f30a26b75e3d6fed0513538
 SHA512:
-  metadata.gz: ca37f8f77a901ba524e062066a91daad4df326870656387d847acd79f3f06494208a5d6923a9aea96d1c66a171b35453a38788e0df7604aa2f6b6eb9b87ca8bd
-  data.tar.gz: e7d83e533b1b4862cc37d7adcf7c0491e9a8f250cbf2d5695a6cc8a8be48043917e02c5a4976f550ef0a90a000d959cb729f703cf95d307633b4ee7c18bbe591
+  metadata.gz: 49e848195ec11d171b4968f5645d15805241acb3dfed17a9df221204324d320e238dd70c23234c506282f279afeabcd01277340417a35d5dc3495c1ecbf59305
+  data.tar.gz: dfa6461733db75343fb7c8b4199c08b83bfa49fb22e9a8babadba6ec30a5aa8b9317c91701e817b6635736438aff4e83923d50bfc22a6f61f733a0bd4cb38b46

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

@@ -0,0 +1,62 @@
+<%
+  data =
+      case @dimensions.size
+      when 0
+        { @result[:value] => @result[:count] }
+      when 1
+        @result[:rows].map { |r| [@dimensions[0][:label_method] ? @dimensions[0][:label_method].call(r[:value]) : r[:value], r[:count]] }
+      when 2
+        @result[:rows].map do |r|
+          {
+                  name: r[:value],
+                  data: r[:rows].map { |r2| [r2[:value], r2[:count]] }
+          }
+        end
+      when 3
+      end
+%>
+
+<%
+  case @search.display_type
+  when SimpleDrilldown::Search::DisplayType::PIE
+%>
+  <%= pie_chart data, height: '24rem' %>
+<% when SimpleDrilldown::Search::DisplayType::BAR %>
+  <%= column_chart data, height: '24rem' %>
+<% when SimpleDrilldown::Search::DisplayType::LINE %>
+  <%= line_chart data, height: '24rem' %>
+<% else %>
+  <div id="drilldown_area">
+    <h2><%= caption %></h2>
+    <h3><%= subcaption %></h3>
+    <br/>
+  </div>
+<% end %>
+
+<div id="drilldown_search_area" style="margin-left: auto; margin-right: auto; text-align: center">
+  <% (0..2).each do |i|
+    options = [['', '']]
+    options << [@dimensions[i][:pretty_name], @dimensions[i][:url_param_name]] if @dimensions[i]
+    options += @remaining_dimensions.keys.map { |name| [@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}" } %>
+  <% end %>
+
+  <br/>
+  <%= t :chart_type %>
+  <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::BAR, { :onChange => 'form.submit()' } %>
+  <%= form.label :display_type_bar, t(:bar) %>
+  <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::PIE, { :disabled => @search.dimensions.size >= 2, :onChange => 'form.submit()' } %>
+  <%= form.label :display_type_pie, t(:pie) %>
+  <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::LINE, { :onChange => 'form.submit()' } %>
+  <%= form.label :display_type_line, t(:line) %>
+  <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::NONE, { :onChange => 'form.submit()' } %>
+  <%= form.label :display_type_none, t(:none) %>
+
+  <%= form.check_box :order_by_value, { :onChange => 'form.submit()' } %>
+  <%= form.label :order_by_value, t(:order_by_value) %>
+
+  <%= form.check_box :list, { :onChange => 'form.submit()' } %>
+  <%= form.label :list, t(:list) %>
+</div>

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

@@ -1,18 +1,18 @@
 <% 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}") } -%>
+  <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}") } -%>
 <% end -%>
 <% if dimension > 0 %>
-    <td valign="top" rowspan="<%= result[:nodes] %>">
-      <%= link_to value_label(dimension - 1, result[:value]), @search.drill_down(@dimensions, *[headers[1..-1], result].flatten.map { |h| h[:value] }).url_options %>
-    </td>
+  <td valign="top" rowspan="<%= result[:nodes] %>">
+    <%= link_to value_label(dimension - 1, result[:value]), @search.drill_down(@dimensions, *[headers[1..-1], result].flatten.map { |h| h[:value] }).url_options %>
+  </td>
 <% end %>
 <% if with_results %>
-    <td align="right">
-      <%= result[:count] %>
-      <% if parent_result && @search.percent %>
-          (<%= 100 * result[:count] / parent_result[:count] %>%)
-      <% end %>
-    </td>
-    </tr>
+  <td align="right">
+    <%= result[:count] %>
+    <% if parent_result && @search.percent %>
+      (<%= 100 * result[:count] / parent_result[:count] %>%)
+    <% end %>
+  </td>
+  </tr>
 <% end %>

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

@@ -27,14 +27,15 @@ class <%= class_name %>DrilldownController < DrilldownController
   # field :comments, attr_method: ->(post) { post.comments.count }
 
   dimension :calendar_date, 'DATE(<%= plural_name %>.created_at)', interval: true
-  dimension :day_of_month, "date_part('day', <%= plural_name %>.created_at)"
-  dimension :day_of_week, "CASE WHEN date_part('dow', <%= plural_name %>.created_at) = 0 THEN 7 ELSE date_part('dow', <%= plural_name %>.created_at) END",
-            label_method: ->(day_no) { Date::DAYNAMES[day_no.to_i % 7] }
-  dimension :hour_of_day, "date_part('hour', <%= plural_name %>.created_at)"
-  dimension :month, "date_part('month', <%= plural_name %>.created_at)",
+  dimension :day_of_month, "date_part('day', <%= plural_name %>.created_at)::int"
+  dimension :day_of_week, <<~SQL, label_method: ->(day_no) { Date::DAYNAMES[day_no.to_i % 7] }
+    CASE WHEN date_part('dow', <%= plural_name %>.created_at) = 0 THEN 7 ELSE date_part('dow', <%= plural_name %>.created_at)::int END
+  SQL
+  dimension :hour_of_day, "date_part('hour', <%= plural_name %>.created_at)::int"
+  dimension :month, "date_part('month', <%= plural_name %>.created_at)::int",
             label_method: ->(month_no) { Date::MONTHNAMES[month_no.to_i] }
-  dimension :week, "date_part('week', <%= plural_name %>.created_at)"
-  dimension :year, "date_part('year', <%= plural_name %>.created_at)"
+  dimension :week, "date_part('week', <%= plural_name %>.created_at)::int"
+  dimension :year, "date_part('year', <%= plural_name %>.created_at)::varchar"
 
   # dimension :comments, 'SELECT count(*) FROM comments c WHERE c.<%= singular_name %>_id = <%= plural_name %>.id'
   # dimension :user, 'users.name', includes: :user

data/lib/simple_drilldown/drilldown_helper.rb

@@ -1,67 +1,64 @@
+# frozen_string_literal: true
+
 module SimpleDrilldown
+  # View helper for SimpleDrilldown
   module DrilldownHelper
     def value_label(dimension_index, value)
-      return nil if @dimensions[dimension_index].nil?
-      h(@dimensions[dimension_index][:label_method] ?
-          @dimensions[dimension_index][:label_method].call(value) :
-          value)
+      dimension = @dimensions[dimension_index]
+      return nil if dimension.nil?
+
+      h(dimension[:label_method] ? dimension[:label_method].call(value) : value)
     end
 
     def caption
-      result = @search.title ? @search.title : "#{@target_class} #{t(@search.select_value.downcase)}" +
-        ((@dimensions && @dimensions.any?) ? ' by ' + @dimensions.map { |d| d[:pretty_name] }.join(' and ') : '')
+      result = @search.title || "#{@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
 
     def subcaption
-      @search.title ? '' : @filter_text && @filter_text.size > 0 ? "for #{@filter_text}" : ''
+      @search.title || @filter_text.blank? ? '' : "for #{@filter_text}"
     end
 
     def summary_row(result, parent_result = nil, dimension = 0, headers = [], new_row = true)
-      html = render(:partial => '/drilldown/summary_row', :locals => { :result => result, :parent_result => parent_result, :new_row => new_row, :dimension => dimension, :headers => headers, :with_results => !result[:rows] })
+      html = render(partial: '/drilldown/summary_row', locals: { result: result, parent_result: parent_result, new_row: new_row, dimension: dimension, headers: headers, with_results: !result[:rows] })
       if result[:rows]
-        sub_headers = headers + [{ :value => result[:value], :display_row_count => result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
-        significant_rows = result[:rows].select { |r| r[:row_count] != 0 }
+        sub_headers = headers + [{ value: result[:value], display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
+        significant_rows = result[:rows].reject { |r| r[:row_count].zero? }
         significant_rows.each_with_index do |r, i|
-          html << summary_row(r, result, dimension + 1, sub_headers, i > 0)
+          html << summary_row(r, result, dimension + 1, sub_headers, i.positive?)
         end
       elsif @search.list
-        html << render(:partial => '/drilldown/record_list', :locals => { :result => result })
-      end
-      if dimension < @dimensions.size
-        html << render(:partial => '/drilldown/summary_total_row', :locals => { :result => result, :parent_result => parent_result, :headers => headers.dup, :dimension => dimension })
+        html << render(partial: '/drilldown/record_list', locals: { result: result })
       end
+      html << render(partial: '/drilldown/summary_total_row', locals: { result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension }) if dimension < @dimensions.size
 
       html
     end
 
     def excel_summary_row(result, parent_result = nil, dimension = 0, headers = [])
-      xml = ''
+      xml = +''
       if result[:rows]
-        significant_rows = result[:rows].select { |r| r[:row_count] != 0 }
+        significant_rows = result[:rows].reject { |r| r[:row_count].zero? }
         significant_rows.each_with_index do |r, i|
-          if i == 0
-            if dimension == 0
-              sub_headers = headers
-            else
-              sub_headers = headers + [{ :value => result[:value], :display_row_count => result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
-            end
-          else
-            sub_headers = [] # [{:value => result[:value], :row_count => result[:row_count]}]
-          end
+          sub_headers = if i.zero?
+                          if dimension.zero?
+                            headers
+                          else
+                            headers + [{ value: result[:value], display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
+                          end
+                        else
+                          [] # [{:value => result[:value], :row_count => result[:row_count]}]
+                        end
           xml << excel_summary_row(r, result, dimension + 1, sub_headers)
         end
       else
-        xml << render(:partial => '/drilldown/excel_summary_row', :locals => { :result => result, :parent_result => parent_result, :headers => headers.dup, :dimension => dimension })
+        xml << render(partial: '/drilldown/excel_summary_row', locals: { result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension })
 
-        if @search.list
-          xml << render(:partial => '/drilldown/excel_record_list', :locals => { :result => result })
-        end
+        xml << render(partial: '/drilldown/excel_record_list', locals: { result: result }) if @search.list
       end
 
-      if dimension < @dimensions.size
-        xml << render(:partial => '/drilldown/excel_summary_total_row', :locals => { :result => result, :headers => headers.dup, :dimension => dimension })
-      end
+      xml << render(partial: '/drilldown/excel_summary_total_row', locals: { result: result, headers: headers.dup, dimension: dimension }) if dimension < @dimensions.size
       xml
     end
   end

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Uwe Kubosch
@@ -90,7 +90,7 @@ files:
 - app/jobs/simple_drilldown/application_job.rb
 - app/mailers/simple_drilldown/application_mailer.rb
 - app/models/simple_drilldown/application_record.rb
-- app/views/drilldown/_chart.html.slim
+- app/views/drilldown/_chart.html.erb
 - app/views/drilldown/_excel_record_list.builder
 - app/views/drilldown/_excel_row.builder
 - app/views/drilldown/_excel_row_header.builder

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

@@ -1,52 +0,0 @@
-ruby:
-  data =
-          case @dimensions.size
-          when 0
-            { @result[:value] => @result[:count] }
-          when 1
-            @result[:rows].map { |r| [ @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(r[:value]) : r[:value], r[:count] ] }
-          when 2
-            @result[:rows].map do |r|
-              {
-                      name: r[:value],
-                      data: r[:rows].map { |r2| [r2[:value], r2[:count]] }
-              }
-            end
-          when 3
-          end
-- case @search.display_type
-- when SimpleDrilldown::Search::DisplayType::PIE
-  = pie_chart data, height: '24rem'
-- when SimpleDrilldown::Search::DisplayType::BAR
-  = column_chart data, height: '24rem'
-- when SimpleDrilldown::Search::DisplayType::LINE
-  = line_chart data, height: '24rem'
-- else
-  #drilldown_area
-    h2 = caption
-    h3 = subcaption
-    br
-#drilldown_search_area style="margin-left: auto; margin-right: auto; text-align: center"
-  - (0..2).each do |i|
-    - options = [['', '']]
-    - options << [@dimensions[i][:pretty_name], @dimensions[i][:url_param_name]] if @dimensions[i]
-    - options += @remaining_dimensions.keys.map { |name| [@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}" }
-  br
-  = t :chart_type
-  = form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::BAR, { :onChange => 'form.submit()' }
-  = form.label :display_type_bar, t(:bar)
-  = form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::PIE, { :disabled => @search.dimensions.size >= 2, :onChange => 'form.submit()' }
-  = form.label :display_type_pie, t(:pie)
-  = form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::LINE, { :onChange => 'form.submit()' }
-  = form.label :display_type_line, t(:line)
-  = form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::NONE, { :onChange => 'form.submit()' }
-  = form.label :display_type_none, t(:none)
-
-  = form.check_box :order_by_value, { :onChange => 'form.submit()' }
-  = form.label :order_by_value, t(:order_by_value)
-
-  = form.check_box :list, { :onChange => 'form.submit()' }
-  = form.label :list, t(:list)