effective_reports 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8af98bc740da567e5817f47c85c8c6fdc84b3c426d87dfa2ebd27e43f68cc2
-  data.tar.gz: 6243524e413ddb99b6c5ea1d87b9bb70f9fe581a7379f07cc5342728cac5cf83
+  metadata.gz: c8f0160d7a3eeab66cc8efa955bb852413cbb7440e997c203f24b628fc573734
+  data.tar.gz: 707e208abe7ca336245094a91c934b8a9b37a19f4e267b7a79f39e76f5ca4f4d
 SHA512:
-  metadata.gz: a999a402c388c5c1f4c6324ca65461366277fd7ba1395ebbf7e00b104f929dcdbbb48717dec71ddc0488be131b4b2d2f9062d1341b25007c8467f98297f8f813
-  data.tar.gz: a007445b4207e5a57362aeaad6efa004149d201991ddb449bd4752cc1dea6020be0866e7df56c2016abd1b7e05d28747dd7e2a68e20e4e9b3faf42c4ccea701e
+  metadata.gz: 400664a1606650241176dfb5f883a60a649f50a4411077437cbe672e54259b0e60548fe9df3494d27febe110cf94501010cf0a975903ea2055754e09134383d8
+  data.tar.gz: eaf63a27d36604502fd73556df6ac575fbbc7a5585938acd5dc90b1c088b49c93a36362787c4bbd35b61a6c1fbd1b918bad8880e4aefd64c2c02da7b14250ae4

data/app/assets/javascripts/effective_reports/base.js

@@ -3,6 +3,7 @@
 $(document).on('change', "[name^='effective_report[report_columns_attributes]'][name$='[filter]']", function(event) {
   let $filter = $(event.currentTarget);
   let $values = $filter.closest('.row').find('.effective-report-filter');
+
   let $inputs = $values.find('input,textarea,select,button');
 
   if($filter.is(':checked')) {
@@ -12,4 +13,24 @@ $(document).on('change', "[name^='effective_report[report_columns_attributes]'][
     $values.hide();
     $inputs.prop('disabled', true);
   }
+
+  $values.find("[data-effective-reports-date-operation]").trigger('change');
+});
+
+// The date operation can be either a date or an integet days field
+$(document).on('change', "[data-effective-reports-date-operation]", function(event) {
+  let $select = $(event.currentTarget);
+  let $dateValues = $select.closest('.row').find('.effective-report-filter');
+
+  let value = $select.val() || ''
+
+  if(value.includes('days')) {
+    // Enable days (integer) and disable date
+    $dateValues.filter('.effective-report-days-filter').show().find('input').removeAttr('disabled');
+    $dateValues.filter('.effective-report-date-filter').hide().find('input').prop('disabled', true);
+  } else {
+    // Enable date and disable days (integer)
+    $dateValues.filter('.effective-report-date-filter').show().find('input').removeAttr('disabled');
+    $dateValues.filter('.effective-report-days-filter').hide().find('input').prop('disabled', true);
+  }
 });

data/app/helpers/effective_reports_helper.rb

@@ -36,7 +36,19 @@ module EffectiveReportsHelper
         ['Starts with', :starts_with],
         ['Ends with', :ends_with]
       ]
-    when :integer, :price, :date, :decimal
+    when :date
+      [
+        ['Days ago Equals =', :days_ago_eq],
+        ['Days ago Greater than or equal to >=', :days_ago_gteq],
+        ['Days ago Less than or equal to <=', :days_ago_lteq],
+        ['Date Equals =', :eq],
+        ['Date Does Not Equal !=', :not_eq],
+        ['Date Greater than >', :gt],
+        ['Date Greater than or equal to >=', :gteq],
+        ['Date Less than <', :lt],
+        ['Date Less than or equal to <=', :lteq],
+      ]
+    when :integer, :price, :decimal
       [
         ['Equals =', :eq],
         ['Does Not Equal !=', :not_eq],

data/app/models/effective/report.rb

@@ -67,7 +67,7 @@ module Effective
       scopes.each do |scope, type|
         raise("#{reportable}.reportable_scopes #{scope} => #{type || 'nil'} is invalid. Key must be a symbol") unless scope.kind_of?(Symbol)
         raise("#{reportable}.reportable_scopes :#{scope} => #{type || 'nil'} is invalid. Value must be one of #{DATATYPES.map { |s| ":#{s}"}.join(', ')}") if type.present? && !DATATYPES.include?(type)
-        raise("#{reportable} must respond to reportable scope :#{name}") unless reportable.respond_to?(scope)
+        raise("#{reportable} must respond to reportable scope :#{scope}") unless reportable.respond_to?(scope)
       end
 
       scopes

data/app/models/effective/report_column.rb

@@ -55,7 +55,7 @@ module Effective
     end
 
     def to_s
-      [name, operation_label, value].compact.join(' ').presence || 'report column'
+      [name, operation_label, value, days_label].compact.join(' ').presence || 'report column'
     end
 
     def format(value)
@@ -63,7 +63,7 @@ module Effective
 
       case as.to_sym
       when :boolean then value.to_s
-      when :date then value.strftime('%F')
+      when :date then value.try(:strftime, '%F') || value.to_s
       when :decimal then value.to_s
       when :integer then value.to_s
       when :price then '$' + ('%0.2f' % (value / 100.0))
@@ -77,11 +77,21 @@ module Effective
       end
     end
 
+    # Days Since functionality
+    def days_filter?
+      as == 'date' && operation.to_s.include?('days')
+    end
+
+    def date_filter?
+      as == 'date' && operation.to_s.exclude?('days')
+    end
+
     def as_associated?
       [:belongs_to, :belongs_to_polymorphic, :has_many, :has_one].include?(as.to_sym)
     end
 
     def value
+      return value_integer if days_filter?
       value_date || value_decimal || value_integer || value_price || value_string.presence || value_associated.presence || value_boolean
     end
 
@@ -100,10 +110,23 @@ module Effective
       when :lt then '<'
       when :lteq then '<='
       when :sql then 'sql'
+      when :days_ago_eq then '='
+      when :days_ago_gteq then '>='
+      when :days_ago_lteq then '<='
       else
         raise("unexpected operation: #{operation}")
       end
     end
 
+    def days_label
+      case operation.to_sym
+      when :days_ago_eq then 'days ago'
+      when :days_ago_gteq then 'days ago'
+      when :days_ago_lteq then 'days ago'
+      else
+        ''
+      end
+    end
+
   end
 end

data/app/views/admin/reports/_form_report.html.haml

@@ -60,11 +60,14 @@
                       = frc.hidden_field :as, value: :date
 
                     .col.effective-report-filter{style: ('display: none;' unless frc.object.filter?)}
-                      = frc.select :operation, reportable_operations_collection(:date), label: false
+                      = frc.select :operation, reportable_operations_collection(:date), label: false, 'data-effective-reports-date-operation': true
 
-                    .col.effective-report-filter{style: ('display: none;' unless frc.object.filter?)}
+                    .col.effective-report-filter.effective-report-date-filter{style: ('display: none;' unless frc.object.filter? && frc.object.date_filter?)}
                       = frc.date_field :value_date, label: false
 
+                    .col.effective-report-filter.effective-report-days-filter{style: ('display: none;' unless frc.object.filter? && frc.object.days_filter?)}
+                      = frc.integer_field :value_integer, label: false
+
                 = frc.show_if_any(:name, value_decimals) do
                   .row
                     .col.mt-2

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_reports
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails