effective_cpd 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '007309633bd01dfa4ad2731f7c36f6d576c471c6de1f8ec21f355da5615a2b0d'
-  data.tar.gz: f1a0b42227c58dea846ad8e288bccec8472ce05a747b790ef4a6b83ee8ab0539
+  metadata.gz: df0aa3e273f4a7e43776b241ff56606c511c4787b6c3377099ac9667d893d56a
+  data.tar.gz: 1ddbb75a7c986e35a1aa753a7ce8263a6cb2e5751b75c89b3bc6aa1a53a61e68
 SHA512:
-  metadata.gz: 99d7615012e34a640bd5e3009559a431638880894f819910cbc3d6df770316c6e4329bebb2dfdd28cf44d7c39abf2f63f1682205232f5a8bea5f43c9e7b25c73
-  data.tar.gz: 99e4617ac625fa40c15e60cbe535824be383edf62306ebd3337b01204c5a03d9f3b89c7c441045848f932fcdb1c21c564aa349c3334eddb2c2eee9c73a54631e
+  metadata.gz: 84ad353239bfccbc5b3f406b1c1abf9544ce0b4e0a674f953e7dbe1b1befad3131ed05ab198412e9963a074fa21558f1f94d673026e7192d1c2e4ec9a69e6ab4
+  data.tar.gz: 569f1f59c576c1170c94247a78803a217029234ebcb2ada6fa40f5ebb10671d664b1bfa73732c018d5170520b21eb792e58caebb07515b8584d48aac760c4db3

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/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.0'
 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.0
 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