effective_cpd 1.2.4 → 1.3.0

data/app/models/effective/cpd_statement_activity.rb

@@ -62,7 +62,7 @@ module Effective
     end
 
     def to_s
-      (cpd_activity || 'activity').to_s
+      cpd_activity.to_s.presence || model_name.human
     end
 
     def reduced_messages

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

@@ -6,7 +6,7 @@
 
   .row
     .col
-      = f.text_field :title, label: 'Title'
+      = f.text_field :title
 
       - if defined?(EffectiveArticleEditor)
         = f.article_editor :body, label: 'Body (optional)'

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

@@ -2,7 +2,7 @@
   - if inline_datatable?
     = f.hidden_field :cpd_audit_level_section_id
   - else
-    = f.select :cpd_audit_level_section_id, Effective::CpdAuditLevelSection.sorted.all
+    = f.select :cpd_audit_level_section_id, Effective::CpdAuditLevelSection.sorted.all, label: 'Section'
 
   = f.text_field :title, label: 'Question Title'
 

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

@@ -1,11 +1,11 @@
 = tabs do
-  = tab 'Audit Level' do
+  = tab(cpd_audit_level) do
     = render 'admin/cpd_audit_levels/form_cpd_audit_level', cpd_audit_level: cpd_audit_level
 
   - if cpd_audit_level.persisted?
     = tab 'Sections and Questions' do
       %p
-        Each of the following sections is a step on the audit wizard.
+        Each of the following sections is a step on the #{cpd_audit_label} wizard.
         The All Steps content will be displayed as well as the top and bottom content.
 
       = tabs do
@@ -13,10 +13,10 @@
           = tab(cpd_audit_level_section.to_s) do
             = render 'admin/cpd_audit_levels/form_cpd_audit_level_section', cpd_audit_level: cpd_audit_level, cpd_audit_level_section: cpd_audit_level_section
 
-    = tab 'Auditee Wizard' do
+    = tab "#{cpd_audits_label} Wizard" do
       = render 'admin/cpd_audit_levels/form_content_audit', cpd_audit_level: cpd_audit_level
 
-    = tab 'Audit Reviewer Wizard' do
+    = tab "#{cpd_audit_reviews_label} Wizard" do
       = render 'admin/cpd_audit_levels/form_content_audit_review', cpd_audit_level: cpd_audit_level
 
     - if cpd_audit_level.respond_to?(:log_changes_datatable)

data/app/views/admin/cpd_audit_levels/_form_content_audit.html.haml

@@ -1,4 +1,4 @@
-%p Each of the following content areas will be displayed on the auditee wizard.
+%p Each of the following content areas will be displayed on the #{cpd_auditee_label} wizard.
 
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = card("All Steps Content") do

data/app/views/admin/cpd_audit_levels/_form_content_audit_review.html.haml

@@ -1,4 +1,4 @@
-%p Each of the following content areas will be displayed on the audit reviewer wizard.
+%p Each of the following content areas will be displayed on the #{cpd_reviewers_label} wizard.
 
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = card("All Steps Content") do

data/app/views/admin/cpd_audit_levels/_form_cpd_audit_level.html.haml

@@ -1,25 +1,32 @@
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
-  = f.text_field :title, hint: 'A title for this kind of audit'
+  = f.text_field :title
 
-  = f.check_box :anonymous, label: 'Yes, this is an anonymous audit'
+  = f.check_box :anonymous, label: "Yes, this is an anonymous #{cpd_audit_label}"
 
   = f.show_if(:anonymous, true) do
     .row
-      .col= f.text_field :anonymous_audits_prefix, hint: 'Used to prefix audits. Something like A23'
-      .col= f.text_field :anonymous_audit_reviews_prefix, hint: 'Used to prefix audit reviewers. Something like R23'
+      .col
+        = f.text_field :anonymous_audits_prefix,
+          label: "Anonymous #{cpd_audits_label} prefix",
+          hint: "Used to prefix #{cpd_audits_label}. Something like A23"
+
+      .col
+        = f.text_field :anonymous_audit_reviews_prefix,
+          label: "Anonymous #{cpd_audit_reviews_label} prefix",
+          hint: "Used to prefix #{cpd_audit_reviews_label}. Something like R23"
 
   = f.select :recommendations, f.object.recommendations,
-    label: 'Audit Review recommendation choices', tags: true, placeholder: 'Type to add item...',
-    hint: 'The recommendation made by an audit reviewer when reviewing an audit. Begin typing and then press enter to add a choice'
+    label: "#{cpd_audit_review_label} recommendation choices", tags: true, placeholder: 'Type to add item...',
+    hint: "The recommendation made by the #{cpd_reviewer_label} when reviewing the #{cpd_audit_label}. Begin typing and then press enter to add a choice"
 
   = f.select :determinations, f.object.determinations,
-    label: 'Audit determination choices', tags: true, placeholder: 'Type to add item...',
-    hint: 'The final determination made by the auditor when closing an audit. Begin typing and then press enter to add a choice.'
+    label: "#{cpd_audit_label} determination choices", tags: true, placeholder: 'Type to add item...',
+    hint: "The final determination made when closing the #{cpd_audit_label}. Begin typing and then press enter to add a choice."
 
   %h2 Sections
   %p
     Please add at least one section.
-    Each section is a step on the audit wizard with its own content and questions.
+    Each section is a step on the #{cpd_audit_label} wizard with its own content and questions.
 
   = f.has_many :cpd_audit_level_sections, class: 'tight' do |fas|
     = fas.text_field :title, label: false
@@ -27,32 +34,32 @@
   %h2 Deadlines
   %p.text-muted Leave blank for no deadlines
   .row
-    .col= f.text_field :days_to_submit, label: 'Days for auditee to submit', hint: "The number of business days from the date of notification or approved extension that an auditee has to complete their submission."
-    .col= f.text_field :days_to_review, label: 'Days for auditor to review', hint: "The number of business days from the auditee's deadline that an auditor has to review the submission and provide a recommendation."
+    .col= f.text_field :days_to_submit, label: "Days for #{cpd_auditee_label} to submit", hint: "The number of business days from the date of notification or approved extension that the #{cpd_auditee_label} has to submit their #{cpd_audit_label}."
+    .col= f.text_field :days_to_review, label: "Days for #{cpd_reviewer_label} to review", hint: "The number of business days from the #{cpd_auditee_label}'s deadline that the #{cpd_reviewer_label} has submit their #{cpd_audit_review_label}."
 
   %h2 Workflows
-  %p.text-muted Each of these workflows will be displayed to the audittee and/or auditor on their wizard steps. Leave blank for no deadlines.
+  %p.text-muted Each of these workflows will be displayed to the #{cpd_auditee_label} and/or #{cpd_reviewer_label} on their wizard steps. Leave blank for no deadlines.
 
   .row
     .col
       %h3 Conflict of Interest
-      = f.check_box :conflict_of_interest, label: 'Yes, the auditee and auditor may declare a conflict of interest with their matching'
+      = f.check_box :conflict_of_interest, label: "Yes, the #{cpd_auditee_label} and #{cpd_reviewer_label} may declare a conflict of interest with their matching"
 
       = f.show_if :conflict_of_interest, true do
-        = f.text_field :days_to_declare_conflict, label: 'Days to declare conflict of interest', hint: "The number of business days from the date of notification that an auditee and auditors have to declare a conflict of interest with the matching."
+        = f.text_field :days_to_declare_conflict, label: 'Days to declare conflict of interest', hint: "The number of business days from the date of notification that an #{cpd_auditee_label} and #{cpd_reviewer_label} have to declare a conflict of interest with the matching."
 
     .col
       %h3 Exemption
-      = f.check_box :can_request_exemption, label: "Yes, the auditee may request an exemption<br><br>".html_safe
+      = f.check_box :can_request_exemption, label: "Yes, the #{cpd_auditee_label} may request an exemption<br><br>".html_safe
 
       = f.show_if :can_request_exemption, true do
-        = f.text_field :days_to_request_exemption, label: 'Days to request exemption', hint: "The number of business days from the date of notification that an auditee may request an exemption."
+        = f.text_field :days_to_request_exemption, label: 'Days to request exemption', hint: "The number of business days from the date of notification that the #{cpd_auditee_label} may request an exemption."
 
     .col
       %h3 Extension
-      = f.check_box :can_request_extension, label: "Yes, the auditee may request an extension<br><br>"
+      = f.check_box :can_request_extension, label: "Yes, the #{cpd_auditee_label} may request an extension<br><br>"
 
       = f.show_if :can_request_extension, true do
-        = f.text_field :days_to_request_extension, label: 'Days to request extension', hint: "The number of business days from the date of notification that an auditee may request an extension."
+        = f.text_field :days_to_request_extension, label: 'Days to request extension', hint: "The number of business days from the date of notification that the #{cpd_auditee_label} may request an extension."
 
   = effective_submit(f)

data/app/views/admin/cpd_audit_levels/_form_cpd_audit_level_section.html.haml

@@ -7,7 +7,7 @@
       = fas.rich_text_area :top_content
       = fas.rich_text_area :bottom_content
 
-    = fas.check_box :skip_review, label: 'Do not display this section to audit reviewers'
+    = fas.check_box :skip_review, label: "Do not display this section to #{cpd_reviewers_label}"
 
   = f.submit
 

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

@@ -3,10 +3,10 @@
     = f.hidden_field :cpd_audit_id
     = f.hidden_field :cpd_audit_type
 
-    = f.static_field :cpd_audit, label: 'CPD Audit'
+    = f.static_field :cpd_audit
   - else
     = f.hidden_field :cpd_audit_type, value: EffectiveCpd.CpdAudit.class.name
-    = f.select :cpd_audit_id, EffectiveCpd.CpdAudit.available.sorted.all
+    = f.select :cpd_audit_id, EffectiveCpd.CpdAudit.available.sorted.all, label: cpd_audit_label
 
   = render('admin/cpd_audits/audit_reviewer_fields', f: f)
 

data/app/views/admin/cpd_audits/_audit_reviewer_fields.html.haml

@@ -1,2 +1,2 @@
 = f.hidden_field :user_type, value: current_user.class.name
-= f.select :user_id, cpd_audit_new_reviewer_collection(f.object.cpd_audit), label: 'Audit Reviewer'
+= f.select :user_id, cpd_audit_new_reviewer_collection(f.object.cpd_audit)

data/app/views/admin/cpd_audits/_auditee_fields.html.haml

@@ -1,2 +1,2 @@
-- collection = current_user.class.send(EffectiveCpd.auditee_user_scope)
-= f.select :user, { 'Auditees' => collection }, label: 'Auditee', polymorphic: true
+= f.hidden_field :user_type, value: current_user.class.name
+= f.select :user_id, current_user.class.send(EffectiveCpd.auditee_user_scope)

data/app/views/admin/cpd_audits/_form_chat.html.haml

@@ -1,6 +1,6 @@
 = card('Chat Permission') do
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p By default, auditees and reviewers can send messages until the audit is closed.
+    %p By default, #{cpd_auditees_label} and #{cpd_reviewers_label} can send messages until the #{cpd_audit_label} is closed.
 
     .row
       .col-sm-6
@@ -10,4 +10,4 @@
 - if cpd_audit.chat.present?
   = render('effective/chats/chat', chat: cpd_audit.chat)
 - else
-  %p No chat messages
+  %p No messages

data/app/views/admin/cpd_audits/_form_close.html.haml

@@ -1,10 +1,10 @@
 = card('Determination') do
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p This action will <strong>close</strong> this audit with the following determination:
+    %p This action will <strong>close</strong> this #{cpd_audit_label} with the following determination:
 
     = f.select :determination, cpd_audit.cpd_audit_level.determinations
 
     %h2 Email to Send
     = email_form_fields(f, :cpd_audit_closed)
 
-    = f.submit 'Close Audit', center: true
+    = f.submit 'Close', center: true, 'data-confirm': "Really close #{cpd_audit}?"

data/app/views/admin/cpd_audits/_form_complete.html.haml

@@ -1,7 +1,7 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
   = f.hidden_field :id
 
-  %p This audit will be marked as <strong>completed information</strong> and <strong>ready for review</strong>.
+  %p This #{cpd_audit_label} will be marked as <strong>completed information</strong> and <strong>ready for review</strong>.
 
   - reviewers = cpd_audit.cpd_audit_reviews
 
@@ -11,20 +11,20 @@
       - email = Effective::EmailTemplate.where(template_name: :cpd_audit_review_ready).first!
 
       The existing
-      = link_to(pluralize(reviewers.length, 'assigned reviewer'), '#audit-reviews', 'data-click-tab': true)
+      = link_to(pluralize(reviewers.length, cpd_reviewers_label), '#' + cpd_reviewers_label.parameterize, 'data-click-tab': true)
       will be sent an
       = link_to('cpd_audit_review_ready email', effective_email_templates.edit_admin_email_template_path(email))
       email.
 
   - if reviewers.blank?
-    %p Please assign one or more reviewers:
+    %p Please assign one or more #{cpd_reviewers_label}:
 
     - # Pre-select the first reviewer if present
     - if f.object.cpd_audit_reviews.blank?
       - f.object.cpd_audit_reviews.build(user: cpd_audit.suggested_cpd_audit_reviewers.first)
 
     = f.has_many :cpd_audit_reviews, class: 'tight' do |fr|
-      = card('Reviewer') do
+      = card(cpd_reviewer_label) do
         = render('admin/cpd_audits/audit_reviewer_fields', form: fr, f: fr)
 
         %p Send email

data/app/views/admin/cpd_audits/_form_conflict.html.haml

@@ -1,21 +1,21 @@
 - raise('expected a conflicted cpd audit') unless cpd_audit.conflicted? || cpd_audit.errors.present?
 
 %h2 Conflict of Interest
-%p The auditee has indicated a conflict of interest:
+%p The #{cpd_auditee_label} has indicated a conflict of interest:
 = render('effective/cpd_audits/conflict', cpd_audit: cpd_audit, step: :conflict)
 
 %h2 Resolve Conflict of Interest
 %p
-  Please use the table below to delete any conflicting audit reviews, and create another reviewer.
+  Please use the table below to delete any conflicting #{cpd_reviewers_label}, and create another #{cpd_reviewer_label}.
 
-= card('Update Audit Reviewers') do
-  %p There should be at least one audit reviewer.
+= card("Update #{cpd_reviewers_label}") do
+  %p There should be at least one #{cpd_reviewer_label}.
 
   - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(cpd_audit_id: cpd_audit.id)
   = render_datatable(datatable, inline: true, simple: true)
 
 = card('Mark Resolved') do
-  %p Once resolved, the auditee will be ready to continue their audit questionnaire.
+  %p Once resolved, the #{cpd_auditee_label} will be ready to continue their #{cpd_audit_label} questionnaire.
 
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
     %p Send email

data/app/views/admin/cpd_audits/_form_cpd_audit.html.haml

@@ -1,11 +1,11 @@
 = tabs do
   - if cpd_audit.new_record?
-    = tab 'New Audit' do
+    = tab(cpd_audit) do
       = render 'admin/cpd_audits/form_new', cpd_audit: cpd_audit
 
   - if cpd_audit.persisted?
     - if cpd_audit.completed?
-      = tab 'Audit' do
+      = tab(cpd_audit) do
         = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
 
       = tab 'Status' do
@@ -14,7 +14,7 @@
       = tab 'Status' do
         = render 'admin/cpd_audits/status', cpd_audit: cpd_audit
 
-      = tab 'Audit' do
+      = tab(cpd_audit) do
         = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
 
     - if cpd_audit.conflicted?
@@ -43,16 +43,16 @@
       = render 'admin/cpd_audits/form_files', cpd_audit: cpd_audit
 
     - if cpd_audit.user_cpd_required?
-      = tab 'Statements' do
+      = tab(cpd_audit.cpd_audit_reviews) do
         - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: cpd_audit.user)
         = render_datatable(datatable, inline: true, simple: true)
 
-    = tab 'Audit Reviews' do
+    = tab(cpd_audit.cpd_audit_reviews) do
       - datatable = EffectiveResources.best('Admin::EffectiveCpdAuditReviewsDatatable').new(cpd_audit: cpd_audit)
       = render_datatable(datatable, inline: true, simple: true)
 
     - if EffectiveCpd.use_effective_messaging?
-      = tab 'Chat' do
+      = tab(cpd_audit.chats) do
         = render 'admin/cpd_audits/form_chat', cpd_audit: cpd_audit
 
     - if cpd_audit.respond_to?(:log_changes_datatable)

data/app/views/admin/cpd_audits/_form_deadlines.html.haml

