effective_reports 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1c05c8943d42999d6cb9bc8f788af7b1efd9490108fc32a31a06d4429d9455
-  data.tar.gz: 7ad823fb06f1837bbe2d450f10d7d4e4c07064675fa7009847235c2f49b9cdaa
+  metadata.gz: 4a0eb1f2073ced73e4323f8bbf4996fa42bd1f275954ce4fd0cd880f06924555
+  data.tar.gz: 8b05f4cc6d5f8c62f9b749427997e4cb376902a069e817acd9eb98aadf83a671
 SHA512:
-  metadata.gz: 72df2d6b3d8f52aa3c348707b706f22204b22b3c1e1faa766f4fcdd069122fcfd41b0253f3e5d5c275ef2cd9fcced88cb182f1a34ff569b61ea48106ffbdab68
-  data.tar.gz: 263b2b601838d2eaa0823093264dbd6ce0f16c82572a0dc05e0a63b78edc8b5a0a75dad25ca2ad03924f6ae466387f0efe407f0f14cd0e99e4377bc56d8d0931
+  metadata.gz: 67febf40c58be31ded2a04f14e64514763ddccd5dc83eb1f02aba5de72144d5034a9382d4f3aabfcdeecacac1b6403c14a6eadd971cc953c732215a1a4d70490
+  data.tar.gz: 1fabf86d60be49374c15bbfd4e66cb52fc96e2f05bee11d8820532550007df2e21daa3945b2173b4faa48bdb7f208a3f81f6c66e114075656c2069cbb976d9fb

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_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.2'.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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails