effective_cpd 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68280b10b19be0a77c79173eb4428f429b8905cfeb252ceac7e1d72279da36a0
-  data.tar.gz: ca76a95fadc2e71549f943069e8403d6d3f70c349f5c22847ee48396e371e48d
+  metadata.gz: f48ddbc343a72c9aed794d24fce44b55a442013b7b996b969a835c2ea5d06ec8
+  data.tar.gz: a14a041ae7599c41c078af7682638a9ce1ed3f699bcd4fdd98c33e0e27ca149b
 SHA512:
-  metadata.gz: 4ca2c3fa8c4af2d901fedbcb5859dc2b09be5f99783cbaaf18d4bf2b858830116fe91e9caf51f741b4597283212685125237b6f10b62278d6103498908d3bb50
-  data.tar.gz: 21b70b0f7f7e22169059c0df7e3b8cd098e4ac117e7580c42329b2cd2c7c4b04c0c4c6dda76f0e9762a9510318e17f19671a94c1f87d6171f93799d7019af81b
+  metadata.gz: 67311414ec5f3297abaa98661def506e5b3129073d9c83178d336c6f71efe8413a81ffa66ead01be10849ce023d4638ab59a774609863fd2bcb327f221ecfec0
+  data.tar.gz: 8053f1984a8846847d4a7f4f6e59f93b22ab8e4e8179004119108320fae692d7b4ab10b133f6228a08ad4a98fcae141cdd2d5ca9997a85fdac8d048bc4a41eca

data/app/models/concerns/effective_cpd_audit.rb

@@ -107,6 +107,7 @@ module EffectiveCpdAudit
     accepts_nested_attributes_for :cpd_audit_responses
 
     has_many_attached :files
+    has_many_purgable
 
     effective_resource do
       due_date                 :date, permitted: false     # Computed due date based on notification and extension date

data/app/models/concerns/effective_cpd_audit_level.rb

@@ -111,4 +111,8 @@ module EffectiveCpdAuditLevel
     Array(self[:recommendations]) - [nil, '']
   end
 
+  def review_item_recommendations
+    recommendations
+  end
+
 end

data/app/models/effective/cpd_audit_review_item.rb

@@ -17,11 +17,12 @@ module Effective
     scope :deep, -> { includes(:cpd_audit_review, :item) }
     scope :sorted, -> { order(:id) }
 
-    validates :recommendation, presence: true
     validates :item_id, presence: true, uniqueness: { scope: [:cpd_audit_review_id, :item_type] }
 
+    validates :recommendation, presence: true, if: -> { cpd_audit_review&.cpd_audit_level&.review_item_recommendations.present? }
+
     validate(if: -> { recommendation.present? && cpd_audit_review.present? }) do
-      unless cpd_audit_review.cpd_audit_level.recommendations.include?(recommendation)
+      unless cpd_audit_review.cpd_audit_level.review_item_recommendations.include?(recommendation)
         self.errors.add(:recommendation, 'must exist in this audit level')
       end
     end

data/app/models/effective/cpd_scorer.rb

@@ -1,5 +1,6 @@
 module Effective
   class CpdScorer
+    include EffectiveResourcesHelper
     include EffectiveCpdHelper
 
     def initialize(user:, from: nil)

data/app/views/effective/cpd_audit_review_items/_fields.html.haml

@@ -1,11 +1,13 @@
 = f.hidden_field :item_id
 = f.hidden_field :item_type
 
-- recommendations = cpd_audit_review.cpd_audit_level.recommendations
+- recommendations = cpd_audit_review.cpd_audit_level.review_item_recommendations
 
-- if recommendations.length > 3
+- if recommendations.length == 0
+  - # Nothing to do
+- elsif recommendations.length > 3
   = f.select :recommendation, recommendations
 - else
   = f.radios :recommendation, recommendations, inline: true
 
-= f.text_area :comments, label: 'Notes'
+= f.text_area :comments, label: 'Notes', hint: "Not displayed to the #{cpd_auditee_label}"

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'
 end

metadata

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