effective_cpd 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922313bd91077ecfcc7021a812ef4b90bc3872b79827b4347a2d6e75a0edf483
-  data.tar.gz: 309a23f429945e56441cbe20f60f279c31bd62326aabe0d2fa4bf8762c1dd26e
+  metadata.gz: cd0911046fcabd42cad5f51a9d1839bb13da67a67276d78bc4c0a3414a1d0e85
+  data.tar.gz: 1f16f8296435282c808e2fb1e5e4aeff7e0aa1ba40c252c478ff1dd955a930e6
 SHA512:
-  metadata.gz: fe546f711f3899bd5bfd5354d248fcfa5e1a8e82fcf5271c365b24d99902c9bf2c5618032d781d12852263c231d615ecfefb468128f829bc2b991181a0ee93c0
-  data.tar.gz: 3bf62bf5078dfb8a6eb6bc448f44f2542af644eb9ddc145b2a35a612047ce9631d2a8442df40606ebd26c1d9b7cf8cf197ad8668f03cc536ebe74a323a9d3a13
+  metadata.gz: 3bf52660128e824a470059d1399cc8321038a87d67bd56c101d4f57b959c9ecf58e577e0fb0d9e31abe5f3a5cb5c1c2cf88ebf134043fffd5570eeea67d7f7d9
+  data.tar.gz: e242876c24636b77819f64835edc02c187776532389be838658999e2cd1136a93f67d24ea7a4e8181d1346f250989647ab58208f13a77c7884f151159d68e12f

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_statement.rb

@@ -33,6 +33,7 @@ module EffectiveCpdStatement
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
     has_many_attached :files
+    has_many_purgable :files
 
     attr_accessor :current_user
     attr_accessor :current_step

data/app/models/effective/cpd_statement_activity.rb

@@ -3,7 +3,8 @@ module Effective
     attr_accessor :max_score
     attr_accessor :importing
 
-    belongs_to :cpd_statement
+    belongs_to :cpd_statement # This works just fine without the polymorphic
+
     belongs_to :cpd_category
     belongs_to :cpd_activity
 

data/app/views/admin/users/_form_cpd_targets.html.haml

@@ -4,7 +4,7 @@
   %p
     #{cpd_targets_label} set the requirements checked when submitting a #{cpd_statement_label}
 
-  %table.table
+  %table.table.table-striped.table-hover.table-sm
     %thead
       %th= cpd_cycle_label
       %th Default Requirements
@@ -29,11 +29,10 @@
         %tr
           %td= link_to(cpd_cycle, effective_cpd.edit_admin_cpd_cycle_path(cpd_cycle), target: '_blank')
           %td
-            %p
-              = pluralize(default_target, cpd_credit_label.downcase)
-              = default_required_to_submit ? 'required' : 'targeted'
-              and
-              = collection.find { |value| value.last == default_required_to_submit }.first.downcase
+            = pluralize(default_target, cpd_credit_label.downcase)
+            = default_required_to_submit ? 'required' : 'targeted'
+            and
+            = collection.find { |value| value.last == default_required_to_submit }.first.downcase
 
           %td
             .row

data/app/views/effective/cpd_statements/_agreement_fields.html.haml

@@ -0,0 +1,6 @@
+%h2 Agreements
+= f.check_box :confirm_read, label: "Yes, I have read the above content and agreements"
+= f.check_box :confirm_factual, label: "Yes, I declare all provided information to be factual and complete"
+
+%h2 Resume
+= f.file_field :files, label: 'Attach resume', hint: "Please attach your resume or other #{cpd_name_label} related documents"

data/app/views/effective/cpd_statements/_agreements.html.haml

@@ -1,20 +1,3 @@
 = card('Agreements') do
-  %table.table
-    %tbody
-      %tr
-        %th Read all contents and agreements
-        %td= cpd_statement.confirm_read ? 'Yes' : 'No'
-
-      %tr
-        %th Declared all information factual
-        %td= cpd_statement.confirm_factual ? 'Yes' : 'No'
-
-      %tr
-        %th Attachments
-        %td
-          - if cpd_statement.files.blank?
-            None
-          - else
-            %ul
-              - cpd_statement.files.each do |file|
-                = link_to(file.filename, url_for(file), target: '_blank')
+  = effective_table_with(cpd_statement) do |f|
+    = render('effective/cpd_statements/agreement_fields', f: f)

data/app/views/effective/cpd_statements/agreements.html.haml

@@ -10,11 +10,6 @@
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
-    %h2 Agreements
-    = f.check_box :confirm_read, label: "Yes, I have read the above content and agreements"
-    = f.check_box :confirm_factual, label: "Yes, I declare all provided information to be factual and complete"
-
-    %h2 Resume
-    = f.file_field :files, label: 'Attach resume', hint: "Please attach your resume or other #{cpd_name_label} related documents"
+    = render('effective/cpd_statements/agreement_fields', f: f)
 
     = f.submit 'Save and Continue', center: true

data/config/locales/effective_cpd.en.yml

@@ -20,6 +20,7 @@ en:
       effective/cpd_statement_activity: 'CPD Statement Activity'
       effective/cpd_category: 'CPD Category'
       effective/cpd_target: 'CPD Target'
+      effective/cpd_rule: 'CPD Rule'
 
     attributes:
       # Application namespace
@@ -37,3 +38,6 @@ en:
       # Effective namespace
       effective/cpd_statement_activity:
         cpd_cycle: 'CPD Period'
+
+      effective/cpd_rule:
+        cpd_cycle: 'CPD Period'

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.6.3'
+  VERSION = '1.6.5'
 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.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -441,6 +441,7 @@ files:
 - app/views/effective/cpd_statements/_activities_edit.html.haml
 - app/views/effective/cpd_statements/_activities_new.html.haml
 - app/views/effective/cpd_statements/_activities_table.html.haml
+- app/views/effective/cpd_statements/_agreement_fields.html.haml
 - app/views/effective/cpd_statements/_agreements.html.haml
 - app/views/effective/cpd_statements/_cpd_statement.html.haml
 - app/views/effective/cpd_statements/_layout.html.haml