effective_reports 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1310984f02b38fe92ed745e1b3decac03570c4983f02ec7bab3399415f16a9
-  data.tar.gz: 9522feef0ffc3a1b7c23d00ade2a50173ea9a170c7467cf642ba2e2d1a614d89
+  metadata.gz: bab0b4e74a447c50b3df13ac958875e0e0e8cb9bc450ccc7909dc4a76346f12c
+  data.tar.gz: 382eec07c9c0cff2acf158189e7efa6d206d7788abb71b6a8e781052163d1339
 SHA512:
-  metadata.gz: ab1b8bc62be9ee353a9cd692beb62b6d7320703a38afd92a8a0c53111d85ca8896801fc073661da6acdc769d472a70069599eb4677b6e09740c9ebd6e6db95fd
-  data.tar.gz: 9abcb961cadf7a7d5999d06adf2aa93490c00f77daa8df123da745db7876b1fa9fcf195f1644d0b4d22416942064a44c7a10d54acc40fcbdbda2811c7c631757
+  metadata.gz: 581576fbcb15d9f3245ca22643b21d9ea715a6d3ada1c908d17154d4eb09875b27329037fd43079cf63d27072f3455c7d8d9deba562b555cd86079cf9a2d8d51
+  data.tar.gz: ba9f71ac16a7ca0cc6f4cf45b8feee1cac60be99d12b782458e8c8ff01c9425a84ebf44c4241016ecea3b47880592d6a4b41ac10320bab2c2bfaee37c137a78c

data/app/assets/stylesheets/effective_reports/base.scss

@@ -0,0 +1,5 @@
+.col-current_rows_count { width: 150px; }
+.col-notifications { width: 50%; }
+td.col-notifications { padding-left: 1.5rem; }
+.col-notifications > .col-resource_item {  display: list-item; list-style-type: disc; }
+

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/datatables/admin/effective_reports_datatable.rb

@@ -2,14 +2,16 @@ module Admin
   class EffectiveReportsDatatable < Effective::Datatable
 
     datatable do
-      order :id
+      order :updated_at
+
       col :id, visible: false
 
+      col :updated_at, visible: false
       col :created_at, visible: false
       col :created_by, visible: false
 
       col :title
-      col :description
+      col :description, visible: false
 
       col :reportable_class_name, label: 'Resource', search: EffectiveReports.reportable_classes.map(&:to_s), visible: false
 
@@ -20,7 +22,7 @@ module Admin
         col :notifications, label: 'Notifications'
       end
 
-      col(:current_rows_count) do |report|
+      col :current_rows_count, label: 'Count' do |report|
         report.collection().count
       end
 

data/app/models/effective/report.rb

@@ -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.3'.freeze
+  VERSION = '0.4.5'.freeze
 end

metadata

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