simple_drilldown 0.8.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e641a96b877ef453506755526c3fb0fb30974f4c8f62f837008f028d24d2e693
-  data.tar.gz: 603066309062265101fc4c038673ddffdb37a8b03f1cabb26472534eaad2cf76
+  metadata.gz: a9258ecdeb91deb6d4a17a1a23e28f1e0e9cbf243588d9f40e057f93f16c0892
+  data.tar.gz: 5a6e71f4400c9259fe90a04420372adfd29982bede1aec6968d06050c44de9cf
 SHA512:
-  metadata.gz: af0ea2c629a6269a1463891e065dc89e7d60c94fcd34554433ee8288dbb7210490e2fdcb5505d2bb42e9a7bddf83ee61baa0b9528307d6a2dc10784553530b7f
-  data.tar.gz: 1f21dcf709ad307cfadc52f0a660e047ed5f44fd2aa2d77ff525ead5e3b0520ac9a58d9e83132b43ccdf29ed2583298e35b3b084bc3587c418b7da0f5ae96e34
+  metadata.gz: c84bcd765bdb3a7fd29a67a2401849ca065505ec888b0691f6a3b3b79cd94ad5db7a8a28a12b575f6ab6675e328209e7aaa0c13b43c52f65fe227312efaf2e41
+  data.tar.gz: b87a85a90e3843d4deed1aa9725e914622073e77cfdf02db5e771912bd457812a846298f171d4673ee9d6cdcf9154bd661c6a2cd651231503de227fef1422f52

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

@@ -16,6 +16,14 @@
     end
 %>
 
+<%= render '/drilldown/tab_buttons', form: form %>
+
+<div id="drilldown_area">
+  <h2><%= caption %></h2>
+  <h3><%= subcaption %></h3>
+  <br/>
+</div>
+
 <%
   case @search.display_type
   when SimpleDrilldown::Search::DisplayType::PIE
@@ -25,12 +33,6 @@
   <%= 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">
@@ -66,10 +68,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/_excel_record_list_xlsx.xlsx.axlsx

@@ -3,7 +3,7 @@
 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) }
+  @search.fields.each_with_index { |field, _i| row << t(field, default: field.titleize) }
   sheet.add_row row
 end
 

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

@@ -1,28 +1,20 @@
 <% if dimension_name == 'calendar_date' %>
   <% dates = [*@search.filter[dimension_name]] %>
-  <tr>
-    <td align="right" valign="top">
-      <%= form.label "filter[calendar_date]", t(:from_date) %>
-    </td>
-    <td>
-      <input type="text" data-behaviour="datepicker" id="search_filter[from_<%= dimension_name %>]"
-             name="search[filter][<%= dimension_name %>][]" class="form-control" value="<%= dates[0] %>"
-             placeholder="yyyy-mm-dd"/>
-    </td>
-  </tr>
-  <tr>
-    <td align="right" valign="top">
-      <%= form.label "filter[calendar_date]", t(:to_date) %>
-    </td>
-    <td>
-      <input type="text" data-behaviour="datepicker" id="search_filter[to_<%= dimension_name %>]"
-             name="search[filter][<%= dimension_name %>][]" class="form-control" value="<%= dates[1] || dates[0] %>"
-             placeholder="yyyy-mm-dd"/>
-    </td>
-  </tr>
+  <div class="form-group">
+    <%= form.label "filter[calendar_date]", t(:from_date) %>
+    <input type="text" data-behaviour="datepicker" id="search_filter[from_<%= dimension_name %>]"
+           name="search[filter][<%= dimension_name %>][]" class="form-control date" value="<%= dates[0] %>"
+           placeholder="yyyy-mm-dd"/>
+  </div>
+  <div class="form-group">
+    <%= form.label "filter[calendar_date]", t(:to_date) %>
+    <input type="text" data-behaviour="datepicker" id="search_filter[to_<%= dimension_name %>]"
+           name="search[filter][<%= dimension_name %>][]" class="form-control date" value="<%= dates[1] %>"
+           placeholder="yyyy-mm-dd"/>
+  </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/_record_list.html.erb

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

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

@@ -1,8 +1,10 @@
 <thead>
   <tr>
     <% @search.fields.each do |field| %>
-      <th><%=t field, default: :"attributes.#{field}" %></th>
+      <th><%= t field, default: :"attributes.#{field}" %></th>
     <% end %>
-    <th></th>
+    <th>
+      <%= render 'drilldown/export_links', records: records %>
+    </th>
   </tr>
 </thead>

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

