effective_cpd 0.1.13 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c335edc7659457d3058974272e93a686c2e5d05ff0337ea8bc2e404381d5af9
-  data.tar.gz: 03e586c16cae18269d1a647ef29c1b182e4cd4fd06e8de9afbc830e242fabc00
+  metadata.gz: 15720d3f1133258119fc998d1a973095b6bfc0976acbb2b141c136de3ea7c017
+  data.tar.gz: 5a81f0179b1ad375fa5c293c0efbc98f7f3d986f068be77c1664ec4b1105d545
 SHA512:
-  metadata.gz: 74d157eb8b58e02abd48dd24fdc31ca0f400626a2cb82b3b73d573ce389d2f16074f9b7c4deb11d5789adcc7b95445f383316bffa797ed19b0e88ff450d7ef30
-  data.tar.gz: 5143e74d60f6bca193c7d9e8107da9428857bd5408f6845eaa966e15e03cd061acbcf52ce153b8b8542f8906a2df9e3eead20294227065d443c0589aafe818e0
+  metadata.gz: 259de0c2499c86a91bc706802515785531e663e36f1ecdf818289278736f224bc6a10bcd4519c74536877516b75b329e2a3d1d6fa0b080b8c509c7569f39c2ab
+  data.tar.gz: d75ee4434407c895a10ae5fb472c70335bb1b22ce6bb3d0c552d3380d0a90a42b1ddbb91581328dfbd9162eae1e63ed6007db6618147c5f00db84780ad09d0ec

data/app/controllers/effective/cpd_statements_controller.rb

@@ -3,6 +3,7 @@ module Effective
     before_action(:authenticate_user!) if defined?(Devise)
 
     include Effective::WizardController
+    include EffectiveCpdHelper
 
     resource_scope do
       cycle = Effective::CpdCycle.find(params[:cpd_cycle_id])
@@ -18,11 +19,7 @@ module Effective
       cycle = Effective::CpdCycle.find(params[:cpd_cycle_id])
       existing = Effective::CpdStatement.where(cpd_cycle: cycle, user: current_user).where.not(id: resource).first
 
-      if existing&.completed?
-        flash[:danger] = "You have already completed a statement for this #{cpd_cycle_label}."
-        redirect_to(root_path)
-      elsif existing.present?
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing, existing.next_step)} step."
+      if existing.present?
         redirect_to effective_cpd.cpd_cycle_cpd_statement_build_path(existing.cpd_cycle, existing, existing.next_step)
       end
     end

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -30,6 +30,16 @@ module Admin
             end
           end
         end.join.html_safe
+      end.search do |collection, term, column, sql_column|
+        user_klass = Effective::CpdAudit.first.user&.class
+
+        if user_klass.present?
+          users = Effective::Resource.new(user_klass).search_any(term)
+          cpd_audit_reviews = Effective::CpdAuditReview.where(user_id: users)
+          collection.where(id: cpd_audit_reviews.select('cpd_audit_id AS id'))
+        else
+          collection.where(id: nil)
+        end
       end
 
       col :notification_date, label: 'Date of Notification'

data/app/models/effective/cpd_statement_activity.rb

@@ -38,7 +38,7 @@ module Effective
     validates :original, presence: true, if: -> { carry_over.to_i > 0 }
     validates :description, presence: true
 
-    validate(if: -> { cpd_statement.present? }) do
+    validate(if: -> { new_record? && cpd_statement.present? }) do
       self.errors.add(:base, "statement has already been completed") if cpd_statement.completed?
       self.errors.add(:base, "cycle is unavailable") unless cpd_statement.cpd_cycle.available?
     end

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

@@ -17,4 +17,4 @@
     - if cpd_audit_level_section.bottom_content.present?
       .mb-2= cpd_audit_level_section.bottom_content
 
-    = f.submit 'Start', center: true
+    = f.submit 'Save and Continue', center: true

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.13'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.17
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails