effective_cpd 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '007309633bd01dfa4ad2731f7c36f6d576c471c6de1f8ec21f355da5615a2b0d'
-  data.tar.gz: f1a0b42227c58dea846ad8e288bccec8472ce05a747b790ef4a6b83ee8ab0539
+  metadata.gz: 89acef6977a76e2072c93505be5f2e140df846d7a4c811cf9c6ae6f71b8f7cf5
+  data.tar.gz: a3bd58305e0e7ae3667ce9039944dbeba4f4c7a4f4299e48caaf723debc97db3
 SHA512:
-  metadata.gz: 99d7615012e34a640bd5e3009559a431638880894f819910cbc3d6df770316c6e4329bebb2dfdd28cf44d7c39abf2f63f1682205232f5a8bea5f43c9e7b25c73
-  data.tar.gz: 99e4617ac625fa40c15e60cbe535824be383edf62306ebd3337b01204c5a03d9f3b89c7c441045848f932fcdb1c21c564aa349c3334eddb2c2eee9c73a54631e
+  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/concerns/effective_cpd_audit.rb

@@ -3,7 +3,6 @@
 # EffectiveCpdAudit
 #
 # Mark your owner model with effective_cpd_audit to get all the includes
-
 module EffectiveCpdAudit
   extend ActiveSupport::Concern
 
@@ -39,7 +38,6 @@ module EffectiveCpdAudit
     def chat_permissions
       ['Can send messages until closed', 'Always send messages', 'Never send messages']
     end
-
   end
 
   included do

data/app/models/concerns/effective_cpd_bulk_audit.rb

@@ -65,15 +65,15 @@ module EffectiveCpdBulkAudit
     validates :audit_reviewers_count, numericality: { greater_than: 0 }
 
     validate(if: -> { cpd_user_scope.present? }) do
-      self.errors.add(:cpd_user_class_name, "expecting an effective_cpd_user") unless cpd_user_scope.respond_to?(:effective_cpd_user?)
+      errors.add(:cpd_user_class_name, 'expecting an effective_cpd_user') unless cpd_user_scope.respond_to?(:effective_cpd_user?)
     end
 
     validate(if: -> { audits.present? && auditees_count.present? }) do
-      self.errors.add(:audits, "can't be more than the number of auditees #{auditees_count}") if audits > auditees_count
+      errors.add(:audits, "can't be more than the number of auditees #{auditees_count}") if audits > auditees_count
     end
 
     validate(if: -> { audit_reviewers_per_audit.present? && audit_reviewers_count.present? }) do
-      self.errors.add(:audit_reviewers_per_audit, "can't be more than the number of audit reviewers #{audit_reviewers_count}") if audit_reviewers_per_audit > audit_reviewers_count
+      errors.add(:audit_reviewers_per_audit, "can't be more than the number of audit reviewers #{audit_reviewers_count}") if audit_reviewers_per_audit > audit_reviewers_count
     end
 
     after_commit(on: :create) { create_bulk_audit_job! }
@@ -154,5 +154,4 @@ module EffectiveCpdBulkAudit
 
     @reviewers[@reviewers_index]
   end
-
 end

data/app/models/concerns/effective_cpd_statement.rb

@@ -3,7 +3,6 @@
 # EffectiveCpdStatement
 #
 # Mark your owner model with effective_cpd_statement to get all the includes
-
 module EffectiveCpdStatement
   extend ActiveSupport::Concern
 
@@ -14,7 +13,9 @@ module EffectiveCpdStatement
   end
 
   module ClassMethods
-    def effective_cpd_statement?; true; end
+    def effective_cpd_statement?
+      true
+    end
   end
 
   included do
@@ -81,8 +82,8 @@ module EffectiveCpdStatement
     end
 
     validate(if: -> { completed? && target_score_required_to_submit? }) do
-      min = target_score() || 0.0
-      self.errors.add(:score, "must be #{min} or greater to submit a statement") if score < min
+      min = target_score || 0.0
+      errors.add(:score, "must be #{min} or greater to submit a statement") if score < min
     end
 
     with_options(if: -> { current_step == :agreements }) do
@@ -93,6 +94,8 @@ module EffectiveCpdStatement
     with_options(if: -> { current_step == :submit}) do
       validates :confirm_readonly, acceptance: true
     end
+
+    validates :cpd_cycle_id, uniqueness: { scope: [:user_type, :user_id] }, if: -> { new_record? && cpd_cycle && user }
   end
 
   def to_s
@@ -148,5 +151,4 @@ module EffectiveCpdStatement
       cpd_statement_activities.each { |activity| scores[activity.cpd_category_id] += activity.score.to_d }
     end
   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/config/routes.rb

@@ -38,7 +38,7 @@ EffectiveCpd::Engine.routes.draw do
     resources :cpd_special_rules, except: [:show]
     resources :cpd_targets, except: [:show]
 
-    resources :cpd_statements, only: [:index, :show] do
+    resources :cpd_statements, only: [:index, :show, :destroy] do
       post :unsubmit, on: :member
     end
 

data/lib/effective_cpd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails