effective_cpd 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79ba96a9dae1e17abff7271ca62da9cfec647a361e6782c2c0a7dce76c6cef3
-  data.tar.gz: 6abd37b65ff6587abfb8c954d22809bfe8df5fdafea5326fc961a8aec5cd9efd
+  metadata.gz: f119fa3686ef62e2b4b785b32f9da5775bb1d809564189cd294a1b018dc3f749
+  data.tar.gz: 34601ca091deac96e428bebb3d013ea504ec0047413af9baa047fc3199a52201
 SHA512:
-  metadata.gz: 0c10181c5acb5d2df06f0812e83cd06b35890e52a719572003ff85680544fe2cc888dc825293704b7ce339fb34cb53b8a138e8374c379331d023c7b62f473515
-  data.tar.gz: a9836a26dbdeb3928c3654b2b469d7f22529384829a8b9bec3925da0d3f87cdea5dd35d0885de3d72f6c3f8ed76f31ebb26ca0c0b5be52cfa0212112d6c8e1d4
+  metadata.gz: eb27171d3f177bc81cb3831d13902f61402049a8e07889c9e476fa38153007ed734baaa990d7376bd6c318d41de6d39c12588156898165453dc9775477e3dc88
+  data.tar.gz: e96c06221841c0f35f81459ce7664dd002dfd53d02f30feb4a25b9ebe874f70208736eb2263ee6757cf5a89ca9990cacc8dd4184a485227407e6bad8a91b4521

data/app/models/concerns/effective_cpd_statement.rb

@@ -19,6 +19,7 @@ module EffectiveCpdStatement
 
   included do
     acts_as_tokened
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     acts_as_wizard(
       start: 'Start',
@@ -68,6 +69,11 @@ module EffectiveCpdStatement
     scope :draft, -> { where(submitted_at: nil) }
     scope :completed, -> { where.not(submitted_at: nil) }
 
+    # effective_reports
+    def reportable_scopes
+      { draft: nil, completed: nil }
+    end
+
     before_validation(if: -> { new_record? }) do
       self.user ||= current_user
       self.score ||= 0

data/app/models/effective/cpd_audit.rb

@@ -23,6 +23,7 @@ module Effective
 
     acts_as_email_form
     acts_as_tokened
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     COMPLETED_STATES = [:exemption_granted, :closed]
 
@@ -120,6 +121,11 @@ module Effective
     scope :waiting_on_auditee, -> { where(status: WAITING_ON_AUDITEE_STATES) }
     scope :waiting_on_reviewers, -> { where(status: WAITING_ON_REVIEWERS_STATES) }
 
+    # effective_reports
+    def reportable_scopes
+      { draft: nil, available: nil, completed: nil, waiting_on_admin: nil, waiting_on_auditee: nil, waiting_on_reviewers: nil }
+    end
+
     before_validation(if: -> { new_record? }) do
       self.notification_date ||= Time.zone.now
       self.due_date ||= deadline_to_submit()

data/app/models/effective/cpd_audit_review.rb

@@ -16,6 +16,7 @@ module Effective
 
     acts_as_email_form
     acts_as_tokened
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     acts_as_wizard(
       start: 'Start',
@@ -72,6 +73,11 @@ module Effective
     scope :available, -> { where(submitted_at: nil) }
     scope :completed, -> { where.not(submitted_at: nil) }
 
+    # effective_reports
+    def reportable_scopes
+      { available: nil, completed: nil }
+    end
+
     before_validation(if: -> { new_record? }) do
       self.cpd_audit_level ||= cpd_audit&.cpd_audit_level
       self.due_date ||= deadline_to_review()

data/app/models/effective/cpd_scorer.rb

@@ -166,6 +166,8 @@ module Effective
       )
 
       existing.files.each do |file|
+        next if activity.files.any? { |f| file.filename.to_s == f.filename.to_s }
+
         blob = EffectiveResources.clone_blob(file.blob)
         activity.files.attach(blob)
       end

data/app/models/effective/cpd_statement_activity.rb

@@ -16,9 +16,8 @@ module Effective
 
     has_many_attached :files
 
-    if respond_to?(:log_changes)
-      log_changes(to: :cpd_statement)
-    end
+    acts_as_reportable if respond_to?(:acts_as_reportable)
+    log_changes(to: :cpd_statement) if respond_to?(:log_changes)
 
     effective_resource do
       amount            :decimal
@@ -44,6 +43,11 @@ module Effective
     scope :draft, -> { where(cpd_statement_id: EffectiveCpd.CpdStatement.draft) }
     scope :completed, -> { where(cpd_statement_id: EffectiveCpd.CpdStatement.completed) }
 
+    # effective_reports
+    def reportable_scopes
+      { draft: nil, completed: nil }
+    end
+
     validates :original, presence: true, if: -> { (carry_over || 0) > 0 }
     validates :description, presence: true
 

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.6.4'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails