effective_cpd 0.6.6 → 0.6.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/effective/cpd_audit.rb +12 -15
- data/app/views/admin/cpd_cycles/_form_cpd_cycle.html.haml +1 -1
- data/app/views/admin/users/_form_cpd.html.haml +15 -0
- data/app/views/effective/cpd/_dashboard.html.haml +2 -0
- data/app/views/effective/cpd_audits/complete.html.haml +1 -1
- data/app/views/effective/cpd_audits/conflict.html.haml +2 -0
- data/lib/effective_cpd/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ad66762dab7f12d782284fec08de4d8346ce61a8ef4404ef3dc5500b4a8fca1f
|
4
|
+
data.tar.gz: d5b215d2d01940ed502ecf6cce06ff829f94defedb0ba55a8108c9525dcd01b3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 39749020879a1a6cb8b79860dd59658541d967968d115bc80d8074d85e269e7d915807eaaf89c31c207b40b6b5337153581296badf6c3722315d19383bc2e5e9
|
7
|
+
data.tar.gz: 561847197e10cc191b670d13564539b21c5b152e51c005843e6c41723da3b737cf639c320608a15c7735168b2b409d5a5c69cb4a81f870c0338d3b510639609a
|
@@ -187,10 +187,6 @@ module Effective
|
|
187
187
|
|
188
188
|
steps << :conflict if cpd_audit_level.conflict_of_interest?
|
189
189
|
|
190
|
-
if conflicted?
|
191
|
-
return steps + [:waiting, :submit, :complete]
|
192
|
-
end
|
193
|
-
|
194
190
|
steps << :exemption if cpd_audit_level.can_request_exemption?
|
195
191
|
|
196
192
|
unless exemption_requested?
|
@@ -238,20 +234,13 @@ module Effective
|
|
238
234
|
started!
|
239
235
|
end
|
240
236
|
|
241
|
-
# Auditee wizard action
|
242
|
-
def conflict!
|
243
|
-
return started! unless conflict_of_interest?
|
244
|
-
|
245
|
-
update!(status: :conflicted)
|
246
|
-
send_email(:cpd_audit_conflicted)
|
247
|
-
end
|
248
|
-
|
249
237
|
# Admin action
|
250
238
|
def resolve_conflict!
|
251
239
|
wizard_steps[:conflict] = nil # Have them complete the conflict step again.
|
252
240
|
|
253
241
|
assign_attributes(conflict_of_interest: false, conflict_of_interest_reason: nil)
|
254
242
|
conflicted_resolved!
|
243
|
+
submitted!
|
255
244
|
|
256
245
|
send_email(:cpd_audit_conflict_resolved)
|
257
246
|
true
|
@@ -340,9 +329,17 @@ module Effective
|
|
340
329
|
|
341
330
|
# Auditee wizard action
|
342
331
|
def submit!
|
343
|
-
|
344
|
-
|
345
|
-
|
332
|
+
if conflict_of_interest?
|
333
|
+
conflicted!
|
334
|
+
send_email(:cpd_audit_conflicted)
|
335
|
+
else
|
336
|
+
submitted!
|
337
|
+
|
338
|
+
cpd_audit_reviews.each { |cpd_audit_review| cpd_audit_review.ready! }
|
339
|
+
send_email(:cpd_audit_submitted)
|
340
|
+
end
|
341
|
+
|
342
|
+
true
|
346
343
|
end
|
347
344
|
|
348
345
|
# Called in a before_save. Intended for applicant_review to call in its submit! method
|
@@ -5,7 +5,7 @@
|
|
5
5
|
= f.date_field :start_at,
|
6
6
|
hint: "The first date statements may be submited for this #{cpd_cycle_label}"
|
7
7
|
|
8
|
-
= f.date_field :end_at,
|
8
|
+
= f.date_field :end_at, date_linked: false,
|
9
9
|
hint: "The last date statements may be created for this #{cpd_cycle_label}. leave blank for no end date."
|
10
10
|
|
11
11
|
= f.number_field :required_score,
|
@@ -0,0 +1,15 @@
|
|
1
|
+
%h2 Statements
|
2
|
+
- datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
|
3
|
+
= render_datatable(datatable, inline: true)
|
4
|
+
|
5
|
+
%hr
|
6
|
+
|
7
|
+
%h2 Activities
|
8
|
+
- datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
|
9
|
+
= render_datatable(datatable, inline: true)
|
10
|
+
|
11
|
+
%hr
|
12
|
+
|
13
|
+
%h2 Audits
|
14
|
+
- datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
|
15
|
+
= render_datatable(datatable)
|
@@ -18,6 +18,8 @@
|
|
18
18
|
.mt-4
|
19
19
|
%p Please submit a CPD statement for the following available #{cpd_cycles_label}:
|
20
20
|
= render_datatable(available, simple: true)
|
21
|
+
- else
|
22
|
+
%p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
|
21
23
|
|
22
24
|
- completed = EffectiveCpdCompletedStatementsDatatable.new(self)
|
23
25
|
- if completed.present?
|
@@ -1,5 +1,5 @@
|
|
1
1
|
= render('layout') do
|
2
|
-
- raise('expected a submitted cpd_audit') unless resource.was_submitted? || resource.closed?
|
2
|
+
- raise('expected a submitted or conflicted cpd_audit') unless (resource.was_submitted? || resource.was_conflicted? || resource.closed?)
|
3
3
|
|
4
4
|
- if resource.was_submitted?
|
5
5
|
.text-center
|
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.6.
|
4
|
+
version: 0.6.8
|
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: 2023-01-
|
11
|
+
date: 2023-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -264,6 +264,7 @@ files:
|
|
264
264
|
- app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
|
265
265
|
- app/views/admin/cpd_special_rules/_form.html.haml
|
266
266
|
- app/views/admin/cpd_statements/_cpd_statement.html.haml
|
267
|
+
- app/views/admin/users/_form_cpd.html.haml
|
267
268
|
- app/views/effective/cpd/_dashboard.html.haml
|
268
269
|
- app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml
|
269
270
|
- app/views/effective/cpd_audit_responses/_cpd_audit_response.html.haml
|