simple_drilldown 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9461d24d039b785b19ff315ed50092a75d702b8f26ad9cc17fee8f6b4d36842e
-  data.tar.gz: 946fa95bc5c68cac8b15e7c192aaa5a26691af08132ecef438c4007aadb623d4
+  metadata.gz: cb13ecfcc4daffce07a6fc1e9908b0f4630b218c4b8329fb34202f33f9cde216
+  data.tar.gz: c17b1af4432593116544a0d0068441f03d902ee6feff0d7fe27ea36284fb3a09
 SHA512:
-  metadata.gz: 7321e640c76e29963928a75b00d9f6012ca2d8841a89483eb971963f3bb10974fc694cc33f96f123fa8f910fba7de633b3a7957cf65d38640326ccee348770fa
-  data.tar.gz: 6fd3498daaac467c329beed9a93cbea3502986e499c90d85dadc125124f834030916a2b69eccca7b8b280a263f8ed846b139c9c06603aa238a90c604a645aee2
+  metadata.gz: 9e83c939a8340e39df0595e76342efcb529bf5dde9b55a9c27af4191df6c4931a895f13f9ab2a70dadb58f61c6580d7c5209008a31874cb581a998aab8344df3
+  data.tar.gz: 61671368c513f84b7d3ac8a2482c062e682acde751cf2b98f82f0718e8f20f9b691296203c21efafc7aec74f738ade973637a6e9cf3fef4eb548586b59acfb31

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/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'
@@ -153,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 }
@@ -274,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
@@ -347,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 }

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

@@ -12,6 +12,7 @@ module SimpleDrilldown
           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/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

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