effective_cpd 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2653c7ce3493be3cd984924514326ab6e899d2cf45f56d4551c1c649db81431c
-  data.tar.gz: cc4b83b1930e70c5a0ed9df43eaf199e936103edfd43835323e95a8df9c5273b
+  metadata.gz: c4f27b1163b09341852b3e9a136eebeffa80e30dc20662fb396e736d41a5b016
+  data.tar.gz: a6dac2da3b6a5e808cab6a225d7cc575541543103f5baa19a2ed732b143d71ea
 SHA512:
-  metadata.gz: fe5e11e6d7341491c05646e2e680fa10b1d3f203958816640469d1e03763f00deaaccadd56f39f90172ae3bda06ed65768c20a6110ff6d82bec46e08cd540b70
-  data.tar.gz: 0f867cee33de484ad41a3d8f7f0d9f4b57c8023ea3791429bc7cc77e305e950945084f56905527f256fe58c94d9bb850d304952d43b70856eb8e02cdf1a6f9b2
+  metadata.gz: c6f824e59e41b7b36284caaf1b6afd53692aca36b42671faf4fbe0b54e0f17748f03406e8e359f30be00d68fd15c9fa16deaa8dc72bf2608d446381fc7ab22d5
+  data.tar.gz: 3629eeb492a02a5645773d8412c9d301182e2ccf95548303a469d7c9783f36a36e087b60368b11ed42ae8bd65e0f02b6c05f796fbfaf171097210b3f7aa33ac8

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_scorer.rb

@@ -161,7 +161,10 @@ module Effective
         description: existing.description,
       )
 
-      existing.files.each { |file| activity.files.attach(file.blob) }
+      existing.files.each do |file|
+        blob = EffectiveResources.clone_blob(file.blob)
+        activity.files.attach(blob)
+      end
 
       activity.assign_attributes(
         carry_over: existing.carry_forward,

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/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.14'
+  VERSION = '0.1.18'
 end

metadata

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