effective_cpd 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922313bd91077ecfcc7021a812ef4b90bc3872b79827b4347a2d6e75a0edf483
-  data.tar.gz: 309a23f429945e56441cbe20f60f279c31bd62326aabe0d2fa4bf8762c1dd26e
+  metadata.gz: 1be69d17b3b7602f4ecd79e04ba02da88c72d9cffe84b2a62a89bfb86d9e83ad
+  data.tar.gz: 1e681360aeb11babccd620a4b50517ee76e14c8193256944e0b312da01f4d7c9
 SHA512:
-  metadata.gz: fe546f711f3899bd5bfd5354d248fcfa5e1a8e82fcf5271c365b24d99902c9bf2c5618032d781d12852263c231d615ecfefb468128f829bc2b991181a0ee93c0
-  data.tar.gz: 3bf62bf5078dfb8a6eb6bc448f44f2542af644eb9ddc145b2a35a612047ce9631d2a8442df40606ebd26c1d9b7cf8cf197ad8668f03cc536ebe74a323a9d3a13
+  metadata.gz: 818a42d3b8ae3d1b50b4504668a9a981456ac82a7283aa8b41de048c500e584515785fe2f823dad1767ac88ef4f95f85a195d8281618cc6bfbecd267c20a3f87
+  data.tar.gz: 3556315481e1cba1e8510cfb324f5d9f0c53ed62d656991ad9593c07e715eac16e6d19b8bb5bd95e4483ab85e60b257b38fc9cc3c0b7e813cecb11cae979a65d

data/app/datatables/effective_cpd_available_cycles_datatable.rb

@@ -25,9 +25,8 @@ class EffectiveCpdAvailableCyclesDatatable < Effective::Datatable
   end
 
   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'))
+    completed = EffectiveCpd.CpdStatement.completed.where(user: attributes[:user] || current_user)
+    Effective::CpdCycle.available.where.not(id: completed.select(:cpd_cycle_id))
   end
+
 end

data/app/datatables/effective_cpd_completed_statements_datatable.rb

@@ -26,10 +26,7 @@ class EffectiveCpdCompletedStatementsDatatable < Effective::Datatable
   end
 
   collection do
-    raise('expected a current_user') unless current_user.present?
-    user = (current_user.class.find(attributes[:user_id]) if attributes[:user_id])
-
-    EffectiveCpd.CpdStatement.completed.where(user: user || current_user).includes(:cpd_cycle)
+    EffectiveCpd.CpdStatement.completed.where(user: attributes[:user] || current_user).includes(:cpd_cycle)
   end
 
 end

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

data/lib/effective_cpd.rb

@@ -33,6 +33,10 @@ module EffectiveCpd
     cpd_statement_class_name&.constantize || Effective::CpdStatement
   end
 
+  def self.CpdCycle
+    Effective::CpdCycle
+  end
+
   def self.CpdAudit
     cpd_audit_class_name&.constantize || Effective::CpdAudit
   end

metadata

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