effective_cpd 1.2.3 → 1.3.0

data/app/views/admin/cpd_special_rules/_form.html.haml

@@ -2,12 +2,12 @@
   - if inline_datatable?
     = f.hidden_field :cpd_cycle_id
   - else
-    = f.select :cpd_cycle_id, Effective::CpdCycle.sorted.all, label: cpd_cycle_label.titleize
+    = f.select :cpd_cycle_id, Effective::CpdCycle.sorted.all, label: cpd_cycle_label
 
   = f.select :category, Effective::CpdSpecialRule::CATEGORIES
 
   = f.show_if :category, 'cumulative max credits' do
-    = f.number_field :max_credits_per_cycle, label: "Cumulative max credits per #{cpd_cycle_label}",
+    = f.number_field :max_credits_per_cycle, label: "Cumulative max #{cpd_credits_label} per #{cpd_cycle_label}",
       hint: "The cumulative max #{cpd_credits_label} per #{cpd_cycle_label} that can be earned between the following categories."
 
     - cpd_category_rules = cpd_special_rule.cpd_cycle.cpd_rules.select(&:category?)

data/app/views/admin/cpd_statements/_cpd_statement.html.haml

@@ -1,7 +1,7 @@
 = tabs do
-  = tab 'Statement' do
+  = tab(cpd_statement) do
     = render('effective/cpd_statements/cpd_statement', cpd_statement: cpd_statement)
 
   - if cpd_statement.persisted? && cpd_statement.respond_to?(:log_changes_datatable)
     = tab 'Logs' do
-      = render_inline_datatable(cpd_statement.log_changes_datatable)
+      = render_inline_datatable(cpd_statement.logs_datatable)

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

@@ -10,13 +10,13 @@
 
 %hr
 
-%h2 Audits
+%h2 #{cpd_audits_label}
 - datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
 = render_datatable(datatable)
 
 - if user.try(:cpd_audit_reviewer?)
   %hr
 
-  %h2 Audit Reviews
+  %h2 #{cpd_audit_reviews_label}
   - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(user: user)
   = render_datatable(datatable)

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

@@ -1,8 +1,8 @@
 - if user.try(:cpd_audit_reviewer?)
-  %h2 Audit Reviews
-  - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(user: user)
+  %h2 #{cpd_audit_reviews_label}
+  - datatable = EffectiveResources.best('Admin::EffectiveCpdAuditReviewsDatatable').new(user: user)
   = render_datatable(datatable)
 - else
-  %h2 Audits
-  - datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
+  %h2 #{cpd_audits_label}
+  - datatable = EffectiveResources.best('Admin::EffectiveCpdAuditsDatatable').new(user: user)
   = render_datatable(datatable)

data/app/views/effective/cpd/_dashboard.html.haml

@@ -1,14 +1,14 @@
-%h2 Continuing Professional Development
+%h2 #{cpd_name_label}
 
 - # In progress
 - cpd_audit = current_user.cpd_audits.in_progress.first
 
 - if cpd_audit.present? && cpd_audit.in_progress?
-  %p Your audit is in progress.
+  %p Your #{cpd_audit_label} is in progress.
 
   %p
     Please
