effective_cpd 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f119fa3686ef62e2b4b785b32f9da5775bb1d809564189cd294a1b018dc3f749
-  data.tar.gz: 34601ca091deac96e428bebb3d013ea504ec0047413af9baa047fc3199a52201
+  metadata.gz: ad66762dab7f12d782284fec08de4d8346ce61a8ef4404ef3dc5500b4a8fca1f
+  data.tar.gz: d5b215d2d01940ed502ecf6cce06ff829f94defedb0ba55a8108c9525dcd01b3
 SHA512:
-  metadata.gz: eb27171d3f177bc81cb3831d13902f61402049a8e07889c9e476fa38153007ed734baaa990d7376bd6c318d41de6d39c12588156898165453dc9775477e3dc88
-  data.tar.gz: e96c06221841c0f35f81459ce7664dd002dfd53d02f30feb4a25b9ebe874f70208736eb2263ee6757cf5a89ca9990cacc8dd4184a485227407e6bad8a91b4521
+  metadata.gz: 39749020879a1a6cb8b79860dd59658541d967968d115bc80d8074d85e269e7d915807eaaf89c31c207b40b6b5337153581296badf6c3722315d19383bc2e5e9
+  data.tar.gz: 561847197e10cc191b670d13564539b21c5b152e51c005843e6c41723da3b737cf639c320608a15c7735168b2b409d5a5c69cb4a81f870c0338d3b510639609a

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/admin/cpd_cycles/_form_cpd_cycle.html.haml

@@ -5,7 +5,7 @@
   = f.date_field :start_at,
     hint: "The first date statements may be submited for this #{cpd_cycle_label}"
 
-  = f.date_field :end_at,
+  = f.date_field :end_at, date_linked: false,
     hint: "The last date statements may be created for this #{cpd_cycle_label}. leave blank for no end date."
 
   = f.number_field :required_score,

data/app/views/admin/users/_form_cpd.html.haml

@@ -0,0 +1,15 @@
+%h2 Statements
+- datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Activities
+- datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Audits
+- datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
+= render_datatable(datatable)

data/app/views/effective/cpd/_dashboard.html.haml

@@ -18,6 +18,8 @@
   .mt-4
     %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
     = render_datatable(available, simple: true)
+- else
+  %p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
 
 - completed = EffectiveCpdCompletedStatementsDatatable.new(self)
 - if completed.present?

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.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ files:
 - app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
 - app/views/admin/cpd_special_rules/_form.html.haml
 - app/views/admin/cpd_statements/_cpd_statement.html.haml
+- app/views/admin/users/_form_cpd.html.haml
 - app/views/effective/cpd/_dashboard.html.haml
 - app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml
 - app/views/effective/cpd_audit_responses/_cpd_audit_response.html.haml