effective_cpd 0.1.15 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168b4998cd7418e64ce7d62bcba5b09c4dc0bfaf65ad54c1c999d63dd35027c5
-  data.tar.gz: 6388aa96a64ea432603d30c52e5dcd481d8df997164be6d9e2f9c3c98116e8d4
+  metadata.gz: fe768cdc3715d62c09b0c829d6823db4ce8587fd603244dceb4243976006bb02
+  data.tar.gz: 0540bd3c67a6df4c5fbc2d612ccbc67f834ff46d96a605c2200ac8866f21dfbd
 SHA512:
-  metadata.gz: 8bf76efd6c2501340bc77c922f5125378fc9d60e5d5fd299511e1bac18bf23e4c99e2aac397b0094d7f01de1af434bf6fa71e4dba87d54c2cae597bfc1b9e772
-  data.tar.gz: dc255a5bbbfe0a76bd999af4cb6316355e3afc6d6b4fc8cdd33b2b7b020fa28cb4ec971acdaf012c3f2368cd2068fdc76f1fea6725773b12cf2192dadef63235
+  metadata.gz: 00701f9319d26d59b192bf831d7072441661798a2202ba728cdf474b798fc9cfc5e3a013b5b725a45d58f6861192d48684acb6b3aec7508a7787d2e3608433c4
+  data.tar.gz: a363248b7decc2a56fcc86d29748c3c29b97fe6ea256406a10f5a41af69064301158871851e8b3dbe2227e3bd40a8009e95a8f16601a4da8f629027d53e65470

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

@@ -117,6 +117,8 @@ module Effective
     private
 
     def eval_equation(amount: nil, amount2: nil)
+      return 0 if formula.blank?
+
       equation = formula.gsub('amount2', amount2.to_s).gsub('amount', amount.to_s)
       eval(equation).round.to_i
     end

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

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.15'
+  VERSION = '0.1.19'
 end

metadata

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