effective_reports 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1c05c8943d42999d6cb9bc8f788af7b1efd9490108fc32a31a06d4429d9455
-  data.tar.gz: 7ad823fb06f1837bbe2d450f10d7d4e4c07064675fa7009847235c2f49b9cdaa
+  metadata.gz: 991d7b212a5902f3a50a65e1a9ab6261772f610d5b9c34fd531cd42d8fc8dd21
+  data.tar.gz: 880c5838c51e1f53fa71549d578e290f3b09c70388f0351d8d9b47972829afae
 SHA512:
-  metadata.gz: 72df2d6b3d8f52aa3c348707b706f22204b22b3c1e1faa766f4fcdd069122fcfd41b0253f3e5d5c275ef2cd9fcced88cb182f1a34ff569b61ea48106ffbdab68
-  data.tar.gz: 263b2b601838d2eaa0823093264dbd6ce0f16c82572a0dc05e0a63b78edc8b5a0a75dad25ca2ad03924f6ae466387f0efe407f0f14cd0e99e4377bc56d8d0931
+  metadata.gz: 35c55dd39bc05eaf96a9308ba9193f9f188fd5248f1c3f31b8398c20cae3fc110bf15156fc8d6696ab4f16a6ba5f9b30d3ccab8c15b1f048805173f9bb90080d
+  data.tar.gz: 639050630369e02d01d5fcb7e43019d70f1d96b03e5ccb24dc32cad0ac6b051ba5a20f73d1c8feb3253d6200c3fad47bc98715d18cef9f05237691b0f09efacf

data/app/helpers/effective_reports_helper.rb

@@ -43,7 +43,7 @@ module EffectiveReportsHelper
         ['Greater than >', :gt],
         ['Greater than or equal to >=', :gteq],
         ['Less than <', :lt],
-        ['Less than or equal to <', :lteq],
+        ['Less than or equal to <=', :lteq],
       ]
     when :belongs_to, :belongs_to_polymorphic, :has_many, :has_one
       [

data/app/models/effective/report.rb

@@ -26,6 +26,7 @@ module Effective
 
     scope :deep, -> { includes(:report_columns, :report_scopes) }
     scope :sorted, -> { order(:title) }
+    scope :emails, -> { where(id: ReportColumn.emails.select(:report_id)) }
 
     validates :title, presence: true, uniqueness: true
     validates :reportable_class_name, presence: true
@@ -42,6 +43,10 @@ module Effective
       report_columns.select(&:filter?)
     end
 
+    def email_report_column
+      report_columns.find { |column| column.name.include?('email') }
+    end
+
     # Used to build the Reports form
     # { id: :integer, archived: :boolean }
     def reportable_attributes

data/app/models/effective/report_column.rb

@@ -27,6 +27,7 @@ module Effective
 
     scope :deep, -> { includes(:report) }
     scope :sorted, -> { order(:position) }
+    scope :emails, -> { where('name ILIKE ?', "%email%") }
 
     before_validation(if: -> { report.present? }) do
       self.position ||= (report.report_columns.map(&:position).compact.max || -1) + 1
@@ -57,6 +58,25 @@ module Effective
       [name, operation_label, value].compact.join(' ').presence || 'report column'
     end
 
+    def format(value)
+      return '' if value.blank?
+
+      case as.to_sym
+      when :boolean then value.to_s
+      when :date then value.strftime('%F')
+      when :decimal then value.to_s
+      when :integer then value.to_s
+      when :price then '$' + ('%0.2f' % (value / 100.0))
+      when :string then value.to_s
+      when :belongs_to then value.to_s
+      when :belongs_to_polymorphic then value.to_s
+      when :has_many then Array(value).map { |value| value.to_s }.join("\n\n")
+      when :has_one then value.to_s
+      else
+        raise("unexpected as: #{as || 'nil'}")
+      end
+    end
+
     def as_associated?
       [:belongs_to, :belongs_to_polymorphic, :has_many, :has_one].include?(as.to_sym)
     end

data/app/models/effective/report_scope.rb

@@ -37,12 +37,16 @@ module Effective
     end
 
     def to_s
-      name.presence || 'report scope'
+      [name, operation_label, value].compact.join(' ').presence || 'report scope'
     end
 
     def value
       value_date || value_decimal || value_integer || value_price || value_string.presence || value_boolean
     end
 
+    def operation_label
+      return '=' if advanced?
+    end
+
   end
 end

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

@@ -177,17 +177,17 @@
                     = frs.hidden_field :advanced, value: true
 
                     - if type == :boolean
-                      = frs.radios :value_boolean, reportable_boolean_collection, label: 'Value', buttons: true, required: true, label: false
+                      = frs.radios :value_boolean, reportable_boolean_collection, buttons: true, required: true, label: false
                     - elsif type == :date
-                      = frs.date_field :value_date, label: 'Value', required: true, label: false
+                      = frs.date_field :value_date, required: true, label: false
                     - elsif type == :decimal
-                      = frs.date_field :value_decimal, label: 'Value', required: true, label: false
+                      = frs.date_field :value_decimal, required: true, label: false
                     - elsif type == :integer
-                      = frs.integer_field :value_integer, label: 'Value', required: true, label: false
+                      = frs.integer_field :value_integer, required: true, label: false
                     - elsif type == :price
-                      = frs.price_field :value_price, label: 'Value', required: true, label: false
+                      = frs.price_field :value_price, required: true, label: false
                     - elsif type == :string
-                      = frs.text_field :value_string, label: 'Value', required: true, label: false
+                      = frs.text_field :value_string, required: true, label: false
                     - else
                       - raise("Unexpected scope datatype: #{type || 'nil'}")
 

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

@@ -1,5 +1,5 @@
 - if report.description.present?
-  %p= report.description.to_s
+  %p= simple_format(report.description)
 
 - if report.filtered_report_columns.present? || report.report_scopes.present?
   %p The results of this report have been filtered by the following:

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

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