simple_drilldown 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c25058c9633cfe67926c2cbf3dca1105481fde8297077ba68414063ab239e05e
-  data.tar.gz: 5ff52f26970deef096886d62451ca80f545d3fbf88601ed20cc2ed3334c01397
+  metadata.gz: 213cbd7d6cd897ec7b381009bef56cf5fb663a8dcaeba2ef459b84635093e59b
+  data.tar.gz: ebc3d77828685b892254022b471ac76f80f840963ba7e78f9ddf4cb3161e746c
 SHA512:
-  metadata.gz: 478e1fa749626a6599055b82022553c5778f8ef4085fa513f28261c9340cb3a112235ff6968115f95de00d4c4af4ec6d9e9b721596edd03693249c5e299e0938
-  data.tar.gz: 2c4b94ae99c33ced23f149fbb0d0f5356867773a13e979619fe0c030ae83fbfac18444579b2b6b78427c48bca1e66a650455640a9d1fe9d95eb2c9629116a2ad
+  metadata.gz: f21841814f866ecdfe03b63d853dd79ff4b4f4fef5754a67ff78dbbeda1faab0c6ad9f1afe59b100087e4efbcf87de430c5fcf2a8cafbcf299401fef232d1d05
+  data.tar.gz: 6b227bf456e69d56902f03415c5c7cff137177f09512a8d268a97eabd2ed48d674bf5e5b25a14fed95c1c732c2b40cf178935c99c67df975e2868490373fc65f

data/app/views/drilldown/_excel_record_list.builder

@@ -2,6 +2,6 @@
 
 xml << render(partial: '/drilldown/excel_row_header')
 
-result[:transactions].each do |t|
+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/_export_links.html.erb

@@ -0,0 +1,2 @@
+<%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&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,9 +1,9 @@
-<% unless result[:transactions].empty? %>
+<% unless result[:records].empty? %>
   <tr>
     <td colspan="<%= controller.c_summary_fields.size + 1 %>">
       <table class="table table-condensed table-bordered" style="padding-bottom: 10px;">
         <%= render :partial => '/drilldown/row_header' %>
-        <% result[:transactions].each do |t| %>
+        <% result[:records].each do |t| %>
           <%= render :partial => '/drilldown/row', :locals => { :transaction => t, :previous_transaction => nil, :errors => [], :error_row => false, :meter1_errors => false } %>
         <% end %>
       </table>

data/app/views/drilldown/excel_export_transactions.builder

@@ -12,7 +12,7 @@ xml.Workbook(
 ) do
   xml << render(partial: '/layouts/excel_styles')
 
-  xml.Worksheet 'ss:Name' => 'Transactions' do
+  xml.Worksheet 'ss:Name' => 'Drilldown' do
     xml.Table do
       xml.Row 'ss:Height' => '18.75' do
         xml.Cell 'ss:MergeAcross' => '35', 'ss:StyleID' => 'MainTitle' do
@@ -42,7 +42,7 @@ xml.Workbook(
         end
       end
 
-      @transactions.each do |transaction|
+      @records.each do |transaction|
         xml.Row do
           @transaction_fields.each do |field|
             field_map = controller.c_fields[field.to_sym]

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

@@ -13,25 +13,25 @@
     }
 </style>
 
-<%= form_for @search, :html => {:id => 'edit_search_SEARCH', :method => :get, :class => :search, :style => 'background: inherit', :onsubmit => 'return this.submit()'}, :url => {} do |form| %>
+<%= form_for @search, html: { id: 'edit_search_SEARCH', method: :get, class: :search, style: 'background: inherit', onsubmit: 'return this.submit()' }, url: {} do |form| %>
     <div class="row">
       <div class="col-md-3" valign="top">
         <ul class="nav nav-tabs">
-          <li class="active">
-            <a href="#filter" data-toggle="tab"><em><%= t :filter %></em></a></li>
-          <li><a href="#fields" data-toggle="tab"><em><%= t :fields %></em></a>
+          <li class="nav-item">
+            <a class="nav-link active" href="#filter" data-toggle="tab"><em><%= t :filter %></em></a></li>
+          <li><a class="nav-link" href="#fields" data-toggle="tab"><em><%= t :fields %></em></a>
           </li>
         </ul>
 
         <!-- Tab panes -->
         <div class="tab-content">
           <div class="tab-pane active" id="filter">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/filter', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/filter', form: form  %>
           </div>
           <div class="tab-pane" id="fields">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/fields', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/fields', form: form %>
           </div>
         </div>
 
@@ -39,20 +39,16 @@
       <div class="col-md-9">
         <div class="row" valign="top">
           <div class="col-md-12">
-            <%= render :partial => '/drilldown/chart', :locals => {:form => form} %>
-            <br/>
+            <%= render '/drilldown/chart', form: form %>
           </div>
         </div>
 
         <div class="row">
           <div class="col-md-12" valign="top">
             <div style="float: right; clear: both;">
-              <%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&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'] %>
+              <%= render '/drilldown/export_links' %>
             </div>
-            <br/>
-
-            <%= render :partial => '/drilldown/summary_table' %>
+            <%= render '/drilldown/summary_table' %>
           </div>
         </div>
       </div>

data/lib/simple_drilldown/controller.rb

@@ -389,26 +389,26 @@ module SimpleDrilldown
     def excel_export
       index(false)
       headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
       headers['Cache-Control'] = ''
       render template: '/drilldown/excel_export', layout: false
     end
 
-    def excel_export_transactions
+    def excel_export_records
       params[:search][:list] = '1'
       index(false)
-      @transactions = get_transactions(@result)
+      @records = get_records(@result)
       headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
-      render template: '/drilldown/excel_export_transactions', layout: false
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
+      render template: '/drilldown/excel_export_records', layout: false
     end
 
     def xml_export
       params[:search][:list] = '1'
       index(false)
-      @transactions = get_transactions(@result)
+      @records = get_records(@result)
       headers['Content-Type'] = 'text/xml'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
+      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
       render template: '/drilldown/xml_export', layout: false
     end
 
@@ -541,7 +541,7 @@ module SimpleDrilldown
       list_conditions = list_conditions(conditions, values)
       base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(c_list_order)
       base_query = base_query.where(list_conditions) if list_conditions
-      result[:transactions] = base_query.to_a
+      result[:records] = base_query.to_a
     end
 
     def merge_includes(*args)
@@ -594,10 +594,10 @@ module SimpleDrilldown
       [list_conditions_string, *(conditions[1..-1] + values)]
     end
 
-    def get_transactions(tree)
-      return tree[:transactions] if tree[:transactions]
+    def get_records(tree)
+      return tree[:records] if tree[:records]
 
-      tree[:rows].map { |r| get_transactions(r) }.flatten
+      tree[:rows].map { |r| get_records(r) }.flatten
     end
 
     class ScopeHolder

data/lib/simple_drilldown/search.rb

@@ -108,6 +108,10 @@ module SimpleDrilldown
       'SEARCH'
     end
 
+    def list?
+      list
+    end
+
     def drill_down(dimensions, *values)
       raise 'Too many values' if values.size > self.dimensions.size
 

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Uwe Kubosch
@@ -97,6 +97,7 @@ files:
 - app/views/drilldown/_excel_styles.builder
 - app/views/drilldown/_excel_summary_row.builder
 - app/views/drilldown/_excel_summary_total_row.builder
+- app/views/drilldown/_export_links.html.erb
 - app/views/drilldown/_field.html.erb
 - app/views/drilldown/_fields.html.erb
 - app/views/drilldown/_filter.html.erb