effective_cpd 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c71c5eae8b068aa6f2db410afe050fe950b465603f436f16f796aad7721f59f
-  data.tar.gz: 6af403b2978369d30cf0cc5c31875ca1709430c50ffb9c4f33c3b8dc9eddde0d
+  metadata.gz: fba654344bd04bbe55816f34a8f5598a4c413c753b7de458315c877549e7833a
+  data.tar.gz: afbf52fb5987b51acc284864ee98daf8d97b0b3b2246e6ee88f011b9ad505b74
 SHA512:
-  metadata.gz: 236d74516d718f4407529e939b66bfa21a94a0ce571a4205579629bad290ad9336c6d96e5cc8d4fa307919b95cac158e226ba43b837954d3e4af893eeecea30f
-  data.tar.gz: 3e21816d9715182815de2e26e88033dccc3c77d8d14c6d9ce6eb6a0fba1357ae8808bbfad5cc46a8952cdb25202040cd7bc0aab5cd74cf0628b40f42ee7af724
+  metadata.gz: 157e522d6b1868bbb86c14aae06a3d2b136d4489a027ad7a9fcab42f3a972efb31ba458a9635d81ef1f1208c0bfc9bd39c4a730aefbb7967db75d2d5952169bf
+  data.tar.gz: d299c09f5bcbe5b0f1e8718fcc54a1e92b52b3183b87079560847fb93e7e209b1219cf65ae2f2cf9d092c190d82a1142f1ce01cb9e138d8c006840faa4604ce3

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/concerns/effective_cpd_bulk_audit.rb

@@ -105,8 +105,8 @@ module EffectiveCpdBulkAudit
   def create_audits!
     save!
 
-    @auditees = cpd_auditees.order('RANDOM()').limit(audits)
-    @reviewers = cpd_audit_reviewers.order('RANDOM()').limit(audits).to_a
+    @auditees = cpd_auditees.reorder('RANDOM()').limit(audits)
+    @reviewers = cpd_audit_reviewers.reorder('RANDOM()').limit(audits).to_a
 
     @auditees.each do |auditee|
       reviewers = audit_reviewers_per_audit.times.map { next_audit_reviewer() }

data/app/models/concerns/effective_cpd_user.rb

@@ -24,6 +24,7 @@ module EffectiveCpdUser
     has_many :cpd_audits, -> { order(:id) }, inverse_of: :user
     has_many :cpd_audit_reviews, -> { order(:id) }, inverse_of: :user
 
+    # These two should not be sorted
     scope :cpd_audit_auditees, -> { without_role(:cpd_audit_reviewer).without_role(:admin) }
     scope :cpd_audit_reviewers, -> { with_role(:cpd_audit_reviewer) }
 

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/views/admin/cpd_bulk_audits/create.html.haml

@@ -0,0 +1,12 @@
+.row
+  .col-md-4
+  .col-md-4
+    = card('All Done') do
+      .alert.alert-success.mb-4 Congratulations! All done!
+
+      %p All selected #{cpd_audits_label} are now being opened.
+
+      %p.text-center
+        = link_to(cpd_audits_label, effective_cpd.admin_cpd_audits_path, class: 'btn btn-primary')
+
+  .col-md-4

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.1'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,6 +316,7 @@ files:
 - app/views/admin/cpd_audits/_status.html.haml
 - app/views/admin/cpd_bulk_audits/_form.html.haml
 - app/views/admin/cpd_bulk_audits/_form_cpd_bulk_audit.html.haml
+- app/views/admin/cpd_bulk_audits/create.html.haml
 - app/views/admin/cpd_categories/_form.html.haml
 - app/views/admin/cpd_categories/_form_cpd_category.html.haml
 - app/views/admin/cpd_cycles/_form.html.haml