effective_cpd 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48ddbc343a72c9aed794d24fce44b55a442013b7b996b969a835c2ea5d06ec8
-  data.tar.gz: a14a041ae7599c41c078af7682638a9ce1ed3f699bcd4fdd98c33e0e27ca149b
+  metadata.gz: 2be9f6813dafd2931948881251226b7ed3b620a0b878b873f7e8c268c4f908bb
+  data.tar.gz: 9508a3ed45b0057b2a448ed67de9720a26a86ae22f964c1640ed411f6c903fb7
 SHA512:
-  metadata.gz: 67311414ec5f3297abaa98661def506e5b3129073d9c83178d336c6f71efe8413a81ffa66ead01be10849ce023d4638ab59a774609863fd2bcb327f221ecfec0
-  data.tar.gz: 8053f1984a8846847d4a7f4f6e59f93b22ab8e4e8179004119108320fae692d7b4ab10b133f6228a08ad4a98fcae141cdd2d5ca9997a85fdac8d048bc4a41eca
+  metadata.gz: 81fd014d7d29224b1dfd22ac694e98e3be2b45537b80094259cc42cfb7b5f8cb2446a70f42aed2d68cac5557dae9b253c144ec398993570759b7c9578d2cbe7d
+  data.tar.gz: f81cf81ceec74d6508b80bbc1d6fd983526e8173e7306cb1c7c0e8dd3544ed3a504bb5e920632eeccce49cfc24302d504fbe5db7b44d4b6f7500e750082546c2

data/app/controllers/effective/cpd_statements_controller.rb

@@ -27,6 +27,8 @@ module Effective
     before_action(only: [:show, :update]) do
       cycle = resource.cpd_cycle
 
+      cpd_cycle_label = EffectiveResources.et(Effective::CpdCycle)
+
       unless cycle.available?
         flash[:danger] = begin
           if cycle.ended?

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/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/lib/effective_cpd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-02-14 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