effective_cpd 0.5.0 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/effective_cpd/activities_new.js +2 -0
  3. data/app/models/effective/cpd_activity.rb +2 -0
  4. data/app/views/effective/cpd_audit_reviews/_layout.html.haml +2 -2
  5. data/app/views/effective/cpd_audit_reviews/cpd_audit_level_section.html.haml +2 -2
  6. data/app/views/effective/cpd_audits/_layout.html.haml +2 -2
  7. data/app/views/effective/cpd_audits/cpd_audit_level_section.html.haml +2 -2
  8. data/app/views/effective/cpd_statement_activities/_form.html.haml +9 -8
  9. data/app/views/effective/cpd_statements/_layout.html.haml +1 -1
  10. data/app/views/effective/cpd_statements/activities.html.haml +4 -3
  11. data/app/views/effective/cpd_statements/agreements.html.haml +2 -2
  12. data/app/views/effective/cpd_statements/complete.html.haml +2 -2
  13. data/app/views/effective/cpd_statements/start.html.haml +2 -2
  14. data/app/views/effective/cpd_statements/submit.html.haml +2 -2
  15. data/lib/effective_cpd/version.rb +1 -1
  16. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7d9b955aaec606ba0b9e6b222842ae3f6c90023debc1c975a352680011cae1f7
4
- data.tar.gz: 5308896d939fe582bc37e9f766eb578ccf9cc43da6bda404785aad6edd96d742
3
+ metadata.gz: 50a9a2d9d0cdf10dc7fda7136ef7112c9c6135eb22b02d9016178ed3d64d226f
4
+ data.tar.gz: 2476411d5a19d39acf178ff26117108053112babf4d7f09b3a25ddb95e7ce632
5
5
  SHA512:
6
- metadata.gz: 0ede08385d74e42722d29f9700c7e35098d5c07e7f19dea33fbfa9e93accc8b4da6b22e7729aad2945a131a77359128780c9eb66b8a72c13b5b0eac2f65cdc12
7
- data.tar.gz: 3f013ee008e6af032fcd9f11666e241c60bd3988dbb57643db4067574dd5ee0d3039006f8522d193070bf6b2f1a6eb22c23e20fe08b11d0f0ec7cb809727b942
6
+ metadata.gz: 41956f6320aa98d815c065a397385d2579d82e30328f78406cdf51308608afcd86f907d3f8198822047a8d5d80ae968babb44b7e38624d24900edb2dbeb2cd30
7
+ data.tar.gz: 9eaa8765786297555a3fb480fa69afa4112179e7ac822eac0b582eaa1daf5266cd0573d1df81d6a5ffe598fcb20510fd8625ebcc837bf3148fbbd38bc65ab2a9
data/app/assets/javascripts/effective_cpd/activities_new.js CHANGED
@@ -9,6 +9,8 @@ $(document).on('click', '[data-cpd-show-activity]', function(event) {
9
9
  $tabContent.html($form.html())
10
10
  $tabContent.siblings('.active').removeClass('active')
11
11
  $tabContent.addClass('active')
12
+
13
+ $tabContent.trigger('effective-bootstrap:reinitialize')
12
14
  });
13
15
 