@@ -1,11 +1,11 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-  %p The audittee has the following deadlines:
+  %p The #{cpd_auditee_label} has the following deadlines:
 
   %ul
     %li To declare conflict of interest: #{f.object.deadline_to_conflict_of_interest.presence || 'None'}
     %li To request exemption: #{f.object.deadline_to_exemption.presence || 'None'}
     %li To request extension: #{f.object.deadline_to_extension.presence || 'None'}
 
-  = f.check_box :ignore_deadlines, label: 'Yes, ignore audittee deadlines and allow these actions to be performed'
+  = f.check_box :ignore_deadlines, label: "Yes, ignore deadlines and allow these actions to be performed"
 
   = f.submit 'Save', center: true

data/app/views/admin/cpd_audits/_form_exemption.html.haml

@@ -1,11 +1,11 @@
 - raise('expected an exemption requested cpd audit') unless cpd_audit.exemption_requested? || cpd_audit.errors.present?
 
 %h2 Exemption Request
-%p The auditee has requested an exemption:
+%p The #{cpd_auditee_label} has requested an exemption:
 = render('effective/cpd_audits/exemption', cpd_audit: cpd_audit, step: :exemption)
 
 %h2 Resolve Exemption Request
-%p Please grant or deny the request. If granted, this audit will be closed.
+%p Please grant or deny the request. If granted, this #{cpd_audit_label} will be closed.
 
 = card('Exemption Request') do
   %p The exemption request shall be

data/app/views/admin/cpd_audits/_form_extension.html.haml

@@ -1,11 +1,11 @@
 - raise('expected an extension requested cpd audit') unless cpd_audit.extension_requested? || cpd_audit.errors.present?
 
 %h2 Extension Request
-%p The auditee has requested an extension:
+%p The #{cpd_auditee_label} has requested an extension:
 = render('effective/cpd_audits/extension', cpd_audit: cpd_audit, step: :extension)
 
 %h2 Resolve Extension Request
-%p Please grant or deny the request. If granted, the auditee's deadline will be updated.
+%p Please grant or deny the request. If granted, the #{cpd_auditee_label}'s deadline will be updated.
 
 = card('Extension Request') do
   %p The extension request shall be

data/app/views/admin/cpd_audits/_form_files.html.haml

@@ -1,5 +1,5 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-  %p The auditee has attached the following:
+  %p The #{cpd_auditee_label} has attached the following:
 
   = f.file_field :files
 

data/app/views/admin/cpd_audits/_form_missing_info.html.haml

@@ -1,5 +1,5 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-  %p This audit will be marked as <strong>missing information</strong> with the following:
+  %p This #{cpd_audit_label} will be marked as <strong>missing information</strong> with the following:
 
   = f.text_field :missing_info_reason, required: true, label: 'Explanation of missing info'
 

data/app/views/admin/cpd_audits/_form_new.html.haml

@@ -1,32 +1,30 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-
-  %h2 Audit
   = f.hidden_field :cpd_audit_level_type, value: EffectiveCpd.CpdAuditLevel.name
 
-  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.new_cpd_audit_level_collection, label: 'Audit level'
+  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.new_cpd_audit_level_collection, label: cpd_audit_label
 
-  = f.date_field :notification_date, label: 'Date of notification', required: false,
+  = f.date_field :notification_date, required: false,
     hint: "the starting date for any deadline calculations. leave blank for today's date"
 
   = render('admin/cpd_audits/form_new_fields', form: f, f: f)
 
-  %h2 Auditee
-  = card('Auditee') do
-    %p.text-muted The auditee is the person being audited
+  %h2 Select #{cpd_auditee_label}
+  %p.text-muted Please select one #{cpd_auditee_label.downcase}
+  = card(cpd_auditee_label) do
     = render('admin/cpd_audits/auditee_fields', form: f, f: f)
 
     %p Send email
     = email_form_fields(f, :cpd_audit_opened)
 
-  %h2 Audit Reviewers
-  %p.text-muted An audit review will be created for each selected auditor.
+  %h2 Select #{cpd_reviewers_label}
+  %p.text-muted Please select one or more #{cpd_reviewer_label}
 
   = f.has_many :cpd_audit_reviews, class: 'tight' do |fr|
-    = card('Audit Reviewer') do
-      %p.text-muted The audit reviewer is the person reviewing an audit
+    = card(cpd_reviewer_label) do
+      %p.text-muted The #{cpd_reviewer_label} is the person reviewing a #{cpd_auditee_label.downcase}
       = render('admin/cpd_audits/audit_reviewer_fields', form: fr, f: fr)
 
       %p Send email
       = email_form_fields(fr, :cpd_audit_review_opened)
 
-  = f.submit 'Open Audit', center: true
+  = f.submit "Open #{cpd_audit_label}", center: true

data/app/views/admin/cpd_audits/_form_process.html.haml

@@ -2,7 +2,7 @@
   %span.badge.badge-secondary= cpd_audit.status_label
   = cpd_audit.summary
 
-%p Process audit:
+%p Process #{cpd_audit_label}:
 
 = accordion do
   - if EffectiveResources.authorized?(self, :complete, cpd_audit)

data/app/views/admin/cpd_audits/_status.html.haml

@@ -33,7 +33,7 @@
         %td
           - if cpd_audit.conflicted?
             = icon('x', class: 'small-1')
-            Auditee has indicated conflict of interest
+            #{cpd_auditee_label} has indicated conflict of interest
           - elsif cpd_audit.was_conflicted_resolved?
             = icon('check', class: 'small-1')
             Resolved
@@ -51,7 +51,7 @@
         %td
           - if cpd_audit.exemption_requested?
             = icon('x', class: 'small-1')
-            Auditee has requested an exemption
+            #{cpd_auditee_label} has requested an exemption
           - elsif cpd_audit.was_exemption_granted?
             = icon('check', class: 'small-1')
             Exemption Granted
@@ -72,7 +72,7 @@
         %td
           - if cpd_audit.extension_requested?
             = icon('x', class: 'small-1')
-            Auditee has requested an extension
+            #{cpd_auditee_label} has requested an extension
           - elsif cpd_audit.was_extension_granted?
             = icon('check', class: 'small-1')
             Extension Granted
@@ -105,10 +105,9 @@
             %p
               = icon((completed ? 'check' : 'x'), class: 'small-1')
               = requirement
-
         %td
           - if cpd_audit.submitted?
-            = link_to 'Process: Ready or Missing Info', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+            = link_to 'Process: Ready for Review or Missing Info', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
 
     - # Missing Information
     %tr
@@ -124,7 +123,6 @@
         - if cpd_audit.was_completed? && !cpd_audit.was_missing_info?
           = icon('check', class: 'small-1')
           No Missing Info
-
       %td
 
     %tr
@@ -147,8 +145,8 @@
         Reviews Completed
 
       %td
-        - if cpd_audit.was_submitted? && !cpd_audit.was_reviewed? && !cpd_audit.closed?
-          = link_to 'Audit Reviews', '#audit-reviews', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+        - if cpd_audit.was_submitted? && !cpd_audit.was_reviewed? && !cpd_audit.closed? && cpd_audit.cpd_audit_reviews.present?
+          = link_to "#{cpd_audit_reviews_label}", '#' + cpd_audit_reviews_label.parameterize, 'data-click-tab': true, class: 'btn btn-sm btn-primary'
 
     - unless cpd_audit.closed?
       %tr
@@ -157,8 +155,7 @@
         %td
         %td
           - if cpd_audit.was_reviewed?
-            = link_to 'Close Audit with Determination', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
-
+            = link_to "Process: Close with Determination", '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
     %tr
       %td Closed
       %td= cpd_audit.closed_at&.strftime('%F') || '-'

data/app/views/admin/cpd_bulk_audits/_form_cpd_bulk_audit.html.haml

@@ -1,16 +1,16 @@
 %h2 Bulk Create Audits
 
 = effective_form_with(model: [:admin, cpd_bulk_audit], engine: true, url: effective_cpd.admin_cpd_bulk_audits_path) do |f|
-  = f.number_field :audits, label: 'How many audits to create', placeholder: 100
+  = f.number_field :audits, label: "How many #{cpd_audits_label} to create", placeholder: 100
   = f.number_field :audit_reviewers_per_audit, label: 'How many reviewers should be assigned to each audit', placeholder: 1
 
   = f.hidden_field :cpd_audit_level_type, value: EffectiveCpd.CpdAuditLevel.name
-  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.new_cpd_audit_level_collection, label: 'Audit level'
+  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.new_cpd_audit_level_collection, label: cpd_audit_label
 
   = f.date_field :notification_date, label: 'Date of notification', required: false, placeholder: Time.zone.now.strftime('%F'),
     hint: "the starting date for any deadline calculations. leave blank for today's date"
 
-  %h3 Eligible Auditees
+  %h3 Eligible #{cpd_auditee_label}
   - datatable = EffectiveResources.best('Admin::EffectiveCpdBulkAuditAuditeesDatatable').new(self)
   - raise('expected an auditees datatable') unless datatable.present?
 
@@ -18,12 +18,12 @@
   = collapse('Show auditees...', card_class: '') do
     = render_datatable(datatable)
 
-  %h3 Eligible Audit Reviewers
+  %h3 Eligible Reviewers
   - datatable = EffectiveResources.best('Admin::EffectiveCpdBulkAuditAuditReviewersDatatable').new(self)
   - raise('expected an auditees datatable') unless datatable.present?
 
-  %p The following #{pluralize(datatable.collection.count, 'audit reviewer')} may be selected to review audits:
-  = collapse('Show audit reviewers...', card_class: '') do
+  %p The following #{pluralize(datatable.collection.count, cpd_reviewers_label)} may be selected to review #{cpd_audits_label}:
+  = collapse("Show audit reviewers...", card_class: '') do
     = render_datatable(datatable)
 
   %h3 Email to send

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

@@ -10,7 +10,7 @@
       %h2 Activities
       %p
         After adding an activity here, please visit any existing
-        = link_to(cpd_cycle_label.capitalize + ' Settings', effective_cpd.admin_cpd_cycles_path)
+        = link_to(cpd_cycle_label + ' Settings', effective_cpd.admin_cpd_cycles_path)
         pages and build a rule before it will be displayed.
 
       - datatable = Admin::EffectiveCpdActivitiesDatatable.new(cpd_category_id: cpd_category.id)
@@ -18,4 +18,4 @@
 
   - if cpd_category.persisted? && cpd_category.respond_to?(:log_changes_datatable)
     = tab 'Logs' do
-      = render_inline_datatable(cpd_category.log_changes_datatable)
+      = render_inline_datatable(cpd_category.logs_datatable)

data/app/views/admin/cpd_cycles/_form_cpd_cycle.html.haml

@@ -1,15 +1,15 @@
 = effective_form_with(model: [:admin, cpd_cycle], engine: true) do |f|
   = f.text_field :title,
-    hint: "The title of this #{cpd_cycle_label}. Something like #{Time.zone.now.year} Continuing Professional Development"
+    hint: "The title of this #{cpd_cycle_label}. Something like #{Time.zone.now.year} #{cpd_name_label}"
 
   = f.date_field :start_at,
-    hint: "The first date statements may be submited for this #{cpd_cycle_label}"
+    hint: "The first date a #{cpd_statement_label} may be submited for this #{cpd_cycle_label}"
 
   = f.date_field :end_at, date_linked: false,
-    hint: "The last date statements may be created for this #{cpd_cycle_label}. leave blank for no end date."
+    hint: "The last date a #{cpd_statement_label} may be created for this #{cpd_cycle_label}. leave blank for no end date."
 
   = f.number_field :required_score,
-    hint: "The minimum required #{cpd_credits_label} to submit statements for this #{cpd_cycle_label}. leave blank to submit any score."
+    hint: "The minimum required #{cpd_credits_label} to submit a #{cpd_statement_label} for this #{cpd_cycle_label}. leave blank to submit any amount."
 
   - if f.object.new_record?
     - latest_cycle = Effective::CpdCycle.latest_cycle
@@ -18,7 +18,7 @@
       = f.static_field :continue_from, value: latest_cycle,
         hint: "The next #{cpd_cycle_label} will be carried forward from last one. Please make sure this #{cpd_cycle_label} is the most recent one."
 
-    = f.submit("Save and Create Next #{cpd_cycle_label.titleize}")
+    = f.submit("Save and Create Next #{cpd_cycle_label}")
 
   - if f.object.persisted?
     = f.submit

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)