@@ -1,5 +1,4 @@
-<div style="float:right">
-  <%= form.submit t(:search), class: 'btn btn-default' %>
-  <a href="<%= url_for() %>" class="btn btn-default"><%= t :reset %></a>
+<div class="float-right">
+  <%= form.submit t(:search), class: 'btn btn-primary' %>
+  <a href="<%= url_for %>" class="btn btn-warning"><%= t :reset %></a>
 </div>
-<br clear="right"/>

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

@@ -1,16 +1,15 @@
-<% @page_title = "#{caption} #{subcaption}" %>
 <%= javascript_include_tag 'chartkick' %>
 <%= stylesheet_link_tag 'simple_drilldown/application' %>
-<style type="text/css">
-    table#drill_down_layout > tbody > tr > td {
-        border: none;
-        font-size: 13px
-    }
+<style>
+  table#drill_down_layout > tbody > tr > td {
+    border: none;
+    font-size: 13px
+  }
 
-    table#drill_down_layout td {
-        padding: 2px;
-        line-height: 18px
-    }
+  table#drill_down_layout td {
+    padding: 2px;
+    line-height: 18px
+  }
 </style>
 
 <%= form_for @search, html: { id: 'edit_search_SEARCH', method: :get, class: :search, style: 'background: inherit', onsubmit: 'return this.submit()' }, url: {} do |form| %>
@@ -26,11 +25,9 @@
         <!-- Tab panes -->
         <div class="tab-content">
           <div class="tab-pane active" id="filter">
-            <%= render '/drilldown/tab_buttons', form: form %>
             <%= render '/drilldown/filter', form: form  %>
           </div>
           <div class="tab-pane" id="fields">
-            <%= render '/drilldown/tab_buttons', form: form %>
             <%= render '/drilldown/fields', form: form %>
           </div>
         </div>
@@ -46,7 +43,7 @@
         <div class="row">
           <div class="col-md-12" valign="top">
             <div style="float: right; clear: both;">
-              <%= render '/drilldown/export_links' %>
+              <%= render '/drilldown/export_links', records: @result[:records] %>
             </div>
             <%= render '/drilldown/summary_table' %>
           </div>

data/app/views/layouts/simple_drilldown/application.html.erb

@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Simple drilldown</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%= stylesheet_link_tag    "simple_drilldown/application", media: "all" %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>Simple drilldown</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <%= stylesheet_link_tag "simple_drilldown/application", media: "all" %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/lib/simple_drilldown/controller.rb

@@ -45,8 +45,8 @@ module SimpleDrilldown
         self.c_base_condition = base_condition
       end
 
-      def base_includes(base_includes)
-        self.c_base_includes = base_includes
+      def base_includes(*base_includes)
+        self.c_base_includes = base_includes.flatten
       end
 
       def base_group(base_group)
@@ -69,7 +69,7 @@ module SimpleDrilldown
         self.c_select = select
       end
 
-      def list_includes(list_includes)
+      def list_includes(*list_includes)
         self.c_list_includes = list_includes.flatten
       end
 
@@ -128,7 +128,7 @@ module SimpleDrilldown
           interval: interval,
           label_method: label_method,
           legal_values: legal_values,
-          pretty_name: I18n.t(name, default: :"activerecord.models.#{name}"),
+          pretty_name: I18n.t(name, default: [:"activerecord.models.#{name}", name.to_s.titleize]),
           queries: queries,
           reverse: reverse,
           select_expression:
@@ -192,9 +192,6 @@ module SimpleDrilldown
 
             values = Array(values)
             if dimension_def[:interval]
-              values *= 2 if values.size == 1
-              raise "Need 2 values for interval filter: #{values.inspect}" if values.size != 2
-
               if values[0].present? && values[1].present?
                 condition_strings << "#{dimension_def[:select_expression]} BETWEEN ? AND ?"
                 condition_values += values
@@ -263,7 +260,9 @@ module SimpleDrilldown
           include_alias = include.to_s.pluralize
           case ass.macro
           when :belongs_to
-            "LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.id = #{model_table}.#{include}_id"
+            pk_col = ass.association_primary_key
+            fk_col = ass.options[:foreign_key] || "#{include}_id"
+            "LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{pk_col} = #{model_table}.#{fk_col}"
           when :has_one, :has_many
             fk_col = ass.options[:foreign_key] || "#{model}_id"
             sql = +"LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{fk_col} = #{model_table}.id"

data/lib/simple_drilldown/engine.rb

@@ -9,7 +9,7 @@ module SimpleDrilldown
     config.autoload_paths << File.dirname(__dir__)
 
     initializer 'simple_drilldown.assets.precompile' do |app|
-      app.config.assets.precompile += %w[chartkick.js]
+      app.config.assets.precompile += %w[simple_drilldown/application.css chartkick.js]
     end
 
     ActionDispatch::Routing::Mapper.include SimpleDrilldown::Routing

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.8.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.