simple_drilldown 0.7.2 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee0cdbb64ae05c37521d974dba3f99c1ca6e3d459ff43d898f7bf5554227124
-  data.tar.gz: 91532c9f27039c5f117a1c1a1fa43fb7bbcf3484dd4248b4207bd7d921f65d55
+  metadata.gz: 02a013f2b885c10991f53c854f8d127147b9ad141e1e80d80b2edef5ee7a2e8a
+  data.tar.gz: 949351a24e5171784d0c608126e835a19d736e8bd0248b8816728c37528632be
 SHA512:
-  metadata.gz: b04ed3837f8f104088992a942557d50ab3889f1e5264662f27705b568f4828b29e9b9fd0c485babdf66ebf774613fea3d1a4a6d0ff13b6adb73bcc1f3a7eb796
-  data.tar.gz: 2e685226b70f9472f530669f88f35517044499acce6a88b005bf2e0181a8643d8558190eeb038996c68e3e457de52573d68bc2ab59c669d8ca85a6ab572dc6db
+  metadata.gz: 3f0f84cedda3f43e60380c4ac010f7c0f5643c9e1e384efcafb86e2583d1a44e4920368c81a26542018b448960d3b3f89dcebd5f0682fd28064a00ce73f0fb4c
+  data.tar.gz: 749dab308a7a85d6cb5d8ae55f5ec4449d90e2c81b81ca1642fd6e048bf2a5730a7e6992f8eb0204762b067c1c371b6b743c38f071cb3de9bddfe16ec0f53a4a

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+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) }
+  sheet.add_row row
+end
+
+def excel_row(sheet, wrap, transaction:)
+  padding_cells = @dimensions.empty? ? 1 : @dimensions.size
+  row = (1..(padding_cells - 1)).map { |_n| nil }
+
+  @search.fields.each_with_index do |field, _i|
+    value = if field == 'time'
+              (transaction.respond_to?(:completed_at) ? transaction.completed_at : transaction.created_at)
+                .localtime.strftime('%Y-%m-%d %H:%M')
+            elsif controller.c_fields[field.to_sym][:attr_method]
+              controller.c_fields[field.to_sym][:attr_method].call(transaction)
+            else
+              transaction.send(field)
+            end
+
+    field_def = controller.c_fields[field.to_sym]
+    if @search.list_change_times && field_def[:list_change_times] && transaction.assignment.try(:order)
+      changes = transaction.assignment.order.send("#{field}_changes")
+                           .map do |al|
+        [al.created_at.localtime.strftime('%H:%M'),
+         PacMan.yaml_load(al.new_values).symbolize_keys[field.to_sym]]
+      end
+      last_change = changes.last.try(:[], 1)
+      value =
+        "#{changes.map { |al| al.join(' ') }.join("\n")}#{"\nActual: #{value}" if value != last_change}"
+    end
+
+    row << value
+  end
+  sheet.add_row row, style: wrap
+end
+
+sheet.add_row []
+excel_header_row(sheet)
+wrap = sheet.styles.add_style alignment: { wrap_text: true }
+result[:records].each { |t| excel_row(sheet, wrap, transaction: t) }
+sheet.add_row []

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+row = [
+  *(1..(dimension - headers.size - 1)).map { |_n| '' },
+  *headers.map.with_index { |h, i| value_label(@dimensions.size - headers.size + i - 1, h[:value]) },
+  *(value_label(dimension - 1, result[:value]) if dimension.positive?),
+  *((result[:count].to_f / parent_result[:count]).inspect if parent_result && @search.percent),
+  result[:count].inspect,
+  *(if parent_result && @search.percent
+      (
+        if parent_result[controller.c_summary_fields[0]].positive?
+          result[controller.c_summary_fields[0]].to_f / parent_result[controller.c_summary_fields[0]]
+        else
+          0
+        end).inspect
+    end),
+  result[controller.c_summary_fields[0]].inspect
+]
+if controller.c_summary_fields.size > 1
+  if parent_result && @search.percent
+    percent =
+      if parent_result[controller.c_summary_fields[1]].positive?
+        result[controller.c_summary_fields[1]].to_f / parent_result[controller.c_summary_fields[1]]
+      else
+        0
+      end
+    row << percent.inspect
+  end
+  row << result[controller.c_summary_fields[1]].inspect
+end
+sheet.add_row row

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+row = (1..dimension).map { |_n| nil }
+
+(@dimensions.size - dimension).times { |_i| row << nil }
+row << result[:count]
+sheet.add_row row

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

@@ -1,2 +1,3 @@
 <%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&nbsp;|
+<%= link_to 'Excel (XML)', @search.url_options.merge(action: :excel_export, format: :xml) %>&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/_record_list.html.erb

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

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

@@ -1,12 +1,14 @@
-<table class="table table-condensed table-bordered">
-<tr>
-  <% @dimensions.each do |d| %>
-    <th><%=h d[:pretty_name]%></th>
-  <% end %>
-  <th><%= t controller.c_target_class.table_name.capitalize %></th>
-  <%= controller.c_summary_fields.map{|l| "<th>#{t(l)}</th>"}.join("\n").html_safe %>
-</tr>
-
-<%=summary_row(@result) %>
-
+<table id="drilldown-summary-table" class="table table-condensed table-bordered">
+  <thead>
+    <tr>
+      <% @dimensions.each do |d| %>
+        <th><%= h d[:pretty_name] %></th>
+      <% end %>
+      <th><%= t controller.c_target_class.table_name.capitalize %></th>
+      <%= controller.c_summary_fields.map { |l| "<th>#{t(l)}</th>" }.join("\n").html_safe %>
+    </tr>
+  </thead>
+  <tbody>
+    <%= summary_row(@result) %>
+  </tbody>
 </table>

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+def excel_summary_row_xlsx(sheet, result, parent_result = nil, dimension = 0, headers = [])
+  if result[:rows]
+    significant_rows = result[:rows].reject { |r| r[:row_count].zero? }
+    significant_rows.each_with_index do |r, i|
+      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
+      excel_summary_row_xlsx(sheet, r, result, dimension + 1, sub_headers)
+    end
+  else
+    render(partial: '/drilldown/excel_summary_row_xlsx',
+           locals: { sheet: sheet, result: result, parent_result: parent_result, headers: headers.dup,
+                     dimension: dimension })
+
+    if @search.list
+      render(partial: '/drilldown/excel_record_list_xlsx',
+             locals: { sheet: sheet, result: result })
+    end
+  end
+
+  return if dimension >= @dimensions.size
+
+  render(partial: '/drilldown/excel_summary_total_row_xlsx', locals: {
+           sheet: sheet, result: result, headers: headers.dup, dimension: dimension
+         })
+end
+
+xlsx_package.use_shared_strings = true
+wb = xlsx_package.workbook
+wb.add_worksheet(name: 'Transaction Summary') do |sheet|
+  # header_colspan =
+  #   if @search.list
+  #     [@dimensions.size - 1, 0].max + @search.fields.size - 1
+  #   else
+  #     @dimensions.size - 1 + (controller.c_summary_fields.size + 1) * (@search.percent ? 2 : 1)
+  #   end
+
+  # xml.Row 'ss:Height' => '18.75' do
+  #   xml.Cell 'ss:MergeAcross' => header_colspan, 'ss:StyleID' => 'MainTitle' do
+  #     xml.Data caption, 'ss:Type' => 'String'
+  #   end
+  # end
+  sheet.add_row [caption]
+
+  # xml.Row 'ss:Height' => '15.75' do
+  #   xml.Cell 'ss:MergeAcross' => header_colspan, 'ss:StyleID' => 'SubTitle' do
+  #     xml.Data subcaption, 'ss:Type' => 'String'
+  #   end
+  # end
+  sheet.add_row [subcaption]
+
+  # xml.Row do
+  #   @dimensions.each do |d|
+  #     xml.Cell 'ss:StyleID' => 'DimensionHeading' do
+  #       xml.Data (h d[:pretty_name]).to_s, 'ss:Type' => 'String'
+  #     end
+  #   end
+  #   xml.Cell 'ss:StyleID' => 'Heading', 'ss:MergeAcross' => @search.percent ? 1 : 0 do
+  #     xml.Data t(controller.c_target_class.table_name), 'ss:Type' => 'String'
+  #   end
+  #   controller.c_summary_fields.each do |f|
+  #     xml.Cell 'ss:StyleID' => 'Heading', 'ss:MergeAcross' => @search.percent ? 1 : 0 do
+  #       xml.Data f, 'ss:Type' => 'String'
+  #     end
+  #   end
+  # end
+  sheet.add_row [
+    *@dimensions.map { |d| (h d[:pretty_name]).to_s },
+    t(controller.c_target_class.table_name),
+    *controller.c_summary_fields.map { |f| f }
+  ]
+
+  excel_summary_row_xlsx(sheet, @result)
+end

data/lib/simple_drilldown.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'caxlsx_rails'
 require 'simple_drilldown/engine'
 
 module SimpleDrilldown

data/lib/simple_drilldown/changes.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module SimpleDrilldown
+  # Allow tracking changes for a field
+  module Changes
+    def self.included(clazz)
+      clazz.extend ClassMethods
+    end
+
+    # Class methods for Changes
+    module ClassMethods
+      def changes_for(*fields)
+        fields.each do |field|
+          condition_proc = lambda do
+            in_join = is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation)
+            table_alias = in_join ? aliased_table_name : AuditLog.table_name
+            "#{table_alias}.new_values LIKE '%#{field}%'"
+          end
+          has_many :"#{field}_changes", -> { where(condition_proc.call).order(:created_at) },
+                   class_name: :AuditLog, foreign_key: :record_id
+        end
+      end
+    end
+  end
+end

data/lib/simple_drilldown/controller.rb

@@ -15,7 +15,7 @@ module SimpleDrilldown
     class_attribute :c_default_fields, default: []
     class_attribute :c_default_select_value, default: SimpleDrilldown::Search::SelectValue::COUNT
     class_attribute :c_dimension_defs
-    class_attribute :c_fields
+    class_attribute :c_fields, default: []
     class_attribute :c_list_includes, default: []
     class_attribute :c_list_order
     class_attribute :c_select, default: 'count(*) as count'
@@ -36,6 +36,9 @@ module SimpleDrilldown
             # No default target class found
           end
         end
+        return unless base.c_target_class.try :paranoid?
+
+        base.c_base_condition = "#{base.c_target_class.table_name}.deleted_at IS NULL"
       end
 
       def base_condition(base_condition)
@@ -150,14 +153,15 @@ module SimpleDrilldown
               end
               includes.uniq!
             end
-            rows = c_target_class.unscoped.where(c_base_condition)
-                                 .select("#{query[:select]} AS value")
-                                 .where(filter_conditions || '1=1')
-                                 .where(query[:where] || '1=1')
-                                 .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
-                                 .order('value')
-                                 .group(:value)
-                                 .to_a
+            rows_query = c_target_class.unscoped.where(c_base_condition)
+                                       .select("#{query[:select]} AS value")
+                                       .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
+                                       .order('value')
+                                       .group(:value)
+            # rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
+            rows_query = rows_query.where(filter_conditions) if filter_conditions
+            rows_query = rows_query.where(query[:where]) if query[:where]
+            rows = rows_query.to_a
             filter_fields = search.filter[field.to_s]
             filter_fields&.each do |selected_value|
               next if rows.find { |r| r[:value].to_s == selected_value }
@@ -271,7 +275,8 @@ module SimpleDrilldown
                 ass_order_prefixed.gsub!(/\b#{cname}\b/, "#{include_alias}.#{cname}")
               end
               paranoid_clause = 'AND t2.deleted_at IS NULL' if ass.klass.paranoid?
-              # FIXME(uwe):  Should we add "where" from the ScopeHolder here as well?  Ref: DrilldownChanges#changes_for
+              # FIXME(uwe):  Should we add "where" from the ScopeHolder here as well?
+              #              Ref: SimpleDrilldown::Changes#changes_for
               min_query = <<~SQL
                 SELECT MIN(#{ass_order}) FROM #{include_table} t2 WHERE t2.#{fk_col} = #{model_table}.id #{paranoid_clause}
               SQL
@@ -320,6 +325,7 @@ module SimpleDrilldown
 
       conditions, @filter_text, filter_includes = self.class.make_conditions(@search.filter)
       includes += filter_includes
+      includes.flatten!
       includes.keep_if(&:present?).uniq!
       if @search.order_by_value && @dimensions.size <= 1
         order = case @search.select_value
@@ -343,8 +349,8 @@ module SimpleDrilldown
       rows = c_target_class.unscoped.where(c_base_condition).select(select).where(conditions)
                            .joins(joins)
                            .group(group)
-                           .order(order).to_a
-
+                           .order(order)
+                           .to_a
       if rows.empty?
         @result = { value: 'All', count: 0, row_count: 0, nodes: 0, rows: [] }
         c_summary_fields.each { |f| @result[f] = 0 }
@@ -391,12 +397,19 @@ module SimpleDrilldown
 
     def excel_export
       index(false)
-      set_excel_headers
-      if params.dig(:search, :list) == '1'
-        @records = get_records(@result)
-        render template: '/drilldown/excel_export_records', layout: false
-      else
-        render template: '/drilldown/excel_export', layout: false
+      respond_to do |format|
+        format.xlsx do
+          render xlsx: c_target_class.table_name, template: 'drilldown/excel_export_xlsx'
+        end
+        format.xml do
+          set_excel_headers
+          if params.dig(:search, :list) == '1'
+            @records = get_records(@result)
+            render template: 'drilldown/excel_export_records', layout: false
+          else
+            render template: 'drilldown/excel_export', layout: false
+          end
+        end
       end
     end
 

data/lib/simple_drilldown/helper.rb

@@ -38,7 +38,7 @@ module SimpleDrilldown
           html << summary_row(r, result, dimension + 1, sub_headers, i.positive?)
         end
       elsif @search.list
-        html << render(partial: '/drilldown/record_list', locals: { result: result })
+        html << render(partial: '/drilldown/record_list', locals: { result: result, dimension: dimension })
       end
       if dimension < @dimensions.size
         html << render(partial: '/drilldown/summary_total_row',
@@ -89,7 +89,7 @@ module SimpleDrilldown
     private
 
     def caption_txt
-      "#{controller.c_target_class} #{t(@search.select_value.downcase)}" +
+      "#{controller.c_target_class} #{I18n.t(@search.select_value.downcase)}" +
         (@dimensions && @dimensions.any? ? " by #{@dimensions.map { |d| d[:pretty_name] }.join(' and ')}" : '')
     end
   end

data/lib/simple_drilldown/routing.rb

@@ -8,8 +8,11 @@ module SimpleDrilldown
       controller ||= path
       get "#{path}(.:format)" => "#{controller}#index", as: path
       scope path, controller: controller, as: path do
-        %i[excel_export excel_export_records html_export].each { |action| get action }
-        get "choices/:dimension_name", action: :choices, as: :choices
+        { excel_export: :xlsx, excel_export_records: :xlsx, html_export: :html }.each do |action, format|
+          get action, defaults: { format: format }
+        end
+        get 'choices/:dimension_name', action: :choices, as: :choices
+        yield if block_given?
       end
     end
   end

data/lib/simple_drilldown/search.rb

@@ -81,15 +81,15 @@ module SimpleDrilldown
 
     def url_options
       o = {
-          search: {
-              title: title,
-              list: list ? '1' : '0',
-              percent: percent ? '1' : '0',
-              list_change_times: list_change_times ? '1' : '0',
-              filter: filter,
-              dimensions: dimensions,
-              display_type: display_type,
-          },
+        search: {
+          title: title,
+          list: list ? '1' : '0',
+          percent: percent ? '1' : '0',
+          list_change_times: list_change_times ? '1' : '0',
+          filter: filter,
+          dimensions: dimensions,
+          display_type: display_type,
+        },
       }
       o[:search][:fields] = fields unless fields == @default_fields
       o

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.7.2'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: caxlsx_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -91,12 +105,13 @@ files:
 - app/mailers/simple_drilldown/application_mailer.rb
 - app/models/simple_drilldown/application_record.rb
 - app/views/drilldown/_chart.html.erb
-- app/views/drilldown/_excel_record_list.builder
-- app/views/drilldown/_excel_row.builder
+- app/views/drilldown/_excel_record_list_xlsx.xlsx.axlsx
 - app/views/drilldown/_excel_row_header.builder
 - app/views/drilldown/_excel_styles.builder
 - app/views/drilldown/_excel_summary_row.builder
+- app/views/drilldown/_excel_summary_row_xlsx.xlsx.axlsx
 - app/views/drilldown/_excel_summary_total_row.builder
+- app/views/drilldown/_excel_summary_total_row_xlsx.xlsx.axlsx
 - app/views/drilldown/_export_links.html.erb
 - app/views/drilldown/_field.html.erb
 - app/views/drilldown/_fields.html.erb
@@ -114,6 +129,7 @@ files:
 - app/views/drilldown/data_3.builder
 - app/views/drilldown/excel_export.builder
 - app/views/drilldown/excel_export_records.builder
+- app/views/drilldown/excel_export_xlsx.xlsx.axlsx
 - app/views/drilldown/html_export.html.erb
 - app/views/drilldown/index.html.erb
 - app/views/drilldown/print.html.erb
@@ -126,6 +142,7 @@ 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/changes.rb
 - lib/simple_drilldown/controller.rb
 - lib/simple_drilldown/engine.rb
 - lib/simple_drilldown/helper.rb

data/app/views/drilldown/_excel_record_list.builder

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-xml << render(partial: '/drilldown/excel_row_header')
-
-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/_excel_row.builder

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-xml.Row do
-  padding_cells = @dimensions.empty? ? 1 : @dimensions.size
-  1.upto(padding_cells - 1) { |_n| xml.Cell('ss:StyleID' => 'Outer') }
-
-  @search.fields.each_with_index do |field, i|
-    if field == 'time'
-      value = ((
-      if transaction.respond_to?(:completed_at)
-        transaction.completed_at
-      else
-        transaction.created_at
-      end)).localtime.strftime('%Y-%m-%d %H:%M')
-    else
-      value = if @transaction_fields_map[field.to_sym][:attr_method]
-                @transaction_fields_map[field.to_sym][:attr_method].call(transaction)
-              else
-                transaction.send(field)
-              end
-    end
-
-    field_def = @transaction_fields_map[field.to_sym]
-
-    xml.Cell('ss:Index' => (padding_cells + i).to_s) do
-      xml.Data value, 'ss:Type' => 'String'
-    end
-  end
-end