effective_reports 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1305cf7f8937e178a2d5eb94df49644b7249f01a856e1cd42b47277fca4f70b8
-  data.tar.gz: aeb156bd5fdaef4b66bb31546511ed06735374f939280d952a0530b9ff3b0a76
+  metadata.gz: 785afdfa4fc380b5a195e473f9305b55ca373c8d32e45753b2016c6cf75841e8
+  data.tar.gz: 260cc022bee2520239ace914ab140bbb19eb1812a9aaa5a22a8e52d513513efb
 SHA512:
-  metadata.gz: 46a1c37be1ab24c71263269ef3b981a66bb9854b18349821190c298a24d96b7bace90565173153eb468b32ec3fe5c9f9f3295201f8e1359a5236c6ea5cd1dd68
-  data.tar.gz: fef84a63e254279dfb27d8b0c9c31991c7f6232e6fc4af6923e1607ae440575eba691fff37dbe46ef2800dbdc283fa87d8e0ef8f1754e94d441c2bc4b2ba7494
+  metadata.gz: 41e88a353a63cf6b453db60528cf3dae20c5dd6eb217b58d352bfd248b9ed3491f1b7a0565c8429d6db5c590b015fe70be12e045c4633ab78bcbefa501e69809
+  data.tar.gz: 38cfca7da087b2b1c52f5be58c8d4acb97493a2c8abafac1ae4eccc3f416a6898d68d657a8b7f68267d74479576777c97a3bba07961a371b15db8e4039b93514

data/app/controllers/admin/reports_controller.rb

@@ -5,6 +5,10 @@ module Admin
 
     include Effective::CrudController
 
+    submit :save, 'Save'
+    submit :save, 'Save and View', redirect: -> { effective_reports.admin_report_path(resource) }
+    submit :save, 'Duplicate', only: :edit, redirect: -> { effective_reports.new_admin_report_path(duplicate_id: resource.id) }
+
     private
 
     def permitted_params

data/app/models/effective/report.rb

@@ -43,9 +43,9 @@ module Effective
 
     validate do
       error = begin
-        collection().to_sql; nil
+        collection().first; nil
       rescue StandardError => e
-        e.message
+        e.message.gsub('<', '').gsub('>', '')
       end
 
       errors.add(:base, "Invalid Report: #{error}") if error.present?
@@ -116,6 +116,24 @@ module Effective
       scopes
     end
 
+    def duplicate
+      Effective::Report.new(attributes.except('id', 'updated_at', 'created_at')).tap do |report|
+        report.title = title + ' (Copy)'
+
+        report_columns.each do |report_column|
+          report.report_columns.build(report_column.attributes.except('id', 'updated_at', 'created_at'))
+        end
+
+        report_scopes.each do |report_scope|
+          report.report_scopes.build(report_scope.attributes.except('id', 'updated_at', 'created_at'))
+        end
+      end
+    end
+
+    def duplicate!
+      duplicate.tap { |event| event.save! }
+    end
+
     # The klass to base the collection from
     def collection
       collection = reportable.all

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.4'.freeze
 end

metadata

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