effective_cpd 0.1.13 → 0.1.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/effective/cpd_statements_controller.rb +2 -5
- data/app/datatables/admin/effective_cpd_audits_datatable.rb +10 -0
- data/app/models/effective/cpd_statement_activity.rb +1 -1
- data/app/views/effective/cpd_audits/cpd_audit_level_section.html.haml +1 -1
- data/lib/effective_cpd/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 15720d3f1133258119fc998d1a973095b6bfc0976acbb2b141c136de3ea7c017
|
4
|
+
data.tar.gz: 5a81f0179b1ad375fa5c293c0efbc98f7f3d986f068be77c1664ec4b1105d545
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 259de0c2499c86a91bc706802515785531e663e36f1ecdf818289278736f224bc6a10bcd4519c74536877516b75b329e2a3d1d6fa0b080b8c509c7569f39c2ab
|
7
|
+
data.tar.gz: d75ee4434407c895a10ae5fb472c70335bb1b22ce6bb3d0c552d3380d0a90a42b1ddbb91581328dfbd9162eae1e63ed6007db6618147c5f00db84780ad09d0ec
|
@@ -3,6 +3,7 @@ module Effective
|
|
3
3
|
before_action(:authenticate_user!) if defined?(Devise)
|
4
4
|
|
5
5
|
include Effective::WizardController
|
6
|
+
include EffectiveCpdHelper
|
6
7
|
|
7
8
|
resource_scope do
|
8
9
|
cycle = Effective::CpdCycle.find(params[:cpd_cycle_id])
|
@@ -18,11 +19,7 @@ module Effective
|
|
18
19
|
cycle = Effective::CpdCycle.find(params[:cpd_cycle_id])
|
19
20
|
existing = Effective::CpdStatement.where(cpd_cycle: cycle, user: current_user).where.not(id: resource).first
|
20
21
|
|
21
|
-
if existing
|
22
|
-
flash[:danger] = "You have already completed a statement for this #{cpd_cycle_label}."
|
23
|
-
redirect_to(root_path)
|
24
|
-
elsif existing.present?
|
25
|
-
flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing, existing.next_step)} step."
|
22
|
+
if existing.present?
|
26
23
|
redirect_to effective_cpd.cpd_cycle_cpd_statement_build_path(existing.cpd_cycle, existing, existing.next_step)
|
27
24
|
end
|
28
25
|
end
|
@@ -30,6 +30,16 @@ module Admin
|
|
30
30
|
end
|
31
31
|
end
|
32
32
|
end.join.html_safe
|
33
|
+
end.search do |collection, term, column, sql_column|
|
34
|
+
user_klass = Effective::CpdAudit.first.user&.class
|
35
|
+
|
36
|
+
if user_klass.present?
|
37
|
+
users = Effective::Resource.new(user_klass).search_any(term)
|
38
|
+
cpd_audit_reviews = Effective::CpdAuditReview.where(user_id: users)
|
39
|
+
collection.where(id: cpd_audit_reviews.select('cpd_audit_id AS id'))
|
40
|
+
else
|
41
|
+
collection.where(id: nil)
|
42
|
+
end
|
33
43
|
end
|
34
44
|
|
35
45
|
col :notification_date, label: 'Date of Notification'
|
@@ -38,7 +38,7 @@ module Effective
|
|
38
38
|
validates :original, presence: true, if: -> { carry_over.to_i > 0 }
|
39
39
|
validates :description, presence: true
|
40
40
|
|
41
|
-
validate(if: -> { cpd_statement.present? }) do
|
41
|
+
validate(if: -> { new_record? && cpd_statement.present? }) do
|
42
42
|
self.errors.add(:base, "statement has already been completed") if cpd_statement.completed?
|
43
43
|
self.errors.add(:base, "cycle is unavailable") unless cpd_statement.cpd_cycle.available?
|
44
44
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_cpd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-10-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|