effective_cpd 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ed7e39d7742dca209a95b979ff325d244858b0681b1a34d58b931d44de6942
-  data.tar.gz: fde90b077fd981dfb0b636e2de6b69c45e321f87cdc5e8d211aa4df3fe908f5c
+  metadata.gz: 1be69d17b3b7602f4ecd79e04ba02da88c72d9cffe84b2a62a89bfb86d9e83ad
+  data.tar.gz: 1e681360aeb11babccd620a4b50517ee76e14c8193256944e0b312da01f4d7c9
 SHA512:
-  metadata.gz: d44fdab7e582d2935971edb3eb8668d8b605cfa26ce0f06a8e24bd4c745397bf73378194e25da2aff9963e827c7bc3fa0a8ec2b98e67ca42634c13dccd5678bc
-  data.tar.gz: 04a6850eb162f83507b9e014ab6c2d5b16855a74c985999fb591a1d3d5fad5b2a31ca9f85b3bd77a0f7ffae9004466236c40dfde36323d55e78b685f7df0518f
+  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/app/models/concerns/effective_cpd_user.rb

@@ -113,6 +113,17 @@ module EffectiveCpdUser
     end.sort_by(&:cpd_cycle_id).reverse
   end
 
+  # These two are checked by effective memberships for the CPD step
+  def cpd_current_statement_completed?(date: nil)
+    cpd_cycle = EffectiveCpd.current_cpd_cycle(date: date)
+    cpd_cycle.present? && cpd_statement(cpd_cycle: cpd_cycle).try(:completed?)
+  end
+
+  def cpd_previous_statement_completed?(date: nil)
+    cpd_cycle = EffectiveCpd.previous_cpd_cycle(date: date)
+    cpd_cycle.present? && cpd_statement(cpd_cycle: cpd_cycle).try(:completed?)
+  end
+
   private
 
   def reject_cpd_target_attributes(atts)

data/config/locales/effective_cpd.en.yml

@@ -8,21 +8,21 @@ en:
 
   activerecord:
     models:
-      # These ones might be app level
+      # Application namespace
       cpd_audit: 'CPD Audit'
       cpd_audit_level: 'CPD Audit Level'
       cpd_audit_review: 'CPD Audit Review'
       cpd_bulk_audit: 'Bulk Create CPD Audit Review'
       cpd_statement: 'CPD Statement'
 
-      # These ones should stay effective
+      # Effective namespace
       effective/cpd_cycle: 'CPD Period'
       effective/cpd_statement_activity: 'CPD Statement Activity'
       effective/cpd_category: 'CPD Category'
       effective/cpd_target: 'CPD Target'
 
     attributes:
-      # These ones might be app level
+      # Application namespace
       cpd_audit:
         user: 'Auditee'
         cpd_audit_comments: 'Reviewer Notes'
@@ -30,3 +30,10 @@ en:
       cpd_audit_review:
         user: 'Reviewer'
         comments: 'Reviewer Notes'
+
+      cpd_statement:
+        cpd_cycle: 'CPD Period'
+
+      # Effective namespace
+      effective/cpd_statement_activity:
+        cpd_cycle: 'CPD Period'

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.6.2'
+  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
@@ -53,4 +57,16 @@ module EffectiveCpd
     defined?(EffectiveMessaging) && !!use_effective_messaging
   end
 
+  def self.current_cpd_cycle(date: nil)
+    date ||= Time.zone.now
+    cpd_cycles = Effective::CpdCycle.all.reorder(start_at: :asc).all.where('start_at <= ?', date)
+    cpd_cycles.to_a.last
+  end
+
+  def self.previous_cpd_cycle(date: nil)
+    date ||= Time.zone.now
+    cpd_cycles = Effective::CpdCycle.all.reorder(start_at: :asc).all.where('start_at <= ?', date)
+    cpd_cycles.to_a.last(2).first
+  end
+
 end

metadata

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