-    = link_to("Continue audit", effective_cpd.cpd_audit_build_path(cpd_audit, cpd_audit.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+    = link_to("Continue #{cpd_audit_label}", effective_cpd.cpd_audit_build_path(cpd_audit, cpd_audit.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
     to continue.
 
     %hr
@@ -17,19 +17,19 @@
 - auditing = EffectiveCpdAvailableAuditsDatatable.new(self)
 - if auditing.present?
   .mt-4
-    %p You have been selected for audit:
+    %p You have been selected to submit a #{cpd_audit_label}:
     = render_datatable(auditing, simple: true)
 
 - audited = EffectiveCpdCompletedAuditsDatatable.new(self)
 - if audited.present?
   .mt-4
-    %p You have completed these past audits:
+    %p You have completed these past #{cpd_audits_label}:
     = render_datatable(audited, simple: true)
 
 - available = EffectiveCpdAvailableCyclesDatatable.new(self)
 - if available.present?
   .mt-4
-    %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
+    %p Please submit a #{cpd_statement_label} for the following available #{cpd_cycles_label}:
     = render_datatable(available, simple: true)
 - elsif current_user.try(:cpd_audit_cpd_required?)
   %p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
@@ -37,7 +37,7 @@
 - completed = EffectiveCpdCompletedStatementsDatatable.new(self)
 - if completed.present?
   .mt-4
-    %p You have completed these past statements:
+    %p You have completed these past #{cpd_statements_label}:
     = render_datatable(completed, simple: true)
 
 - unless current_user.try(:cpd_audit_reviewer?)
@@ -49,13 +49,13 @@
   - reviewing = EffectiveCpdAvailableAuditReviewsDatatable.new(self)
   - if reviewing.present?
     .mt-4
-      %p You have been selected to assess the following audits:
+      %p You have been selected to review the following #{cpd_audits_label}:
       = render_datatable(reviewing, simple: true)
   - else
-    %p There are no audits available to review. When there are, we'll show them here.
+    %p There are no #{cpd_audits_label} available to review. When there are, we'll show them here.
 
   - reviewed = EffectiveCpdCompletedAuditReviewsDatatable.new(self)
   - if reviewed.present?
     .mt-4
-      %p You have completed these past audit assessments:
+      %p You have completed these past #{cpd_audit_reviews_label}:
       = render_datatable(reviewed, simple: true)

data/app/views/effective/cpd_audit_reviews/_cpd_audit_level_section.html.haml

@@ -15,7 +15,7 @@
             .mb-3= render('effective/cpd_audit_level_questions/cpd_audit_level_question', cpd_audit_level_question: cpd_audit_level_question)
 
             %p
-              %strong Auditee Response:
+              %strong #{cpd_auditee_label} Response:
 
             .mb-3= render('effective/cpd_audit_responses/cpd_audit_response', cpd_audit_response: cpd_audit_response)
 

data/app/views/effective/cpd_audit_reviews/_summary.html.haml

@@ -5,12 +5,12 @@
     %tbody
       - if request.path.start_with?('/admin')
         %tr
-          %th Audit
+          %th #{cpd_audit_label}
           %td
             = link_to(cpd_audit, effective_cpd.edit_admin_cpd_audit_path(cpd_audit), target: '_blank')
 
       %tr
-        %th Audit Reviewer
+        %th #{cpd_reviewer_label}
         %td
           - if cpd_audit_review.anonymous?
             %p= cpd_audit_review.anonymous_name
@@ -29,7 +29,7 @@
               %small= mail_to cpd_audit_review.user.email
 
       %tr
-        %th Auditee
+        %th #{cpd_auditee_label}
         %td
           - if cpd_audit.anonymous?
             %p= cpd_audit.anonymous_name

data/app/views/effective/cpd_audit_reviews/conflict.html.haml

@@ -20,6 +20,6 @@
       = f.text_area :conflict_of_interest_reason, required: true
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

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

@@ -38,6 +38,6 @@
       .mb-2= cpd_audit_level_section.bottom_content.to_s
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/cpd_statement.html.haml

@@ -30,6 +30,6 @@
                 = render('/effective/cpd_audit_review_items/fields', f: fi, cpd_audit_review: resource)
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/feedback.html.haml

@@ -1,6 +1,6 @@
 = render('layout') do
   .mb-3
-    = collapse('Show audit...', card_class: '') do
+    = collapse("Show #{cpd_audit_label}...", card_class: '') do
       .mt-4= render('effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit)
 
   %p Please provide any final feedback for #{resource.cpd_audit.name}:
@@ -8,9 +8,9 @@
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
-    = f.text_area :feedback, label: 'Feedback for the auditee'
+    = f.text_area :feedback, label: "Feedback for the #{cpd_auditee_label}"
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/files.html.haml

@@ -3,7 +3,7 @@
     = f.hidden_field :current_step
 
     %p
-      The auditee attached the following files:
+      The #{cpd_auditee_label} attached the following files:
       - if resource.cpd_audit.files.blank?
         None
 
@@ -12,6 +12,6 @@
         %li= link_to(file.filename, url_for(file), target: '_blank')
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/instructions.html.haml

@@ -5,6 +5,6 @@
     %hr
 
     %p The following rolling notes will be displayed for your use on each step.
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/questionnaire.html.haml

@@ -3,6 +3,6 @@
     = f.hidden_field :current_step
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/recommendation.html.haml

@@ -1,6 +1,6 @@
 = render('layout') do
   .mb-3
-    = collapse('Show audit...', card_class: '') do
+    = collapse("Show #{cpd_audit_label}...", card_class: '') do
       .mt-4= render('effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit)
 
   %p Please provide your final recommendation on #{resource.cpd_audit.name}:
@@ -8,7 +8,7 @@
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
-    = f.text_area :feedback, label: 'Feedback for the auditee'
+    = f.text_area :feedback, label: "Feedback for the #{cpd_auditee_label}"
 
     - recommendations = resource.cpd_audit_level.recommendations
 
@@ -18,6 +18,6 @@
       = f.radios :recommendation, recommendations, inline: true
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/start.html.haml

@@ -1,12 +1,12 @@
 = render('layout') do
-  %p You have been selected to conduct a #{resource.cpd_audit.cpd_audit_level} audit.
+  %p You have been selected to review #{resource}.
 
   - if resource.cpd_audit_level.anonymous?
-    %p This is an anonymous audit, and you have been assigned the name #{resource.name}.
-    %p You have been matched with the auditee, #{resource.cpd_audit.name}.
+    %p This is an anonymous #{cpd_audit_label}, and you have been assigned the name #{resource.name}.
+    %p You have been matched with the #{cpd_auditee_label}, #{resource.cpd_audit.name}.
 
   - else
-    %p You have been matched with the auditee:
+    %p You have been matched with the #{cpd_auditee_label}:
 
     %ul
       %li #{resource.cpd_audit.user} <#{mail_to(resource.cpd_audit.user.email)}>

data/app/views/effective/cpd_audit_reviews/statements.html.haml

@@ -1,28 +1,28 @@
 = render('layout') do
   - cpd_audit = resource.cpd_audit
 
-  %p #{cpd_audit.name} has submitted the following statements:
+  %p #{cpd_audit.name} has submitted the following #{cpd_statements_label}:
 
   - datatable = EffectiveCpdCompletedStatementsDatatable.new(user: cpd_audit.user, actions: false)
 
   - if datatable.blank?(self)
     %p
-      %strong There are no completed CPD statements from #{cpd_audit.name}.
+      %strong There are no completed #{cpd_statements_label} from #{cpd_audit.name}.
   - else
     = render_datatable(datatable, simple: true)
 
-  %h2 All Statements
-  %p Click to expand any statements
+  %h2 All #{cpd_statements_label}
+  %p Click to expand
 
   - datatable.collection.sorted.each do |cpd_statement|
     .mb-3
-      = collapse("#{cpd_statement.to_s}...", card_class: 'mb-3') do
+      = collapse("Show #{cpd_statement.to_s}...", card_class: 'mb-3') do
         = render('effective/cpd_statements/cpd_statement', cpd_statement: cpd_statement)
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
     %hr
-    = f.text_area :comments, label: 'Reviewer notes', hint: 'Not displayed to the auditee'
+    = f.text_area :comments, hint: "Not displayed to the #{cpd_auditee_label}"
 
     = f.submit 'Save and Continue', center: true

data/app/views/effective/cpd_audit_reviews/submit.html.haml

@@ -11,4 +11,4 @@
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
-    = f.submit 'Submit Audit Review', center: true, 'data-confirm': "Really Submit Audit Review?"
+    = f.submit "Submit #{cpd_audit_review_label}", center: true, 'data-confirm': "Really Submit #{cpd_audit_review_label}?"

data/app/views/effective/cpd_audit_reviews/submitted.html.haml

@@ -3,18 +3,18 @@
 
   - if resource.completed?
     .alert.alert-success.mb-4
-      This audit review was submitted on #{resource.submitted_at.strftime('%F')}
+      This #{cpd_audit_review_label} was submitted on #{resource.submitted_at.strftime('%F')}
 
   %p Thank you for your review.
 
   = render 'effective/cpd_audit_reviews/summary', cpd_audit_review: resource
 
   .mb-4
-    = collapse('Show audit review...', card_class: 'my-2') do
+    = collapse("Show #{cpd_audit_review_label}...", card_class: 'my-2') do
       = render('effective/cpd_audit_reviews/cpd_audit_review', cpd_audit_review: resource)
 
   .mb-4
-    = collapse('Show audit...', card_class: 'my-2') do
+    = collapse("Show #{cpd_audit_label}...", card_class: 'my-2') do
       = render 'effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit
 
   = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/app/views/effective/cpd_audit_reviews/waiting.html.haml

@@ -4,6 +4,6 @@
 
   %p
     You may not continue at this time.
-    Please wait for an email when this audit becomes available for review.
+    Please wait for an email when this #{cpd_audit_label} becomes available.
 
   %p Thank you and have a great day!

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

@@ -6,14 +6,14 @@
 %p
   Please revisit each wizard step and
   = link_to 'Complete all missing information', wizard_path(:instructions), class: 'btn btn-primary'
-  for this audit.
+  for this #{cpd_audit_label}.
 
 %p
-  Once you're ready, click below to re-submit your audit with the updated information.
+  Once you're ready, click below to re-submit your #{cpd_audit_label} with the updated information.
 
 %p
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
 
     - # If you change this label, update EffectiveMemberships ApplicantsController
-    = f.save 'Resubmit Audit', 'data-confirm': "Really re-submit?", class: 'btn-sm'
+    = f.save 'Resubmit', 'data-confirm': "Really re-submit #{cpd_audit_label}?", class: 'btn-sm'

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

@@ -2,7 +2,7 @@
   %table.table
     %tbody
       %tr
-        %th Auditee
+        %th #{cpd_auditee_label}
         %td
           - if cpd_audit.anonymous?
             %p= cpd_audit.anonymous_name
@@ -21,7 +21,7 @@
               %small= mail_to cpd_audit.user.email
 
       %tr
-        %th Audit Reviewer
+        %th #{cpd_reviewer_label}
         %td
           - cpd_audit.cpd_audit_reviews.each do |cpd_audit_review|
             - if cpd_audit_review.anonymous?

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

@@ -1,5 +1,5 @@
 = render('layout') do
-  %p You have been selected for #{resource.cpd_audit_level} audit and matched with:
+  %p You have been selected for #{resource.cpd_audit_level} #{cpd_audit_label} and matched with:
 
   %ul
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
@@ -24,6 +24,6 @@
     = f.show_if :conflict_of_interest, false do
       = f.hidden_field :conflict_of_interest_reason, value: ''
 
-    %p A new auditor will be selected if there is a conflict of interest.
+    %p A new #{cpd_reviewer_label} will be selected if there is a conflict of interest.
 
     = f.submit 'Save and Continue', center: true

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

@@ -1,8 +1,8 @@
 = render('layout') do
-  %p You have been selected for #{resource.cpd_audit_level} audit.
+  %p You have been selected for #{resource.cpd_audit_level} #{cpd_audit_label}.
 
   - if resource.cpd_audit_level.anonymous?
-    %p This is an anonymous audit, and you have been assigned the name #{resource.name}
+    %p This is an anonymous #{cpd_audit_label}, and you have been assigned the name #{resource.name}
 
   - if resource.cpd_audit_level.anonymous? == false
     %p You have been matched with:

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

@@ -1,6 +1,6 @@
 = render('layout') do
   %p
-    Please review your audit before submitting.
+    Please review your #{cpd_audit_label} before submitting.
 
   %p
     Once submitted you
@@ -13,6 +13,6 @@
     = f.hidden_field :current_step
 
     - if EffectiveResources.authorized?(self, :resubmit, resource)
-      = f.submit 'Resubmit Audit', center: true, 'data-confirm': "Really Resubmit Audit?"
+      = f.submit 'Resubmit', center: true, 'data-confirm': "Really Resubmit #{cpd_audit_label}?"
     - else
-      = f.submit 'Submit Audit', center: true, 'data-confirm': "Really Submit Audit?"
+      = f.submit 'Submit', center: true, 'data-confirm': "Really Submit #{cpd_audit_label}?"

data/app/views/effective/cpd_audits/submitted.haml

@@ -3,7 +3,7 @@
 
   - if resource.was_submitted?
     .alert.alert-success.mb-4
-      This audit was submitted on #{resource.submitted_at.strftime('%F')}
+      This #{cpd_audit_label} was submitted on #{resource.submitted_at.strftime('%F')}
 
   - if resource.missing_info?
     = card do
@@ -11,12 +11,12 @@
 
   - if resource.was_submitted?
     %p
-      The following audit was successfully submitted at
+      The following #{cpd_audit_label} was successfully submitted at
       = succeed('.') do
         = resource.submitted_at.strftime('%F')
 
       - unless resource.determination.present?
-        Your audit must be reviewed and a final determination made.
+        Your #{cpd_audit_label} must be reviewed and a final determination made.
         We will send
         %strong= resource.user.email
         an email notifying you of the determination.
@@ -24,7 +24,7 @@
   = render 'effective/cpd_audits/summary', cpd_audit: resource
 
   .mb-4
-    = collapse('Show audit...', card_class: 'my-2') do
+    = collapse("Show #{cpd_audit_label}...", card_class: 'my-2') do
       = render 'effective/cpd_audits/cpd_audit', cpd_audit: resource
 
   = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -11,7 +11,7 @@
 
   - if resource.exemption_request?
     %h2 Exemption Request
-    %p You have requested an exemption from this audit.
+    %p You have requested an exemption.
     = render("effective/cpd_audits/exemption", cpd_audit: resource, step: :exemption)
 
   - if resource.extension_request?

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

@@ -6,7 +6,7 @@
     - rule = cpd_statement.cpd_cycle.rule_for(category)
     - next if rule.unavailable?
 
-    = tab(category) do
+    = tab(category.to_s) do
       .float-right= link_to icon('x', class: 'small-1'), '#', 'data-cpd-collapse': true
 
       %h3

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

@@ -2,7 +2,7 @@
   .row
     .col-8
     .col-2.score
-      %strong= cpd_credits_label.capitalize
+      %strong= cpd_credits_label
     .col-2.carry-forward
       %strong Carry Forward
 
@@ -57,7 +57,7 @@
 
   .row
     .col-8
-      %h4 Total #{cpd_credits_label} in statement
+      %h4 Total #{cpd_credits_label}
     .col-2.score
       %h4= cpd_score(cpd_statement.score)
     .col-2.carry-forward

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

@@ -21,7 +21,7 @@
           %td= cpd_statement.submitted_at.strftime('%F %H:%M')
 
       %tr
-        %th= cpd_cycle_label.capitalize
+        %th= cpd_cycle_label
         %td= cpd_statement.cpd_cycle
 
       %tr

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

@@ -15,6 +15,6 @@
     = 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 related documents'
+    = f.file_field :files, label: 'Attach resume', hint: "Please attach your resume or other #{cpd_name_label} related documents"
 
     = f.submit 'Save and Continue', center: true

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

@@ -16,4 +16,4 @@
 
     = f.check_box :confirm_readonly, label: cpd_statement_submit_label(f.object)
 
-    = f.submit 'Submit Statement', center: true
+    = f.submit 'Submit', center: true, 'data-confirm': "Really submit #{cpd_statement_label}?"

data/config/effective_cpd.rb

@@ -39,11 +39,6 @@ EffectiveCpd.setup do |config|
   # config.cpd_audit_review_class_name = 'Effective::CpdAuditReview'
   # config.cpd_bulk_audit_class_name = 'Effective::CpdBulkAudit'
 
-  # Program label settings
-  config.program_label = 'CPD'      # CPD or MCE
-  config.cycle_label = 'year'       # 'cycle', 'season'
-  config.credit_label = 'credit'    # 'credit', 'PDH', 'PDU', 'CCC'
-
   # Auditee Scope Collection
   #
   # When creating a new audit, these are used to select the auditee

data/config/locales/effective_cpd.en.yml

@@ -0,0 +1,28 @@
+en:
+  effective_cpd:
+    name: 'Continuing Professional Development'
+    credit: 'Credit'
+
+  activerecord:
+    models:
+      # These ones might be app level
+      app/cpd_audit: 'CPD Audit'
+      app/cpd_audit_level: 'CPD Audit Level'
+      app/cpd_audit_review: 'CPD Audit Review'
+      app/cpd_bulk_audit: 'Bulk Create CPD Audit Review'
+      app/cpd_statement: 'CPD Statement'
+
+      # These ones should stay effective
+      effective/cpd_cycle: 'CPD Period'
+      effective/cpd_statement_activity: 'CPD Statement Activity'
+      effective/cpd_category: 'CPD Category'
+
+    attributes:
+      # These ones might be app level
+      app/cpd_audit:
+        user: 'Auditee'
+        cpd_audit_comments: 'Reviewer Notes'
+
+      app/cpd_audit_review:
+        user: 'Reviewer'
+        comments: 'Reviewer Notes'

data/config/routes.rb

@@ -5,7 +5,7 @@ end
 EffectiveCpd::Engine.routes.draw do
   scope module: 'effective' do
     # Statements wizard
-    resources :cpd_cycles, path: "cpd_#{EffectiveCpd.cycle_label.pluralize.parameterize.underscore}", only: [:show] do
+    resources :cpd_cycles, only: [:show] do
       resources :cpd_statements, path: :statements, only: [:new, :show] do
         resources :build, controller: :cpd_statements, only: [:show, :update]
       end

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/lib/effective_cpd.rb

@@ -14,7 +14,7 @@ module EffectiveCpd
       :cpd_audit_level_questions_table_name, :cpd_audit_level_question_options_table_name,
       :cpd_audits_table_name, :cpd_audit_responses_table_name, :cpd_audit_response_options_table_name,
       :cpd_audit_reviews_table_name, :cpd_audit_review_items_table_name, :cpd_bulk_audits_table_name,
-      :program_label, :cycle_label, :credit_label, :layout, :auditee_user_scope, :audit_reviewer_user_scope,
+      :layout, :auditee_user_scope, :audit_reviewer_user_scope,
       :use_effective_messaging,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates,
       :cpd_statement_class_name, :cpd_audit_class_name, :cpd_audit_level_class_name, :cpd_audit_review_class_name, :cpd_bulk_audit_class_name

data/lib/generators/effective_cpd/install_generator.rb

@@ -19,6 +19,10 @@ module EffectiveCpd
         template ('../' * 3) + 'config/effective_cpd.rb', 'config/initializers/effective_cpd.rb'
       end
 
+      def copy_locale
+        template ('../' * 3) + 'config/locales/effective_cpd.en.yml', 'config/locales/effective_cpd.en.yml'
+      end
+
       def create_migration_file
         @cpd_categories_table_name = ':' + EffectiveCpd.cpd_categories_table_name.to_s
         @cpd_activities_table_name = ':' + EffectiveCpd.cpd_activities_table_name.to_s