effective_cpd 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f119fa3686ef62e2b4b785b32f9da5775bb1d809564189cd294a1b018dc3f749
-  data.tar.gz: 34601ca091deac96e428bebb3d013ea504ec0047413af9baa047fc3199a52201
+  metadata.gz: 9f8ab2919547d6a9f2385feb05cd00366bfdf1d4bc8749be2714f2d789249164
+  data.tar.gz: 02f0a5a137070f384f19a604b1ff7df6af74e2c420c589306072c5e02a289969
 SHA512:
-  metadata.gz: eb27171d3f177bc81cb3831d13902f61402049a8e07889c9e476fa38153007ed734baaa990d7376bd6c318d41de6d39c12588156898165453dc9775477e3dc88
-  data.tar.gz: e96c06221841c0f35f81459ce7664dd002dfd53d02f30feb4a25b9ebe874f70208736eb2263ee6757cf5a89ca9990cacc8dd4184a485227407e6bad8a91b4521
+  metadata.gz: fdb6eb4fea328ded00578d5c16d1e4ed9d46f1560a28c5af53d9fdd3a7ad8675bfe3deb9a8266b0de2a13f37109f22f2fc814850985bf2abaac39070e5b3c592
+  data.tar.gz: fd01df0b6f085280c1fc4c8065ba321de5644f765655de4bb0d11b5927c8caf81117a4d1ca50d87338ba0e075669c68a068b23374152ede1536afab78231ddee

data/app/models/effective/cpd_audit.rb

@@ -187,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?
@@ -238,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
@@ -340,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/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.6'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Code and Effect