effective_cpd 0.1.12 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde9eaf26a9942cdb7c819292ccd1613563d5dad01bd0f15c751e92b9779a90f
-  data.tar.gz: 4871cc82d92fbd1280fabc31a914a0e92d5c07f66e98bfae183da5de203deeed
+  metadata.gz: 30c4b5c729e67d3ad63505d91bf53b705cd0fff7b6af6fc227857fee4f525fcd
+  data.tar.gz: 3a5602f9711251984c723d5042cb15fdadc064ed40d38e3fcc83389c6e1a04c7
 SHA512:
-  metadata.gz: 588c74b697e23bd1172f7ea9001a04771ea9c0a609fd90d43c4f446b7986d0d229e0d558b7154e0d8ccd7c7ec1492abb3389346725955b073ab3765523dbb038
-  data.tar.gz: 7310fd2ca81076bd23eddd5d9f276f685b6d479857123fd7799cd16719d30170b659578eb4cc681caf659bef8435bc1f07b2dfe1d5b837a0f23673183ed1a746
+  metadata.gz: 7efa6a61be4d0fca14becac4296a21b4375a6ce71c2350f3a8b380733bfdbabe1482dc22012bc11c5e9f4a464b13666dd77447fecb37918506d387b7402b4f9b
+  data.tar.gz: 8f6d6564d6c6eb0bd6fced0f9155e37ff7d378578751d1e8793c102d73067902a03f9eab61f6e6b6febe00d29e8d6ea023b6647b6d1e3f8c92790883ff342015

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -30,6 +30,16 @@ module Admin
             end
           end
         end.join.html_safe
+      end.search do |collection, term, column, sql_column|
+        user_klass = Effective::CpdAudit.first.user&.class
+
+        if user_klass.present?
+          users = Effective::Resource.new(user_klass).search_any(term)
+          cpd_audit_reviews = Effective::CpdAuditReview.where(user_id: users)
+          collection.where(id: cpd_audit_reviews.select('cpd_audit_id AS id'))
+        else
+          collection.where(id: nil)
+        end
       end
 
       col :notification_date, label: 'Date of Notification'
@@ -39,7 +49,7 @@ module Admin
       col :status
       col :determination
 
-      col(:auditee_cpd_statements, label: 'Auditee Statements') do |cpd_audit|
+      col(:auditee_cpd_statements, label: 'Auditee Statements', visible: false) do |cpd_audit|
         cpd_audit.user.cpd_statements.map do |cpd_statement|
           content_tag(:div, class: 'col-resource_item') do
             link_to(cpd_statement.to_s, effective_cpd.admin_cpd_statement_path(cpd_statement))

data/app/models/effective/cpd_statement_activity.rb

@@ -38,7 +38,7 @@ module Effective
     validates :original, presence: true, if: -> { carry_over.to_i > 0 }
     validates :description, presence: true
 
-    validate(if: -> { cpd_statement.present? }) do
+    validate(if: -> { new_record? && cpd_statement.present? }) do
       self.errors.add(:base, "statement has already been completed") if cpd_statement.completed?
       self.errors.add(:base, "cycle is unavailable") unless cpd_statement.cpd_cycle.available?
     end

data/app/views/effective/cpd_audits/cpd_audit_level_section.html.haml

@@ -17,4 +17,4 @@
     - if cpd_audit_level_section.bottom_content.present?
       .mb-2= cpd_audit_level_section.bottom_content
 
-    = f.submit 'Start', center: true
+    = f.submit 'Save and Continue', center: true

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.12'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails