effective_cpd 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89acef6977a76e2072c93505be5f2e140df846d7a4c811cf9c6ae6f71b8f7cf5
-  data.tar.gz: a3bd58305e0e7ae3667ce9039944dbeba4f4c7a4f4299e48caaf723debc97db3
+  metadata.gz: 922313bd91077ecfcc7021a812ef4b90bc3872b79827b4347a2d6e75a0edf483
+  data.tar.gz: 309a23f429945e56441cbe20f60f279c31bd62326aabe0d2fa4bf8762c1dd26e
 SHA512:
-  metadata.gz: da56f6fa2fe0699f60f071abf0b694621398efaa71979d8d9efdc07974010497d95d20529222609446b0a79f02aebd0527af3b321706a787471e439f98c06693
-  data.tar.gz: 297d83fdad2dbf217a16148fd624ce0411db56a937555ec1afb4efa043aeccdcfbb88f0acb713c8f8b46bf98698d21a358d6a9525d4d1c50f88dc5a95ba50c79
+  metadata.gz: fe546f711f3899bd5bfd5354d248fcfa5e1a8e82fcf5271c365b24d99902c9bf2c5618032d781d12852263c231d615ecfefb468128f829bc2b991181a0ee93c0
+  data.tar.gz: 3bf62bf5078dfb8a6eb6bc448f44f2542af644eb9ddc145b2a35a612047ce9631d2a8442df40606ebd26c1d9b7cf8cf197ad8668f03cc536ebe74a323a9d3a13

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/app/views/admin/users/_form_cpd.html.haml

@@ -1,26 +1,19 @@
-%h2 #{cpd_statements_label}
-- datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
-= render_datatable(datatable, inline: true)
+= card(EffectiveCpd.CpdStatement) do
+  - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
+  = render_datatable(datatable, inline: true)
 
-%hr
+= card(Effective::CpdTarget) do
+  = render 'admin/users/form_cpd_targets', user: user
 
-%h2 #{cpd_targets_label}
-= render 'admin/users/form_cpd_targets', user: user
-%hr
+= card(Effective::CpdStatementActivity) do
+  - datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
+  = render_datatable(datatable, inline: true)
 
-%h2 Activities
-- datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
-= render_datatable(datatable, inline: true)
-
-%hr
-
-%h2 #{cpd_audits_label}
-- datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
-= render_datatable(datatable)
+= card(EffectiveCpd.CpdAudit) do
+  - datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
+  = render_datatable(datatable)
 
 - if user.try(:cpd_audit_reviewer?)
-  %hr
-
-  %h2 #{cpd_audit_reviews_label}
-  - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(user: user)
-  = render_datatable(datatable)
+  = card(EffectiveCpd.CpdAuditReview) do
+    - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(user: user)
+    = render_datatable(datatable)

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

data/lib/effective_cpd.rb

@@ -53,4 +53,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.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails