effective_cpd 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0aa3e273f4a7e43776b241ff56606c511c4787b6c3377099ac9667d893d56a
-  data.tar.gz: 1ddbb75a7c986e35a1aa753a7ce8263a6cb2e5751b75c89b3bc6aa1a53a61e68
+  metadata.gz: 89acef6977a76e2072c93505be5f2e140df846d7a4c811cf9c6ae6f71b8f7cf5
+  data.tar.gz: a3bd58305e0e7ae3667ce9039944dbeba4f4c7a4f4299e48caaf723debc97db3
 SHA512:
-  metadata.gz: 84ad353239bfccbc5b3f406b1c1abf9544ce0b4e0a674f953e7dbe1b1befad3131ed05ab198412e9963a074fa21558f1f94d673026e7192d1c2e4ec9a69e6ab4
-  data.tar.gz: 569f1f59c576c1170c94247a78803a217029234ebcb2ada6fa40f5ebb10671d664b1bfa73732c018d5170520b21eb792e58caebb07515b8584d48aac760c4db3
+  metadata.gz: da56f6fa2fe0699f60f071abf0b694621398efaa71979d8d9efdc07974010497d95d20529222609446b0a79f02aebd0527af3b321706a787471e439f98c06693
+  data.tar.gz: 297d83fdad2dbf217a16148fd624ce0411db56a937555ec1afb4efa043aeccdcfbb88f0acb713c8f8b46bf98698d21a358d6a9525d4d1c50f88dc5a95ba50c79

data/app/datatables/effective_cpd_available_cycles_datatable.rb

@@ -26,8 +26,8 @@ class EffectiveCpdAvailableCyclesDatatable < Effective::Datatable
 
   collection do
     raise('expected a current_user') unless current_user.present?
+
     completed = EffectiveCpd.CpdStatement.completed.where(user: current_user)
     Effective::CpdCycle.available.where.not(id: completed.select('cpd_cycle_id as id'))
   end
-
 end

data/app/models/effective/cpd_scorer.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# rubocop:disable all
+
 module Effective
   class CpdScorer
     include EffectiveResourcesHelper
@@ -9,9 +12,9 @@ module Effective
 
       if from.present?
         raise('expected from to be a CpdStatement') unless from.class.respond_to?(:effective_cpd_statement?)
+
         @statements = @statements.where('cpd_cycle_id >= ?', from.cpd_cycle_id)
       end
-
     end
 
     def score!
@@ -156,7 +159,11 @@ module Effective
 
     def save_carry_forward_activity(existing, statement)
       activity = statement.cpd_statement_activities.find { |a| a.original == (existing.original || existing) }
-      activity ||= statement.cpd_statement_activities.build()
+
+      return if activity.blank? && statement.completed?
+      return if activity.blank? && !statement.cpd_cycle.available?
+
+      activity ||= statement.cpd_statement_activities.build
 
       activity.assign_attributes(
         cpd_category: existing.cpd_category,

data/app/models/effective/cpd_statement_activity.rb

@@ -57,8 +57,8 @@ module Effective
     end
 
     validate(if: -> { new_record? && cpd_statement.present? }, unless: -> { importing }) 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?
+      errors.add(:base, 'statement has already been completed') if cpd_statement.completed?
+      errors.add(:base, 'cycle is unavailable') unless cpd_statement.cpd_cycle.available?
     end
 
     def to_s
@@ -85,6 +85,5 @@ module Effective
     def to_debug
       "id=#{id}, score=#{score}, carry_foward=#{carry_forward}, carry_from_last=#{carry_over}, original=#{original&.id}"
     end
-
   end
 end

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

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