14
16
  $(document).on('click', '[data-cpd-back-activity]', function(event) {
data/app/models/effective/cpd_activity.rb CHANGED
@@ -20,6 +20,8 @@ module Effective
20
20
  amount_label :string # 'hours of committee work', 'hours or work'
21
21
  amount2_label :string # 'CEUs'
22
22
 
23
+ date :date
24
+
23
25
  # Whether the user must attach supporting documents
24
26
  requires_upload_file :boolean
25
27
  requires_date :boolean
data/app/views/effective/cpd_audit_reviews/_layout.html.haml CHANGED
@@ -16,9 +16,9 @@
16
16
  %h1= @page_title
17
17
 
18
18
  - if resource.cpd_audit_level.rich_text_all_steps_audit_review_content.present?
19
- .mb-2= resource.cpd_audit_level.rich_text_all_steps_audit_review_content
19
+ .mb-2= resource.cpd_audit_level.rich_text_all_steps_audit_review_content.to_s
20
20
 
21
21
  - if resource.cpd_audit_level.send("rich_text_#{step}_audit_review_content").present?
22
- .mb-2= resource.cpd_audit_level.send("rich_text_#{step}_audit_review_content")
22
+ .mb-2= resource.cpd_audit_level.send("rich_text_#{step}_audit_review_content").to_s
23
23
 
24
24
  = yield
data/app/views/effective/cpd_audit_reviews/cpd_audit_level_section.html.haml CHANGED
@@ -9,7 +9,7 @@
9
9
  = f.hidden_field :current_step
10
10
 
11
11
  - if cpd_audit_level_section.top_content.present?
12
- .mb-2= cpd_audit_level_section.top_content
12
+ .mb-2= cpd_audit_level_section.top_content.to_s
13
13
 
14
14
  %table.table.table-hover
15
15
  %thead
@@ -35,7 +35,7 @@
35
35
  = render('/effective/cpd_audit_review_items/fields', f: fi, cpd_audit_review: resource)
36
36
 
37
37
  - if cpd_audit_level_section.bottom_content.present?
38
- .mb-2= cpd_audit_level_section.bottom_content
38
+ .mb-2= cpd_audit_level_section.bottom_content.to_s
39
39
 
40
40
  %hr
41
41
  = f.text_area :comments, label: 'Reviewer comments'
data/app/views/effective/cpd_audits/_layout.html.haml CHANGED
@@ -25,9 +25,9 @@
25
25
  %h1= @page_title
26
26
 
27
27
  - if resource.cpd_audit_level.rich_text_all_steps_audit_content.present?
28
- .mb-2= resource.cpd_audit_level.rich_text_all_steps_audit_content
28
+ .mb-2= resource.cpd_audit_level.rich_text_all_steps_audit_content.to_s
29
29
 
30
30
  - if resource.cpd_audit_level.send("rich_text_#{step}_audit_content").present?
31
- .mb-2= resource.cpd_audit_level.send("rich_text_#{step}_audit_content")
31
+ .mb-2= resource.cpd_audit_level.send("rich_text_#{step}_audit_content").to_s
32
32
 
33
33
  = yield
data/app/views/effective/cpd_audits/cpd_audit_level_section.html.haml CHANGED
@@ -6,7 +6,7 @@
6
6
  = f.hidden_field :current_step
7
7
 
8
8
  - if cpd_audit_level_section.top_content.present?
9
- .mb-2= cpd_audit_level_section.top_content
9
+ .mb-2= cpd_audit_level_section.top_content.to_s
10
10
 
11
11
  - cpd_audit_level_section.cpd_audit_level_questions.each do |cpd_audit_level_question|
12
12
  - cpd_audit_response = resource.cpd_audit_response(cpd_audit_level_question)
@@ -15,6 +15,6 @@
15
15
  .mt-2= render('/effective/cpd_audit_responses/fields', f: fcar, cpd_audit_level_question: cpd_audit_level_question)
16
16
 
17
17
  - if cpd_audit_level_section.bottom_content.present?
18
- .mb-2= cpd_audit_level_section.bottom_content
18
+ .mb-2= cpd_audit_level_section.bottom_content.to_s
19
19
 
20
20
  = f.submit 'Save and Continue', center: true
data/app/views/effective/cpd_statement_activities/_form.html.haml CHANGED
@@ -60,12 +60,13 @@
60
60
  = f.hidden_field :cpd_category_id
61
61
  = f.hidden_field :cpd_activity_id
62
62
 
63
- = f.submit do
64
- = f.save 'Save Activity'
63
+ .mb-3
64
+ = f.submit do
65
+ = f.save 'Save Activity'
65
66
 
66
- %div{style: 'position: absolute; left: 0;'}
67
- - if f.object.new_record?
68
- = link_to('Back', '#', class: 'btn btn-secondary', 'data-cpd-back-activity': true)
69
- - else
70
- - url = effective_cpd.cpd_statement_cpd_statement_activity_path(statement, cpd_statement_activity)
71
- = link_to('Delete', url, class: 'btn btn-danger', 'data-confirm': "Really delete?", 'data-method': :delete)
67
+ %div{style: 'position: absolute; left: 0;'}
68
+ - if f.object.new_record?
69
+ = link_to('Back', '#', class: 'btn btn-secondary', 'data-cpd-back-activity': true)
70
+ - else
71
+ - url = effective_cpd.cpd_statement_cpd_statement_activity_path(statement, cpd_statement_activity)
72
+ = link_to('Delete', url, class: 'btn btn-danger', 'data-confirm': "Really delete?", 'data-method': :delete)
data/app/views/effective/cpd_statements/_layout.html.haml CHANGED
@@ -30,7 +30,7 @@
30
30
 
31
31
  %td #{cpd_credits_label} in last 3 #{cpd_cycles_label} (including this #{cpd_cycle_label})
32
32
 
33
- = cpd_cycle.sidebar_content
33
+ = cpd_cycle.sidebar_content.to_s
34
34
 
35
35
  .col-9
36
36
  = yield
data/app/views/effective/cpd_statements/activities.html.haml CHANGED
@@ -7,15 +7,16 @@
7
7
  .activities-index
8
8
  = render('layout') do
9
9
  - if resource.cpd_cycle.all_steps_content.present?
10
- .mb-2= resource.cpd_cycle.all_steps_content
10
+ .mb-2= resource.cpd_cycle.all_steps_content.to_s
11
11
 
12
12
  - if resource.cpd_cycle.activities_content.present?
13
- .mb-2= resource.cpd_cycle.activities_content
13
+ .mb-2= resource.cpd_cycle.activities_content.to_s
14
14
 
15
15
  - if resource.cpd_statement_activities.present?
16
16
  = render('activities_edit', cpd_statement: resource)
17
17
 
18
- .mt-3= link_to 'Add Activity', '#', 'data-cpd-new-activity': true, class: 'btn btn-primary'
18
+ .my-3
19
+ = link_to 'Add Activity', '#', 'data-cpd-new-activity': true, class: 'btn btn-primary'
19
20
 
20
21
  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
21
22
  = f.hidden_field :current_step
data/app/views/effective/cpd_statements/agreements.html.haml CHANGED
@@ -2,10 +2,10 @@
2
2
  %h1= resource.cpd_cycle
3
3
 
4
4
  - if resource.cpd_cycle.all_steps_content.present?
5
- .mb-2= resource.cpd_cycle.all_steps_content
5
+ .mb-2= resource.cpd_cycle.all_steps_content.to_s
6
6
 
7
7
  - if resource.cpd_cycle.agreements_content.present?
8
- .mb-2= resource.cpd_cycle.agreements_content
8
+ .mb-2= resource.cpd_cycle.agreements_content.to_s
9
9
 
10
10
  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
11
11
  = f.hidden_field :current_step
data/app/views/effective/cpd_statements/complete.html.haml CHANGED
@@ -2,10 +2,10 @@
2
2
  %h1= resource.cpd_cycle
3
3
 
4
4
  - if resource.cpd_cycle.all_steps_content.present?
5
- .mb-2= resource.cpd_cycle.all_steps_content
5
+ .mb-2= resource.cpd_cycle.all_steps_content.to_s
6
6
 
7
7
  - if resource.cpd_cycle.complete_content.present?
8
- .mb-2= resource.cpd_cycle.complete_content
8
+ .mb-2= resource.cpd_cycle.complete_content.to_s
9
9
 
10
10
  = render(resource)
11
11
 
data/app/views/effective/cpd_statements/start.html.haml CHANGED
@@ -2,10 +2,10 @@
2
2
  %h1= resource.cpd_cycle
3
3
 
4
4
  - if resource.cpd_cycle.all_steps_content.present?
5
- .mb-2= resource.cpd_cycle.all_steps_content
5
+ .mb-2= resource.cpd_cycle.all_steps_content.to_s
6
6
 
7
7
  - if resource.cpd_cycle.start_content.present?
8
- .mb-2= resource.cpd_cycle.start_content
8
+ .mb-2= resource.cpd_cycle.start_content.to_s
9
9
 
10
10
  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
11
11
  = f.hidden_field :current_step
data/app/views/effective/cpd_statements/submit.html.haml CHANGED
@@ -2,10 +2,10 @@
2
2
  %h1= resource.cpd_cycle
3
3
 
4
4
  - if resource.cpd_cycle.all_steps_content.present?
5
- .mb-2= resource.cpd_cycle.all_steps_content
5
+ .mb-2= resource.cpd_cycle.all_steps_content.to_s
6
6
 
7
7
  - if resource.cpd_cycle.submit_content.present?
8
- .mb-2= resource.cpd_cycle.submit_content
8
+ .mb-2= resource.cpd_cycle.submit_content.to_s
9
9
 
10
10
  = render(resource)
11
11
 
data/lib/effective_cpd/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveCpd
2
- VERSION = '0.5.0'
2
+ VERSION = '0.5.2'
3
3
  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.5.0
4
+ version: 0.5.2
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: 2022-09-12 00:00:00.000000000 Z
11
+ date: 2022-09-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails