effective_cpd 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4773c3b6961452cc64a5378b56d7227bab9c08df6bfc812d82f433988d8dfb03
-  data.tar.gz: e92d9b394e070adeb054cf19ecf72ab6dd36a16dc144021fd7aa249bc33bbfd9
+  metadata.gz: 9f8ab2919547d6a9f2385feb05cd00366bfdf1d4bc8749be2714f2d789249164
+  data.tar.gz: 02f0a5a137070f384f19a604b1ff7df6af74e2c420c589306072c5e02a289969
 SHA512:
-  metadata.gz: 3fa597aabce1172fd1070d7d907eea1eb0452d44d3e920ca0b4d553f96b5c3ef8901cdf9714c7ac0b44c61a615f45665ae00a78e83acd7da5171759730ce3a89
-  data.tar.gz: 26b1acedec51bd60c81a485de86cc35d084d8bb16e8e7648e3c84a0b48743b603fedba909c9a4c3b48554fc59ed12a50a70c8dbe1414a9be3ffe452b350115e7
+  metadata.gz: fdb6eb4fea328ded00578d5c16d1e4ed9d46f1560a28c5af53d9fdd3a7ad8675bfe3deb9a8266b0de2a13f37109f22f2fc814850985bf2abaac39070e5b3c592
+  data.tar.gz: fd01df0b6f085280c1fc4c8065ba321de5644f765655de4bb0d11b5927c8caf81117a4d1ca50d87338ba0e075669c68a068b23374152ede1536afab78231ddee

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()
@@ -181,10 +187,6 @@ module Effective
 
       steps << :conflict if cpd_audit_level.conflict_of_interest?
 
-      if conflicted?
-        return steps + [:waiting, :submit, :complete]
-      end
-
       steps << :exemption if cpd_audit_level.can_request_exemption?
 
       unless exemption_requested?
@@ -232,20 +234,13 @@ module Effective
       started!
     end
 
-    # Auditee wizard action
-    def conflict!
-      return started! unless conflict_of_interest?
-
-      update!(status: :conflicted)
-      send_email(:cpd_audit_conflicted)
-    end
-
     # Admin action
     def resolve_conflict!
       wizard_steps[:conflict] = nil   # Have them complete the conflict step again.
 
       assign_attributes(conflict_of_interest: false, conflict_of_interest_reason: nil)
       conflicted_resolved!
+      submitted!
 
       send_email(:cpd_audit_conflict_resolved)
       true
@@ -334,9 +329,17 @@ module Effective
 
     # Auditee wizard action
     def submit!
-      submitted!
-      cpd_audit_reviews.each { |cpd_audit_review| cpd_audit_review.ready! }
-      send_email(:cpd_audit_submitted)
+      if conflict_of_interest?
+        conflicted!
+        send_email(:cpd_audit_conflicted)
+      else
+        submitted!
+
+        cpd_audit_reviews.each { |cpd_audit_review| cpd_audit_review.ready! }
+        send_email(:cpd_audit_submitted)
+      end
+
+      true
     end
 
     # Called in a before_save. Intended for applicant_review to call in its submit! method

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_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/app/views/effective/cpd_audits/complete.html.haml

@@ -1,5 +1,5 @@
 = render('layout') do
-  - raise('expected a submitted cpd_audit') unless resource.was_submitted? || resource.closed?
+  - raise('expected a submitted or conflicted cpd_audit') unless (resource.was_submitted? || resource.was_conflicted? || resource.closed?)
 
   - if resource.was_submitted?
     .text-center

data/app/views/effective/cpd_audits/conflict.html.haml

@@ -20,4 +20,6 @@
     = f.show_if :conflict_of_interest, false do
       = f.hidden_field :conflict_of_interest_reason, value: ''
 
+    %p A new auditor will be selected if there is a conflict of interest.
+
     = f.submit 'Save and Continue', center: true

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.6.5'
+  VERSION = '0.6.7'
 end

metadata

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