simple_drilldown 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a36aab8c580f75685e00d36a6aea2bbb1b58b43c153db650ec9298cf0b5fff6
-  data.tar.gz: 6c1a7cda78d09fdff2519c1db52dd4c5aa7f2c7c273bc7b9f6bc730cf02b6d80
+  metadata.gz: 9461d24d039b785b19ff315ed50092a75d702b8f26ad9cc17fee8f6b4d36842e
+  data.tar.gz: 946fa95bc5c68cac8b15e7c192aaa5a26691af08132ecef438c4007aadb623d4
 SHA512:
-  metadata.gz: 587b979884e3cdb8a85fee6438358bf5ba3878ff55b1355b52e987b1b896d686558fbcde181d9c1bc1a62b0ec7a6fbe591fb36c621d59d5688e0655c31170dff
-  data.tar.gz: a4e90f4858363cea570a5544efb0ed45bb4ae541a4a2238511bf726755f6ced093e5f9dde0574f21f6e1b7621b9564788c9795f2ebd1e8c721014472b2f50d44
+  metadata.gz: 7321e640c76e29963928a75b00d9f6012ca2d8841a89483eb971963f3bb10974fc694cc33f96f123fa8f910fba7de633b3a7957cf65d38640326ccee348770fa
+  data.tar.gz: 6fd3498daaac467c329beed9a93cbea3502986e499c90d85dadc125124f834030916a2b69eccca7b8b280a263f8ed846b139c9c06603aa238a90c604a645aee2

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

@@ -0,0 +1,38 @@
+# 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, 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'
+              ((
+              if transaction.respond_to?(:completed_at)
+                transaction.completed_at
+              else
+                transaction.created_at
+              end)).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]
+
+    row << value
+  end
+  sheet.add_row row
+end
+
+sheet.add_row []
+excel_header_row(sheet)
+result[:records].each { |t| excel_row(sheet, 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/excel_export_xlsx.xlsx.axlsx

@@ -0,0 +1,85 @@
+# 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
+
+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/controller.rb

@@ -395,12 +395,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/routing.rb

@@ -8,7 +8,9 @@ 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 }
+        { 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
       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.4'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-10 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

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